From 56e4d8a81ebee7348cbbe745e4674a7dbc211c37 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 8 Jan 2018 02:18:40 +1300 Subject: [PATCH 1/9] glib-networking: Fix glib-networking for macOS --- pkgs/development/libraries/glib-networking/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 87f3c78a82e..363d0ec7484 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + doCheck = false; # tests need to access the certificates (among other things) meta = with stdenv.lib; { From b54e5b908d3f85ad4fa2a40e9ad66ac6b3286952 Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 23 Feb 2018 22:56:36 +0100 Subject: [PATCH 2/9] kubernetes: patch broken go version check fixes #35403 patch from https://github.com/kubernetes/kubernetes/pull/58207 already merged upstream - remove for next version --- .../networking/cluster/kubernetes/default.nix | 5 +++++ .../cluster/kubernetes/go-version-check.patch | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubernetes/go-version-check.patch diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e2f431e2a5e..341abf98739 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; + # patch broken go version check, see issue #35403 + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + #TODO: patch already merged upstream - remove for next k8s version + patches = [ ./go-version-check.patch ]; + postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" diff --git a/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch b/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch new file mode 100644 index 00000000000..e3040cbb70f --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch @@ -0,0 +1,11 @@ +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -323,7 +323,7 @@ EOF + go_version=($(go version)) + local minimum_go_version + minimum_go_version=go1.9.1 +- if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then ++ if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then + kube::log::usage_from_stdin < Date: Sat, 24 Feb 2018 02:59:14 +0200 Subject: [PATCH 3/9] fio: 3.4 -> 3.5 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 1c98f712693..9e2bd1a2e2c 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "3.4"; - sha256 = "0img4288ygil36bsgpr4yh06zfbp3mdkf7zbyqjcrjgpr4mai9zf"; + version = "3.5"; + sha256 = "1h6qwvn0h3xz98420a19v8isfjkfnac9vvx8hsw8q4ycb35r8n3h"; in stdenv.mkDerivation rec { From 465d8b0fa9e1c25db1e39d65dd16f0cbd9144d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Feb 2018 01:18:46 +0000 Subject: [PATCH 4/9] kubernetes: use fetchpatch instead --- .../networking/cluster/kubernetes/default.nix | 13 ++++++++----- .../cluster/kubernetes/go-version-check.patch | 11 ----------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/kubernetes/go-version-check.patch diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 341abf98739..090fc98566d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; - # patch broken go version check, see issue #35403 - # patch is from https://github.com/kubernetes/kubernetes/pull/58207 - #TODO: patch already merged upstream - remove for next k8s version - patches = [ ./go-version-check.patch ]; + patches = [ + # patch is from https://github.com/kubernetes/kubernetes/pull/58207 + (fetchpatch { + url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; + sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; + }) + ]; postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" diff --git a/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch b/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch deleted file mode 100644 index e3040cbb70f..00000000000 --- a/pkgs/applications/networking/cluster/kubernetes/go-version-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hack/lib/golang.sh -+++ b/hack/lib/golang.sh -@@ -323,7 +323,7 @@ EOF - go_version=($(go version)) - local minimum_go_version - minimum_go_version=go1.9.1 -- if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then -+ if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then - kube::log::usage_from_stdin < Date: Tue, 20 Feb 2018 21:27:57 -0500 Subject: [PATCH 5/9] libiberty, libbfd: Make hash less fickle These shouldn't respond to targetPlatform, but previously did. The reason is somewhat complex: they would rely on the sources of gcc and binutils, respectively, which *do* depend on the target platform. Obviously the source is the same in all cases, but when those packages are no longer preserved from bootstrapping stages their `src` attributes use a different fetchurl resulting in a changed hash. --- pkgs/development/libraries/libbfd/default.nix | 6 ++++-- pkgs/development/libraries/libiberty/default.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 018239a3e77..ac508908e8f 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,8 +1,10 @@ -{ stdenv -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw +{ stdenv, buildPackages +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison , libiberty, zlib }: +let inherit (buildPackages.buildPackages) binutils-raw; in + stdenv.mkDerivation rec { name = "libbfd-${version}"; inherit (binutils-raw.bintools) version src; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 6608a3393b1..516e6bbbe88 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gcc, staticBuild ? false }: +{ stdenv, buildPackages, fetchurl, staticBuild ? false }: + +let inherit (buildPackages.buildPackages) gcc; in stdenv.mkDerivation rec { name = "libiberty-${gcc.cc.version}"; From fe5ae8b5507fb195346522c9a8f689b73a0d39ce Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 20 Feb 2018 21:34:29 -0500 Subject: [PATCH 6/9] androidenv: Clean up whitespace --- .../development/mobile/androidenv/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 470fb31b03b..2e8b5d286ac 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -4,7 +4,7 @@ rec { platformTools = import ./platform-tools.nix { inherit (pkgs) stdenv fetchurl unzip zlib; }; - + buildTools = import ./build-tools.nix { inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; @@ -12,11 +12,11 @@ rec { ncurses_32bit = pkgs_i686.ncurses5; ncurses = pkgs.ncurses5; }; - + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; - + supportRepository = import ./support-repository.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -47,18 +47,18 @@ rec { inherit (pkgs) stdenv fetchurl unzip makeWrapper; inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; - + inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; - + stdenv_32bit = pkgs_i686.stdenv; }; - + androidsdk_2_1 = androidsdk { platformVersions = [ "7" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_2_2 = androidsdk { platformVersions = [ "8" ]; abiVersions = [ "armeabi-v7a" ]; @@ -70,49 +70,49 @@ rec { abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_0 = androidsdk { platformVersions = [ "11" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_1 = androidsdk { platformVersions = [ "12" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_3_2 = androidsdk { platformVersions = [ "13" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0 = androidsdk { platformVersions = [ "14" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_0_3 = androidsdk { platformVersions = [ "15" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_1 = androidsdk { platformVersions = [ "16" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_2 = androidsdk { platformVersions = [ "17" ]; abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; - + androidsdk_4_3 = androidsdk { platformVersions = [ "18" ]; abiVersions = [ "armeabi-v7a" "x86" ]; @@ -152,7 +152,7 @@ rec { useExtraSupportLibs = true; useGooglePlayServices = true; }; - + androidsdk_6_0 = androidsdk { platformVersions = [ "23" ]; abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; @@ -224,12 +224,12 @@ rec { inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; - + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant gnumake gawk file which; inherit androidsdk androidndk; }; - + emulateApp = import ./emulate-app.nix { inherit (pkgs) stdenv; inherit androidsdk; From 7748972763c7db9589a3b7dc1bca4f9b688009e6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 20 Feb 2018 18:31:16 -0500 Subject: [PATCH 7/9] androidenv: Better platform conditionals --- .../mobile/androidenv/androidndk.nix | 2 +- .../mobile/androidenv/androidndk_r8e.nix | 2 +- .../development/mobile/androidenv/default.nix | 20 +++++++++++++------ .../mobile/androidenv/platform-tools.nix | 9 +++++++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 8ef58471d6a..81ec5732b9a 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ p7zip makeWrapper ]; + nativeBuildInputs = [ p7zip makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index ccf22d6b953..271a18e4ee0 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = let bin_path = "$out/bin"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 2e8b5d286ac..98531eeb069 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,8 +1,10 @@ -{pkgs, pkgs_i686, includeSources ? true}: +{ buildPackages, pkgs, pkgs_i686, targetPackages +, includeSources ? true +}: rec { platformTools = import ./platform-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib; + inherit buildPackages pkgs; }; buildTools = import ./build-tools.nix { @@ -214,14 +216,20 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; androidndk_r8e = import ./androidndk_r8e.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index fe75655c02b..f5e57994284 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,4 +1,9 @@ -{stdenv, zlib, fetchurl, unzip}: +{ buildPackages, pkgs }: + +let + inherit (buildPackages) fetchurl unzip; + inherit (pkgs) stdenv zlib; +in stdenv.mkDerivation rec { version = "26.0.2"; @@ -42,5 +47,5 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; } From da44efd01410cbae5435d3d9c0ae76b6616b22d1 Mon Sep 17 00:00:00 2001 From: Aaron Schif Date: Sat, 24 Feb 2018 00:43:52 -0600 Subject: [PATCH 8/9] homesick: 1.1.3 -> 1.1.6 --- pkgs/tools/misc/homesick/Gemfile.lock | 6 +++--- pkgs/tools/misc/homesick/default.nix | 2 +- pkgs/tools/misc/homesick/gemset.nix | 21 ++++++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock index cac0e8d083e..42ab916db3e 100644 --- a/pkgs/tools/misc/homesick/Gemfile.lock +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - homesick (1.1.3) + homesick (1.1.6) thor (>= 0.14.0) - thor (0.19.1) + thor (0.20.0) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.10.6 + 1.14.6 diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 0997b226802..d35267fae27 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, git}: bundlerEnv { - name = "homesick-1.1.3"; + name = "homesick-1.1.6"; gemdir = ./.; diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix index b4a3b608bcb..f5144827680 100644 --- a/pkgs/tools/misc/homesick/gemset.nix +++ b/pkgs/tools/misc/homesick/gemset.nix @@ -1,16 +1,19 @@ { homesick = { - version = "1.1.3"; + dependencies = ["thor"]; source = { - type = "gem"; - sha256 = "1pqsnbykisc6qamkz1gcbgis4az95sggxfdkq9v5hjr1a46q0s91"; + remotes = ["https://rubygems.org"]; + sha256 = "0lxvnp4ncbx0irlblfxbd1f8h4hl11hgmyiy35q79w137r3prxml"; + type = "gem"; }; + version = "1.1.6"; }; thor = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; + type = "gem"; + }; + version = "0.20.0"; }; -} +} \ No newline at end of file From 36725805be78ed748553623b29f1b75b6372c5ce Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 24 Feb 2018 07:45:03 +0100 Subject: [PATCH 9/9] testssl: 2.9.5-1 -> 2.9.5-2 --- pkgs/applications/networking/testssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 50ebee4a0ce..8ac2f7b0a3b 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs }: let - version = "2.9.5-1"; + version = "2.9.5-2"; pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9"; + sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w"; }; nativeBuildInputs = with pkgs; [