Merging against upstream master

6 files changed, 35 insertions, 14 deletions

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 5ae5eb105e79..e3759fe49cd8 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -128,7 +128,7 @@ rec {
   ];
 
   samba = [
-    http://samba.org/ftp/
+    https://www.samba.org/ftp/
     http://ftp.riken.jp/net/samba
   ];
 
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index d922db5ccf58..4f55493ae483 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -1,8 +1,28 @@
+# construct an executable file that wraps the actual executable
+# makeWrapper EXECUTABLE ARGS
+
+# ARGS:
+# --argv0 NAME      : set name of executed process to NAME
+#                     (otherwise it’s called …-wrapped)
+# --set   VAR VAL   : add VAR with value VAL to the executable’s environment
+# --unset VAR       : remove VAR from the environment
+# --run   COMMAND   : run command before the executable
+#                     The command can push extra flags to a magic list variable
+#                     extraFlagsArray, which are then added to the invocation
+#                     of the executable
+# --add-flags FLAGS : add FLAGS to invocation of executable
+
+# --prefix          ENV SEP VAL   : suffix/prefix ENV with VAL, separated by SEP
+# --suffix
+# --suffix-each     ENV SEP VALS  : like --suffix, but VALS is a list
+# --prefix-contents ENV SEP FILES : like --suffix-each, but contents of FILES
+#                                   are read first and used as VALS
+# --suffix-contents
 makeWrapper() {
     local original=$1
     local wrapper=$2
     local params varName value command separator n fileNames
-    local argv0 flagsBefore flags
+    local argv0 flagsBefore flags extraFlagsArray
 
     mkdir -p "$(dirname $wrapper)"
 
diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
index 5e33ace42b37..66f4e91c7bb6 100644
--- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
+++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
@@ -4,7 +4,7 @@ updateAutotoolsGnuConfigScriptsPhase() {
     if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
 
     for script in config.sub config.guess; do
-        for f in $(find . -name "$script"); do
+        for f in $(find . -type f -name "$script"); do
             echo "Updating Autotools / GNU config script to a newer upstream version: $f"
             cp -f "@gnu_config@/$script" "$f"
         done
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 36cb068d93d6..461bdd08fb57 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -130,7 +130,7 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs${storeDir}
-    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/tmp /fs/run /fs/var
     mount -t tmpfs -o "mode=1777" none /fs/tmp
@@ -139,7 +139,7 @@ rec {
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 625071c9c33c..01884f488780 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph
+{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph
 , arch ? "x86_64"
 }:
 
@@ -10,10 +10,10 @@
 let
   cygPkgList = if arch == "x86_64" then fetchurl {
     url = "${mirror}/x86_64/setup.ini";
-    sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9";
+    sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj";
   } else fetchurl {
     url = "${mirror}/x86/setup.ini";
-    sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv";
+    sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69";
   };
 
   cygwinCross = (import ../../../../.. {
@@ -25,23 +25,24 @@ let
       inherit arch;
       config = "${arch}-w64-mingw32";
     };
-  }).windows.cygwinSetup.crossDrv;
+  }).windows.cygwinSetup;
 
   makeCygwinClosure = { packages, packageList }: let
     expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } ''
       python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out"
     '');
-    gen = { url, md5 }: {
+    gen = { url, hash }: {
       source = fetchurl {
         url = "${mirror}/${url}";
-        inherit md5;
+        sha512 = hash;
       };
       target = url;
     };
   in map gen expr;
 
 in import ../../../../../nixos/lib/make-iso9660-image.nix {
-  inherit stdenv perl cdrkit pathsFromGraph;
+  inherit stdenv perl xorriso pathsFromGraph;
+  syslinux = null;
   contents = [
     { source = "${cygwinCross}/bin/setup.exe";
       target = "setup.exe";
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
index 48d569a6bd3e..4c0d67c43bac 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
+++ b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
@@ -63,12 +63,12 @@ def main():
         if install_line is None:
             continue
 
-        url, size, md5 = install_line.split(' ', 2)
+        url, size, hash = install_line.split(' ', 2)
 
         pack = [
             '  {',
             '    url = "{0}";'.format(url),
-            '    md5 = "{0}";'.format(md5),
+            '    hash = "{0}";'.format(hash),
             '  }',
         ];
         sys.stdout.write('\n'.join(pack) + '\n')