Merge branch master into staging

5 files changed, 26 insertions, 23 deletions

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index f8130b423a20..cb6059e00cd2 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -92,4 +92,4 @@ in
          (postprocess (let super = defaults self // args self;
                            self  = super // extension self super;
                        in self));
-}
\ No newline at end of file
+}
diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 04e6aafc8a1b..43fc4b1179d7 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -1,6 +1,19 @@
-{ runCommand, git }: src:
+{ runCommand, git, nix }: src:
 
-runCommand "local-git-export" {} ''
+let hash = import (runCommand "head-hash.nix"
+  { dummy = builtins.currentTime;
+    preferLocalBuild = true; }
+''
+  cd ${toString src}
+  (${git}/bin/git show && ${git}/bin/git diff) > $out
+  hash=$(${nix}/bin/nix-hash $out)
+  echo "\"$hash\"" > $out
+''); in
+
+runCommand "local-git-export"
+  { dummy = hash;
+    preferLocalBuild = true; }
+''
   cd ${toString src}
   mkdir -p "$out"
   for file in $(${git}/bin/git ls-files); do
diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix
deleted file mode 100644
index 258b11d850e5..000000000000
--- a/pkgs/build-support/fetchurl/gnome.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ fetchurl }:
-
-{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }:
-
-let
-  baseVersion = "${major}.${minor}";
-  version = baseVersion + (if patchlevel != null then ".${patchlevel}" else "");
-  name = "${project}-${version}";
-in
-
-(fetchurl {
-  url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}";
-  inherit sha256;
-}) // {
-  inherit major minor patchlevel baseVersion version;
-  pkgname = name;
-}
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 7bafd78d76a3..e82792be033a 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -50,14 +50,14 @@ let
         "GRKERNSEC_CONFIG_SERVER y";
 
     grsecVirtCfg =
-      if cfg.config.virtualisationConfig == "none" then
+      if cfg.config.virtualisationConfig == null then
         "GRKERNSEC_CONFIG_VIRT_NONE y"
       else if cfg.config.virtualisationConfig == "host" then
         "GRKERNSEC_CONFIG_VIRT_HOST y"
       else
         "GRKERNSEC_CONFIG_VIRT_GUEST y";
 
-    grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else
+    grsecHwvirtCfg = if cfg.config.virtualisationConfig == null then "" else
       if cfg.config.hardwareVirtualisation == true then
         "GRKERNSEC_CONFIG_VIRT_EPT y"
       else
@@ -66,7 +66,7 @@ let
     grsecVirtswCfg =
       let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y";
       in
-        if cfg.config.virtualisationConfig == "none" then ""
+        if cfg.config.virtualisationConfig == null then ""
         else if cfg.config.virtualisationSoftware == "xen"    then virtCfg "XEN"
         else if cfg.config.virtualisationSoftware == "kvm"    then virtCfg "KVM"
         else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE"
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index 4afed3add75b..4e0a8245ac1d 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -102,3 +102,10 @@ int __xstat(int ver, const char * path, struct stat * st)
     char buf[PATH_MAX];
     return __xstat_real(ver, rewrite(path, buf), st);
 }
+
+int * access(const char * path, int mode)
+{
+    int * (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");
+    char buf[PATH_MAX];
+    return access_real(rewrite(path, buf), mode);
+}