Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge branch 'staging'

Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.

+31 -25
-3
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 53 NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" 54 + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; 55 56 - # without this, git fails when trying to check for /etc/gitconfig existence 57 - propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc"; 58 - 59 makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " 60 + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") 61 + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
··· 53 NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" 54 + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; 55 56 makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " 57 + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") 58 + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
+3 -4
pkgs/data/misc/iana-etc/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 name = "iana-etc-${version}"; 5 - version = "20170512"; 6 7 src = fetchurl { 8 url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; 9 - sha256 = "0zx2ag894qldvrv8f4hs84644kdcp8a83gjg33xsw8rrn38gll2a"; 10 }; 11 12 installPhase = '' 13 - mkdir -p $out/etc 14 - cp services protocols $out/etc/ 15 ''; 16 17 meta = with stdenv.lib; {
··· 2 3 stdenv.mkDerivation rec { 4 name = "iana-etc-${version}"; 5 + version = "20171106"; 6 7 src = fetchurl { 8 url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; 9 + sha256 = "0pbmq95gdkp66cljwklv4gzh8lvl30l4k77hfwvrxz5mfqia6qdd"; 10 }; 11 12 installPhase = '' 13 + install -D -t $out/etc services protocols 14 ''; 15 16 meta = with stdenv.lib; {
+1 -1
pkgs/development/interpreters/python/cpython/2.7/default.nix
··· 128 ++ optional hostPlatform.isCygwin expat 129 ++ [ db gdbm ncurses sqlite readline ] 130 ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] 131 - ++ optionals stdenv.isDarwin [ CF configd ]; 132 133 mkPaths = paths: { 134 C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
··· 128 ++ optional hostPlatform.isCygwin expat 129 ++ [ db gdbm ncurses sqlite readline ] 130 ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] 131 + ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd); 132 133 mkPaths = paths: { 134 C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+2 -2
pkgs/development/libraries/webkitgtk/2.18.nix
··· 12 with stdenv.lib; 13 stdenv.mkDerivation rec { 14 name = "webkitgtk-${version}"; 15 - version = "2.18.1"; 16 17 meta = { 18 description = "Web content rendering engine, GTK+ port"; ··· 42 43 src = fetchurl { 44 url = "http://webkitgtk.org/releases/${name}.tar.xz"; 45 - sha256 = "15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww"; 46 }; 47 48 # see if we can clean this up....
··· 12 with stdenv.lib; 13 stdenv.mkDerivation rec { 14 name = "webkitgtk-${version}"; 15 + version = "2.18.2"; 16 17 meta = { 18 description = "Web content rendering engine, GTK+ port"; ··· 42 43 src = fetchurl { 44 url = "http://webkitgtk.org/releases/${name}.tar.xz"; 45 + sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; 46 }; 47 48 # see if we can clean this up....
+7 -4
pkgs/os-specific/darwin/apple-sdk/default.nix
··· 136 # don't use pure CF for dylibs that depend on frameworks 137 setupHook = ./framework-setup-hook.sh; 138 139 - # allows building the symlink tree 140 - __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ]; 141 - 142 - __propagatedImpureHostDeps = stdenv.lib.optional (name != "Kernel") "/System/Library/Frameworks/${name}.framework/${name}"; 143 144 meta = with stdenv.lib; { 145 description = "Apple SDK framework ${name}";
··· 136 # don't use pure CF for dylibs that depend on frameworks 137 setupHook = ./framework-setup-hook.sh; 138 139 + # Not going to be more specific than this for now 140 + __propagatedImpureHostDeps = stdenv.lib.optionals (name != "Kernel") [ 141 + # The setup-hook ensures that everyone uses the impure CoreFoundation who uses these SDK frameworks, so let's expose it 142 + "/System/Library/Frameworks/CoreFoundation.framework" 143 + "/System/Library/Frameworks/${name}.framework" 144 + "/System/Library/Frameworks/${name}.framework/${name}" 145 + ]; 146 147 meta = with stdenv.lib; { 148 description = "Apple SDK framework ${name}";
-3
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
··· 84 ]; 85 setOutputFlags = false; 86 87 - # ps uses this syscall to get process info 88 - propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port"; 89 - 90 meta = { 91 platforms = stdenv.lib.platforms.darwin; 92 maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
··· 84 ]; 85 setOutputFlags = false; 86 87 meta = { 88 platforms = stdenv.lib.platforms.darwin; 89 maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+10
pkgs/tools/archivers/sharutils/default.nix
··· 13 # GNU Gettext is needed on non-GNU platforms. 14 buildInputs = [ coreutils gettext ]; 15 16 doCheck = true; 17 18 crossAttrs = {
··· 13 # GNU Gettext is needed on non-GNU platforms. 14 buildInputs = [ coreutils gettext ]; 15 16 + # These tests try to hit /etc/passwd to find out your username if pass in a submitter 17 + # name on the command line. Since we block access to /etc/passwd on the Darwin sandbox 18 + # that cause shar to just segfault. It isn't a problem on Linux because their sandbox 19 + # remaps /etc/passwd to a trivial file, but we can't do that on Darwin so I do this 20 + # instead. In this case, I pass in the very imaginative "submitter" as the submitter name 21 + patchPhase = '' 22 + substituteInPlace tests/shar-1 --replace '$''\{SHAR}' '$''\{SHAR} -s submitter' 23 + substituteInPlace tests/shar-2 --replace '$''\{SHAR}' '$''\{SHAR} -s submitter' 24 + ''; 25 + 26 doCheck = true; 27 28 crossAttrs = {
+2 -2
pkgs/tools/misc/parallel/default.nix
··· 1 { fetchurl, stdenv, perl, makeWrapper, procps }: 2 3 stdenv.mkDerivation rec { 4 - name = "parallel-20170722"; 5 6 src = fetchurl { 7 url = "mirror://gnu/parallel/${name}.tar.bz2"; 8 - sha256 = "117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx"; 9 }; 10 11 nativeBuildInputs = [ makeWrapper perl ];
··· 1 { fetchurl, stdenv, perl, makeWrapper, procps }: 2 3 stdenv.mkDerivation rec { 4 + name = "parallel-20171022"; 5 6 src = fetchurl { 7 url = "mirror://gnu/parallel/${name}.tar.bz2"; 8 + sha256 = "18pq10npl7g764ww7cy9r5n5s3kiy984jclf932qfgndcxsbpqpp"; 9 }; 10 11 nativeBuildInputs = [ makeWrapper perl ];
+6 -6
pkgs/tools/networking/openssh/default.nix
··· 13 let 14 15 # **please** update this patch when you update to a new openssh release. 16 - gssapiSrc = fetchpatch { 17 name = "openssh-gssapi.patch"; 18 url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" 19 - + "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92"; 20 - sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm"; 21 }; 22 23 in ··· 26 # Please ensure that openssh_with_kerberos still builds when 27 # bumping the version here! 28 name = "openssh-${version}"; 29 - version = "7.5p1"; 30 31 src = if hpnSupport then 32 fetchurl { ··· 36 else 37 fetchurl { 38 url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; 39 - sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; 40 }; 41 42 patches = ··· 47 # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 48 ./dont_create_privsep_path.patch 49 ] 50 - ++ optional withGssapiPatches gssapiSrc; 51 52 postPatch = 53 # On Hydra this makes installation fail (sometimes?),
··· 13 let 14 15 # **please** update this patch when you update to a new openssh release. 16 + gssapiPatch = fetchpatch { 17 name = "openssh-gssapi.patch"; 18 url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" 19 + + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d"; 20 + sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb"; 21 }; 22 23 in ··· 26 # Please ensure that openssh_with_kerberos still builds when 27 # bumping the version here! 28 name = "openssh-${version}"; 29 + version = if hpnSupport then "7.5p1" else "7.6p1"; 30 31 src = if hpnSupport then 32 fetchurl { ··· 36 else 37 fetchurl { 38 url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; 39 + sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3"; 40 }; 41 42 patches = ··· 47 # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 48 ./dont_create_privsep_path.patch 49 ] 50 + ++ optional withGssapiPatches gssapiPatch; 51 52 postPatch = 53 # On Hydra this makes installation fail (sometimes?),