NixOS · Apr 7, 2020 · Apr 7, 2020 · Apr 7, 2020 · Apr 7, 2020 · Apr 7, 2020
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
@@ -141,7 +141,8 @@ self = stdenv.mkDerivation {
     )
   '';
 
-  prefixKey = "-prefix ";
+  prefixKey = "-prefix";
+  prefixAsSeperateFlag = true;
 
   buildFlags = [ "revision" "coq" "coqide" "bin/votour" ];
 

diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
@@ -1,3 +1,5 @@
+source .attrs.sh
+
 source $stdenv/setup
 
 source $mirrorsFile
@@ -17,7 +19,7 @@ curl=(
     --cookie-jar cookies
     --insecure
     --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion"
-    $curlOpts
+    "${curlOpts[@]}"
     $NIX_CURL_FLAGS
 )
 
@@ -85,10 +87,10 @@ tryHashedMirrors() {
 # URL list may contain ?. No glob expansion for that, please
 set -o noglob
 
-urls2=
-for url in $urls; do
+declare -a urls2
+for url in "${urls[@]}"; do
     if test "${url:0:9}" != "mirror://"; then
-        urls2="$urls2 $url"
+        urls2+=("$url")
     else
         url2="${url:9}"; echo "${url2/\// }" > split; read site fileName < split
         #varName="mirror_$site"
@@ -103,18 +105,18 @@ for url in $urls; do
             if test -n "${!varName}"; then mirrors="${!varName}"; fi
 
             for url3 in $mirrors; do
-                urls2="$urls2 $url3$fileName";
+                urls2+=("$url3$fileName")
             done
         fi
     fi
 done
-urls="$urls2"
+urls=("${urls2[@]}")
 
 # Restore globbing settings
 set +o noglob
 
 if test -n "$showURLs"; then
-    echo "$urls" > $out
+    echo "${urls[@]}" > $out
     exit 0
 fi
 
@@ -126,7 +128,7 @@ fi
 set -o noglob
 
 success=
-for url in $urls; do
+for url in "${urls[@]}"; do
     if [ -z "$postFetch" ]; then
        case "$url" in
            https://github.com/*/archive/*)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
@@ -44,7 +44,7 @@ in
   urls ? []
 
 , # Additional curl options needed for the download to succeed.
-  curlOpts ? ""
+  curlOpts ? []
 
 , # Name of the file.  If empty, use the basename of `url' (or of the
   # first element of `urls').

diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
   };
 
   sourceRoot = ".";
+  dontMakeSourcesWritable = true;
 
   installPhase = ''
     install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2

diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
diff --git a/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch b/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch