From 9dee19030ba5102e50098f6944d1455cf6f370f8 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Fri, 18 Aug 2017 14:18:22 -0500 Subject: nghttp2: 1.20.0 -> 1.24.0 This change does three things: 1. Increases nghttp2's version from 1.20.0 to 1.24.0 2. Adds a `bin` output 3. Enables building of nghttp2's suite of applications --- pkgs/development/libraries/nghttp2/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 3033c4301af..d534cd59bd8 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -17,15 +17,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.20.0"; + version = "1.24.0"; - # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; + sha256 = "18ys6p39yvm9wjjzhhlw35c9m8f5gf4dk9jbshibj19q4js1pnv9"; }; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "bin" "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libev zlib c-ares ] @@ -36,12 +35,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - meta = with stdenv.lib; { homepage = https://nghttp2.org/; description = "A C implementation of HTTP/2"; -- cgit 1.4.1 From 555900081dbe9ba821a23b6a6fd88e6d07941246 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Sat, 12 Aug 2017 22:13:04 -0700 Subject: ncurses: put tic binary in bin --- pkgs/development/libraries/ncurses/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index e2c3907e856..35b6659ad7e 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/clear" "$out" moveToOutput "bin/reset" "$out" moveToOutput "bin/tabs" "$out" + moveToOutput "bin/tic" "$out" moveToOutput "bin/tput" "$out" moveToOutput "bin/tset" "$out" ''; -- cgit 1.4.1 From 164eb72403f80eecb1987d3a0b3f37f94388724b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 25 Aug 2017 14:42:40 +0200 Subject: nasm: 2.12.02 -> 2.13.01 --- pkgs/development/compilers/nasm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index eb090e8b38a..8b6c6d94c75 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.12.02"; + version = "2.13.01"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00"; + sha256 = "1ylqs4sqh0paia970v6hpdgq5icxns9zlg21qql232bz1apppy88"; }; meta = with stdenv.lib; { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub willibutz ]; }; } -- cgit 1.4.1 From e82cb3dfa4de3e29ce52afd5576e9c50581e2b0f Mon Sep 17 00:00:00 2001 From: Matthew Robbetts Date: Fri, 4 Aug 2017 14:15:20 -0700 Subject: openldap: Fix build with LibreSSL. --- pkgs/development/libraries/openldap/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 94a4db43fda..06288ce9a6b 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; }; + patches = [ + (fetchurl { + url = "https://bz-attachments.freebsd.org/attachment.cgi?id=183223"; + sha256 = "1fiy457hrxmydybjlvn8ypzlavz22cz31q2rga07n32dh4x759r3"; + }) + ]; + patchFlags = [ "-p0" ]; + # TODO: separate "out" and "bin" outputs = [ "out" "dev" "man" "devdoc" ]; -- cgit 1.4.1 From 2cc7f1a7312bb6630086292e3905b8d647e0aa09 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Aug 2017 16:46:25 -0400 Subject: gettext: libiconv should be a buildInput --- pkgs/development/libraries/gettext/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index b96c4599994..ee74836df81 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -45,7 +45,9 @@ stdenv.mkDerivation rec { fi ''; - nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; # HACK, see #10874 (and 14664) + nativeBuildInputs = [ xz xz.bin ]; + # HACK, see #10874 (and 14664) + buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; enableParallelBuilding = true; -- cgit 1.4.1 From 095af3e63b26e4984c95de7d8a495503e6bfa605 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 31 Aug 2017 16:38:02 +0200 Subject: libgcrypt: 1.8.0 -> 1.8.1 Fixes CVE-2017-0379 See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00014.html for release announcement --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 732f3710563..34a3ed65b12 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "06w97l88y2c29zf8p8cg0m4k2kiiyj6pqxdl0cxigi3wp2brdr13"; + sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"; }; outputs = [ "out" "dev" "info" ]; -- cgit 1.4.1 From 3f30cffa559e105017a1f88a8f3667a11a416870 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 28 Aug 2017 16:07:06 -0400 Subject: misc pkgs: Use $NIX_BINUTILS for when needed Certain files are now only there instead of $NIX_CC (some are in both) --- pkgs/applications/audio/google-musicmanager/default.nix | 2 +- .../audio/google-play-music-desktop-player/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 2 +- pkgs/applications/editors/atom/default.nix | 4 ++-- pkgs/applications/editors/brackets/default.nix | 4 ++-- pkgs/applications/editors/jetbrains/default.nix | 2 +- pkgs/applications/editors/kodestudio/default.nix | 14 +++++++------- pkgs/applications/editors/lighttable/default.nix | 2 +- pkgs/applications/editors/sublime/default.nix | 2 +- pkgs/applications/editors/sublime3/default.nix | 2 +- pkgs/applications/editors/typora/default.nix | 2 +- pkgs/applications/editors/vscode/default.nix | 2 +- pkgs/applications/graphics/draftsight/default.nix | 2 +- pkgs/applications/misc/adobe-reader/builder.sh | 2 +- pkgs/applications/misc/googleearth/default.nix | 2 +- pkgs/applications/misc/houdini/runtime.nix | 2 +- pkgs/applications/misc/hyper/default.nix | 2 +- pkgs/applications/misc/ipmiview/default.nix | 4 ++-- pkgs/applications/misc/kdbplus/default.nix | 2 +- pkgs/applications/misc/kiwix/default.nix | 2 +- pkgs/applications/misc/rescuetime/default.nix | 2 +- pkgs/applications/misc/simplenote/default.nix | 2 +- pkgs/applications/networking/bittorrentsync/generic.nix | 2 +- .../networking/browsers/firefox-bin/default.nix | 2 +- .../networking/browsers/google-chrome/default.nix | 2 +- .../browsers/mozilla-plugins/flashplayer/default.nix | 2 +- .../browsers/mozilla-plugins/flashplayer/standalone.nix | 2 +- .../mozilla-plugins/google-talk-plugin/default.nix | 2 +- pkgs/applications/networking/browsers/opera/default.nix | 2 +- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/networking/dropbox/default.nix | 2 +- .../networking/instant-messengers/discord/default.nix | 2 +- .../networking/instant-messengers/franz/default.nix | 2 +- .../networking/instant-messengers/hipchat/default.nix | 2 +- .../instant-messengers/messenger-for-desktop/default.nix | 2 +- .../networking/instant-messengers/rambox/default.nix | 2 +- .../instant-messengers/skypeforlinux/default.nix | 2 +- .../networking/instant-messengers/slack/default.nix | 2 +- .../networking/instant-messengers/teamspeak/client.nix | 2 +- .../networking/instant-messengers/teamspeak/server.nix | 4 ++-- .../networking/instant-messengers/viber/default.nix | 2 +- .../networking/instant-messengers/zoom-us/default.nix | 8 ++++---- pkgs/applications/networking/insync/default.nix | 2 +- .../networking/mailreaders/nylas-mail-bin/default.nix | 4 ++-- .../networking/mailreaders/thunderbird-bin/default.nix | 2 +- pkgs/applications/networking/remote/anydesk/default.nix | 2 +- .../networking/remote/citrix-receiver/default.nix | 2 +- pkgs/applications/networking/resilio-sync/default.nix | 2 +- pkgs/applications/office/marp/default.nix | 2 +- pkgs/applications/office/moneyplex/default.nix | 4 ++-- pkgs/applications/office/wpsoffice/default.nix | 2 +- pkgs/applications/science/electronics/eagle/default.nix | 2 +- pkgs/applications/science/logic/saw-tools/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 2 +- pkgs/applications/science/logic/verifast/default.nix | 2 +- pkgs/applications/science/math/mathematica/10.nix | 2 +- pkgs/applications/science/math/mathematica/9.nix | 2 +- pkgs/applications/science/math/mathematica/default.nix | 2 +- pkgs/applications/science/math/scilab-bin/default.nix | 2 +- pkgs/applications/science/medicine/aliza/default.nix | 4 ++-- pkgs/applications/science/programming/fdr/default.nix | 2 +- pkgs/applications/taxes/aangifte-2006/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2007/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2008/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2009/default.nix | 2 +- pkgs/applications/taxes/aangifte-2010/default.nix | 2 +- pkgs/applications/taxes/aangifte-2011/default.nix | 2 +- pkgs/applications/taxes/aangifte-2012/default.nix | 2 +- pkgs/applications/taxes/aangifte-2013-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2013/default.nix | 2 +- pkgs/applications/taxes/aangifte-2014-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2014/default.nix | 2 +- pkgs/applications/version-management/gitkraken/default.nix | 2 +- pkgs/applications/video/makemkv/builder.sh | 2 +- pkgs/desktops/maxx/default.nix | 2 +- pkgs/development/arduino/arduino-core/default.nix | 6 +++--- pkgs/development/compilers/cmucl/binary.nix | 2 +- pkgs/development/compilers/crystal/default.nix | 2 +- pkgs/development/compilers/cudatoolkit/default.nix | 2 +- pkgs/development/compilers/gcc/builder.sh | 2 +- pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 +- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +- pkgs/development/compilers/gnatboot/default.nix | 2 +- pkgs/development/compilers/mentor/default.nix | 2 +- pkgs/development/compilers/mozart/binary.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 2 +- pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh | 4 ++-- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 +- pkgs/development/compilers/rust/binaryBuild.nix | 8 ++++---- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/compilers/zulu/default.nix | 2 +- pkgs/development/interpreters/dart/default.nix | 2 +- pkgs/development/interpreters/rebol/default.nix | 2 +- pkgs/development/libraries/libstdc++5/default.nix | 5 ++++- .../development/libraries/oracle-instantclient/default.nix | 2 +- pkgs/development/libraries/wtk/builder.sh | 2 +- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- pkgs/development/mobile/flashtool/default.nix | 2 +- pkgs/development/mobile/genymotion/default.nix | 2 +- pkgs/development/tools/electron/default.nix | 2 +- pkgs/development/tools/misc/saleae-logic/default.nix | 2 +- pkgs/development/tools/node-webkit/nw11.nix | 4 ++-- pkgs/development/tools/node-webkit/nw12.nix | 4 ++-- pkgs/development/tools/node-webkit/nw9.nix | 4 ++-- pkgs/development/tools/phantomjs/default.nix | 2 +- pkgs/development/tools/sauce-connect/default.nix | 2 +- pkgs/development/tools/thrust/default.nix | 2 +- pkgs/development/tools/unity3d/default.nix | 4 ++-- pkgs/games/adom/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/factorio/default.nix | 2 +- pkgs/games/oilrush/default.nix | 2 +- pkgs/games/openarena/default.nix | 2 +- pkgs/games/planetaryannihilation/default.nix | 4 ++-- pkgs/games/scrolls/default.nix | 2 +- pkgs/games/sdlmame/default.nix | 2 +- pkgs/games/terraria-server/default.nix | 4 ++-- pkgs/games/vessel/default.nix | 4 ++-- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/misc/cups/drivers/kyocera/default.nix | 2 +- pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh | 2 +- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- pkgs/misc/cups/drivers/samsung/default.nix | 2 +- pkgs/misc/drivers/gutenprint/bin.nix | 2 +- pkgs/misc/drivers/sundtek/default.nix | 2 +- pkgs/misc/foldingathome/default.nix | 2 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 2 +- pkgs/os-specific/linux/dmtcp/default.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh | 2 +- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- pkgs/os-specific/linux/prl-tools/default.nix | 2 +- pkgs/servers/mattermost/default.nix | 2 +- pkgs/servers/meteor/default.nix | 6 +++--- pkgs/servers/monitoring/newrelic-sysmond/default.nix | 2 +- pkgs/servers/sql/oracle-xe/default.nix | 2 +- pkgs/tools/filesystems/yandex-disk/default.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 2 +- pkgs/tools/misc/sam-ba/default.nix | 2 +- pkgs/tools/misc/staruml/default.nix | 2 +- pkgs/tools/misc/xflux/default.nix | 2 +- pkgs/tools/security/encryptr/default.nix | 2 +- pkgs/tools/security/enpass/default.nix | 2 +- pkgs/tools/security/fprot/default.nix | 2 +- pkgs/tools/security/gorilla-bin/default.nix | 2 +- pkgs/tools/security/keybase-gui/default.nix | 2 +- pkgs/tools/text/xidel/default.nix | 2 +- pkgs/top-level/haxe-packages.nix | 2 +- 155 files changed, 189 insertions(+), 186 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 72bec52b266..27ce9eb3d13 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager ''; diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d9af631183..2f235966a39 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { cp -r ./usr/share $out cp -r ./usr/bin $out - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" wrapProgram $out/bin/google-play-music-desktop-player \ diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8a..6b780cf0a75 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mkdir $out/bin ln -s $out/renoise $out/bin/renoise - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise ''; meta = { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index ad0f7ee14c5..29019c14f85 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation { rpath="$out/share/spotify:$libdir" patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/share/spotify/spotify librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e44d919ece6..ca421e97e4d 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { fixupPhase - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/share/atom" \ $out/share/atom/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 23cb16c0733..2dd43f9ba3c 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ $out/opt/brackets/Brackets - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${bracketsLibs}" \ $out/opt/brackets/Brackets-node diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 95f3c0801d2..5c042f2fe49 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -35,7 +35,7 @@ let ln -s ${cmake} bin/cmake lldbLibPath=$out/clion-${version}/bin/lldb/lib - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + interp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 patchelf --set-interpreter $interp \ diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index a0e94128909..ef07d7515aa 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -50,31 +50,31 @@ in postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' # Patch Binaries patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out:${atomEnv.libPath}" \ $out/kodestudio patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib" \ $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64 patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib" \ $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64 patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64 patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64 patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64 diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 74a83c1278a..d16d2d2cc64 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mv ./${name}-linux/* $out/share/LightTable patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \ $out/share/LightTable/LightTable diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 9cf5bd97d0a..57e00f7227d 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c295313621e..aa19a2ca19a 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -50,7 +50,7 @@ in let buildPhase = '' for i in sublime_text plugin_host crash_reporter; do patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $i done diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 0733bd79665..4be9b6dda20 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" ln -s "$out/share/typora/Typora" "$out/bin/typora" diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5db2a1aaece..94e28da2887 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -69,7 +69,7 @@ in postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/vscode/code ''; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 17334c5b366..32cce492589 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { mkdir $out/bin for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do echo "Patching $exe..." - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath:\$ORIGIN/../Libraries \ $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \ diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 41281385c99..75a2bdcf4b0 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -17,7 +17,7 @@ rm $p/Reader/intellinux/plug_ins/PPKLite.api # More pointless files. rm $p/bin/UNINSTALL -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ +patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $p/Reader/intellinux/bin/acroread diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index df8cb71d6f9..b343c1bf785 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm $out/bin/google-earth $out/opt/google/earth/free/google-earth ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${fullPath}:\$ORIGIN" \ $out/opt/google/earth/free/googleearth-bin diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b3ce98895e6..c2fe99744d1 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; postFixup = '' - INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" + INTERPRETER="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" for BIN in $(find $out/bin -type f -executable); do if patchelf $BIN 2>/dev/null ; then echo "Patching ELF $BIN" diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 2202dd8c4c4..c3ef5806058 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv opt "$out/" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" mv usr/* "$out/" ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index f9078475994..dd43e703d35 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws - patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/java ''; installPhase = '' diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index bf1b77534ce..f3855f2bb92 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/libexec patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath} \ ./q/l32/q mv ./q/l32/q $out/libexec/q diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index b0590fdc38f..7bfc6b33c95 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { postInstall = '' cp -r src/dependencies/xulrunner $out/lib/kiwix - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 03d058783b2..50f09ce1b5c 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/rescuetime wrapProgram $out/bin/rescuetime \ diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7367c820705..c84c25038d6 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -47,7 +47,7 @@ fixupPhase - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${libPath}:$out/share/simplenote" \ $out/share/simplenote/simplenote diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index 3fa7fe18040..342385c4b00 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D btsync "$out/bin/btsync" - patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" + patchelf --interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" ''; meta = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index f59cb402720..8abcb0cfaac 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation { updater crashreporter webapprt-stub do if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ "$out/usr/lib/firefox-bin-${version}/$executable" fi done diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 9a4d90701b2..ad79aef88a4 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do patchelf --set-rpath $rpath $elf - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $elf done ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 0452e7486e6..cc076fa02f0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$rpath" \ $out/bin/flash-player-properties ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 9a805eb55e4..9c37979a359 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$rpath" \ $out/bin/flashplayer${lib.optionalString debug "debugger"} ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12..2e815f77780 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \ $out/libexec/google/talkplugin/GoogleTalkPlugin diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 52a2ce9164c..66eaf8ecfba 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -114,7 +114,7 @@ in stdenv.mkDerivation { | while read f do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${rpath}" \ "$f" done diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 980c90a91ee..494fec1b3ff 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { buildCommand = '' # For convenience ... TBB_IN_STORE=$out/share/tor-browser - interp=$(< $NIX_CC/nix-support/dynamic-linker) + interp=$(< $NIX_BINUTILS/nix-support/dynamic-linker) # Unpack & enter mkdir -p "$TBB_IN_STORE" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a1238cb5964..7c6ad60116c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildPhase = '' echo "Patching Vivaldi binaries" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/vivaldi/vivaldi-bin '' + stdenv.lib.optionalString proprietaryCodecs '' diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 9af4cf3f0ed..dcbf609d08e 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" bin/container-executor; ''; installPhase = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index a76d6bc2fa4..975c5e4a87b 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -108,7 +108,7 @@ in mkDerivation { ''; preFixup = '' - INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) + INTERP=$(cat $NIX_BINUTILS/nix-support/dynamic-linker) RPATH="${ldpath}:$out/${appdir}" getType='s/ *Type: *\([A-Z]*\) (.*/\1/' find "$out/${appdir}" -type f -print | while read obj; do diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 853a6c96a7a..701ba477bee 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Copying how adobe-reader does it, # see pkgs/applications/misc/adobe-reader/builder.sh - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/discord:$libPath" \ $out/opt/discord/Discord diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index a238009cd11..f41805748e5 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" Franz patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz mkdir -p $out/bin $out/opt/franz diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 326f9563070..ccbb10c743b 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { mv usr/share $out for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $file || true patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true done diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix index 37a3746669b..1db674f9ae1 100644 --- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation { # patch the binaries for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/libexec $file || true done diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 7cb89f019e0..b5ce53177a7 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" rambox patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox mkdir -p $out/bin $out/opt/rambox diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index d476b9b35c4..f4ad5b74f60 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation { postFixup = '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux" ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f36f0956f65..1d1bc86d7cc 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { chmod -R g-w $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index efafbd9050c..7d1f3fa6791 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index c86de07bc84..bfd2469c1ce 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { '' echo "patching ts3server" patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3server cp tsdns/tsdnsserver tsdnsserver patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ tsdnsserver diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 71d1bccc2b1..afc977ad383 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { chmod -R g-w $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true done diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 91c77fc9d7c..208d45ed3dd 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -65,10 +65,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin cp -ar * $packagePath - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/qtdiag + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zopen # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 # it works for me without it, but, well... paxmark m $packagePath/zoom diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 93efdb74c08..4a6bec5d1da 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; postPatch = '' - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" client/insync-portable ''; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 4c768325fee..2350b9f9465 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Patch binaries binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \ --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ --set PATH "${coreutils}/bin" - patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \ --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79..8a4eb4991ad 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { for executable in \ thunderbird crashreporter thunderbird-bin plugin-container updater do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index a6858a7b5fd..93cb7c82b61 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "${libPath}" \ $out/bin/anydesk diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index c656ff24df8..f6c7285e3b7 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { echo "Patching ELF intrepreter and rpath for $f" chmod u+w "$f" patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$ICAInstDir:$libPath" "$f" done diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 7622cb76ad2..6df757626f8 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { installPhase = '' install -D rslsync "$out/bin/rslsync" patchelf \ - --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath} "$out/bin/rslsync" ''; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 0e53d58a083..124efb13946 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \ $out/bin/Marp ''; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4530305ee12..279a406327b 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { ${coreutils}/bin/cp "\$MDIR/moneyplex" "\$MDIR/moneyplex.patched" ${coreutils}/bin/chmod 0755 "\$MDIR/moneyplex.patched" fi - if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_CC/nix-support/dynamic-linker) ] || + if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_BINUTILS/nix-support/dynamic-linker) ] || [ ! \`${patchelf}/bin/patchelf --print-rpath \$MDIR/moneyplex.patched\` = "${libPath}" ]; then - ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched" + ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched" fi exec \$MDIR/moneyplex.patched diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 41dd8595c30..85deae9ec02 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec{ mkdir $out/bin for i in wps wpp et; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --force-rpath --set-rpath "$prefix/office6:$libPath" \ $prefix/office6/$i diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index edc5845e988..9ac4cc82039 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script - dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" + dynlinker="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF #!${stdenv.shell} diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 949b34420b7..e2c3e1fdc00 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { fixupPhase = '' for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${libPath}" $out/$x; done ''; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index db7e0c0c938..2ad991e00e3 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv tcsh $sharedir/TPTP2X/tptp2X_install -default - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X + patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X mkdir -p $out/bin ln -s $sharedir/TPTP2X/tptp2X $out/bin diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index ada586fc4e6..3ee3f8b7dec 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -10,7 +10,7 @@ let ] + ":${stdenv.cc.cc.lib}/lib64"; patchExe = x: '' - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; in diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 6a49976c86b..005c1c49609 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c4fd0c384c1..e190d8fde7f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { elif [ "$type" == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${ldpath}" \ "$f" patchelf --shrink-rpath "$f" diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 1e23cfea27f..89701991e58 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index f6e255ee46e..de6868698a7 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$fullLibPath" bin/scilab-bin find . -name '*.so' -type f | while read file; do patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index b0471b80e2f..74aefc26fc4 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation { libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; in '' ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/aliza ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/aliza-vtkvol wrapProgram $out/bin/aliza \ diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8ed8e0e73b0..ce48dd6fce7 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof do - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/lib" \ "$out/bin/$b" done diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index 1b709b613bd..aab55608ba5 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index 79e5b309769..f35bf307fbe 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -5,7 +5,7 @@ echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index 79e5b309769..f35bf307fbe 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -5,7 +5,7 @@ echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index c944fc3d68b..bad9be35753 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index b5a85415c37..fc2758adff2 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index a38bc4254bb..b45c99f6705 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 2e51ef9ed4c..9fb42d7b993 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix index 5ee0edb4b5e..8b97233c879 100644 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 3cf85961a9b..54cb8688590 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix index 78bb8214257..6a0023d756c 100644 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix index 0151cca52b2..697e0cd3561 100644 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ b/pkgs/applications/taxes/aangifte-2014/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c7f7a4b02e4..0d410d230d4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index 416d5c0f0b0..ee2dd392bb7 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -27,7 +27,7 @@ libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file? for i in ${bin} ; do patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath \ ${i} done diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 339183f906e..c264593ff6b 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { while IFS= read -r -d ''$'\0' i; do if isELF "$i"; then - bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` + bin=`patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$i"; echo $?` patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i" if [ "$bin" -eq 0 ]; then wrapProgram "$i" \ diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index fdb9d1be6ad..79f65c18114 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture} chmod +w ./TeensyduinoInstall.${teensy_architecture} upx -d ./TeensyduinoInstall.${teensy_architecture} - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ ./TeensyduinoInstall.${teensy_architecture} chmod +x ./TeensyduinoInstall.${teensy_architecture} @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { preFixup = '' for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib $file || true done @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString withTeensyduino '' # Patch the Teensy loader binary patchelf --debug \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ $out/share/arduino/hardware/tools/teensy ''} diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 2833c5378c1..4086e8d4dd6 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out tar -C $out -xjf ${dist} - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/lisp ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 62a504ef966..b17363516fd 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --suffix DYLD_LIBRARY_PATH : $libPath '' else '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ crystal-${version}-1/embedded/bin/crystal patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ crystal-${version}-1/embedded/bin/crystal diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 0b219b80447..f65fd4711ae 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -49,7 +49,7 @@ let echo "patching $i..." if [[ ! $i =~ \.so ]]; then patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + --set-interpreter "''$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $i fi rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 patchelf --set-rpath $rpath2 --force-rpath $i diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index ee56425f00b..443f674cf1d 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -25,7 +25,7 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)" + extraLDFlags="$(cat $NIX_BINUTILS/nix-support/libc-ldflags) $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before || true)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 60749a29b58..5d03573dbab 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 6140cde4a9e..10aa63ed4e3 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 100bb87768b..43775a343c1 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index a209e392bc6..1cb2d390431 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp -R * $out set +e for a in $out/bin/* ; do - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a done set -e diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 74905c6ffae..2922cef7e7a 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -18,7 +18,7 @@ let tar --strip-components=1 -xjf "$src" -C "$out" # Patch binaries - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" + interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do # Skip non-executable files case "$file" in diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ebe562fcde3..4857af08757 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { tar xvf $src -C $out --strip-components=1 for exe in $out/bin/{ozemulator,ozwish} ; do - patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(< $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath $libPath \ $exe done diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 8382be7a209..009f36f57f5 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { mkdir -p "$out" tar --strip-components=1 -xjf "$src" -C "$out" - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" + interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 459bfce5098..2cee0adc7d0 100644 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh @@ -5,7 +5,7 @@ unzip ${src} || true # set the dynamic linker of unpack200, necessary for construct script echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 +patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 echo "constructing JDK and JRE installations" if test -z "$installjdk"; then @@ -46,7 +46,7 @@ rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 2a00cf5f2d2..ca954f53ab1 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -179,7 +179,7 @@ let result = stdenv.mkDerivation rec { # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 37b06555bdb..cd20fb4afde 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -42,17 +42,17 @@ rec { ${optionalString (needsPatchelf && bootstrapping) '' patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ "$out/bin/cargo" ''} ${optionalString needsPatchelf '' patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ "$out/bin/rustc" # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc @@ -88,7 +88,7 @@ rec { ${optionalString needsPatchelf '' patchelf \ --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ "$out/bin/cargo" ''} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9..1cddcd6bc5b 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7e083ffe67b..dd41e01ad5b 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { echo ${version} > VERSION configureFlagsArray+=("--cc=cc") - configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") + configureFlagsArray+=("--elfinterp=$(< $NIX_BINUTILS/nix-support/dynamic-linker)") configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index f7638757ff7..72ee89dc350 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 3d19f7ba291..bb800bb62a9 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $out/bin/dart ''; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 8a13c4efce6..5af1fd62256 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' cp ${r3} make/r3-make chmod 777 make/r3-make - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./make/r3-make cd make perl -pi -e 's#-m32##g' makefile perl -pi -e 's#sudo .*#echo#g' makefile diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix index abe0538b8a9..4f4040ce5ed 100644 --- a/pkgs/development/libraries/libstdc++5/default.nix +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -62,7 +62,10 @@ stdenv.mkDerivation rec { # being generated to make sure that they use our glibc. EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir" + extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags)" + extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before)" + for i in $extraLDFlags; do EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" done diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index d0085752623..9119e4beb4f 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { done for exe in $out/bin/sqlplus; do - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe done diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 86f2719537c..ed9c052cf09 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -22,6 +22,6 @@ for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" {} \; find $out -type f -perm -0100 \ -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index fc2981f7f1f..5486230541f 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { } # Create wrappers - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/bin/clinfo patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo # Fix modes diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 0c1bb5d4d42..f9cd6bc3c40 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux ln -s swt32.jar x10flasher_lib/swtlin/swt.jar diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 745111171bb..c957f4151a0 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fixupPhase = '' patchInterpreter() { - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ "$out/libexec/genymotion/$1" } diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 74884e6f5a8..7a4e326ee8a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -31,7 +31,7 @@ let fixupPhase patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ $out/lib/electron/electron diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 86be86cb6d6..5a20a2ac167 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { cp -r * "$out" # Patch it - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/Logic" patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" # Build the LD_PRELOAD library that makes Logic work from a read-only directory diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 5028ac9580c..373032686ae 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 8e2953839b7..5205d534ab8 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -36,8 +36,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/nwjs cp -R * $out/share/nwjs - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/nwjs/nw + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/nwjs/nwjc ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index ba5d6c8e334..803f55f8134 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 8b6b655b6a5..9daa93ca3bb 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 3caec9a75c1..4f06c3ad63d 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchPhase = stdenv.lib.optionalString stdenv.isLinux '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ bin/sc ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 91a01edc23a..a59c8153caf 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/libexec/thrust unzip -d $out/libexec/thrust/ $src - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/libexec/thrust/thrust_shell wrapProgram $out/libexec/thrust/thrust_shell \ --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64" diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index c7ba985d0f7..e3d0f7f5845 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -99,10 +99,10 @@ in stdenv.mkDerivation rec { if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then if [[ "$ftype" =~ 32-bit ]]; then rpath="${libPath32}" - intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)" + intp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker-m32)" else rpath="${libPath64}" - intp="$(cat $NIX_CC/nix-support/dynamic-linker)" + intp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" fi oldRpath="$(patchelf --print-rpath "$1")" diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 016c965b6c0..77157e962e1 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lpath}" \ $out/adom diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 092f0773708..c9fa3a1d05e 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"} - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF #!/bin/sh cd $out/opt/andyetitmoves diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index fca28b17223..46ffbe17638 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -72,7 +72,7 @@ let cp -a data $out/share/factorio cp -a bin/${arch.inTar}/factorio $out/bin/factorio patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ $out/bin/factorio ''; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index d637c159595..b6c4e5f71f9 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { cd bin for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $f done patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1e396318bbb..41feab11f2a 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; - interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; + interpreter = "$(< \"$NIX_BINUTILS/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ]; in '' mkdir -pv $out/bin diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 451d4b71296..1f3223a3054 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/PA" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index c2beeb13cad..dd84c38b486 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { cp -r ../Scrolls_Data "$out/opt/Scrolls/" chmod +x "$out/opt/Scrolls/Scrolls" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$libPath" "$out/opt/Scrolls/Scrolls" mkdir "$out/bin" diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 947e52e1f13..5064c8d9d34 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ alsaLib qt48 SDL fontconfig freetype SDL_ttf xorg.libX11 xorg.libXinerama stdenv.cc.cc ]}" \ share/sdlmame/sdlmame diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5fcb5063bbc..15a5c2ec907 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. find "$out" | while read filepath; do if file "$filepath" | grep -q "ELF.*executable"; then - echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" - patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" + echo "setting interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") in $filepath" + patchelf --set-interpreter "$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" "$filepath" test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } fi done diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 34b9a606fb9..64f19ff7ab8 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { echo @@@ # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. - LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT + LD_PRELOAD=./isatty.so $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ IM_A_BOT @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # props to Ethan Lee (the Vessel porter) for understanding # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ $out/libexec/strangeloop/vessel/x86/vessel.x86 diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ba887d91de1..d69a50f56e7 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/2dboy/WorldOfGoo/ mkdir -p $out/bin - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 cp -r * $out/libexec/2dboy/WorldOfGoo/ diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index be9d4f83709..b75b903d06e 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 English/rastertokpsl $out/lib/cups/filter/rastertokpsl patchelf \ --set-rpath ${libPath} \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ $out/lib/cups/filter/rastertokpsl mkdir -p $out/share/cups/model/Kyocera diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index b0a03046934..fba2bb88acb 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { coreutils ghostscript gnugrep gnused which ]} - interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + interpreter=$(cat $NIX_BINUTILS/nix-support/dynamic-linker) patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3 patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3 diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index f750df6e506..0d68fc5b09c 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -27,7 +27,7 @@ ln -s ppd model cd $out/lib/cups/filter for i in $(ls); do echo "Patching $i..." - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $i || echo "Couldn't set interpreter!" patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. done diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index b30b4c4a2c1..22a0986e1fb 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { echo "Patching $exe" patchelf \ --set-rpath ${libPath} \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ $exe done unset GLOBIGNORE diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 556c408012d..e837807c89e 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$bin" patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" done diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index ac3e96e2658..768b9902c4b 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { $out/cups/lib/backend/{canon,epson} \ $out/sbin/cups-genppd.5.0 \ ; do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 4dc0f2591d8..1d7021137c0 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -34,7 +34,7 @@ in postFixup = '' find $out -type f -exec \ - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" {} \ patchelf --set-rpath ${rpath} {} \; ''; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index aaa932c0a1c..1b8bdc891b0 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = '' BINFILES="fah6 mpiexec"; for a in $BINFILES; do - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $a done mkdir -p $out/bin cp $BINFILES $out/bin diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index e7825a0ebd6..3d7bb74ce21 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules) + '' mv $out/etc/vulkan $out/share - interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + interpreter="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" libPath="$out/lib:$out/lib/gbm:$depLibPath" '' + optionalString (!stdenv.is64bit) '' for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index e67e54f7b43..1fdff871b73 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure \ --replace '#define ELF_INTERPRETER "$interp"' \ - "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\"" + "#define ELF_INTERPRETER \"$(cat $NIX_BINUTILS/nix-support/dynamic-linker)\"" ''; preConfigure = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index bb714f60c2d..a029b582f38 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for f in $out/bin/*; do if isELF "$f"; then - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$f" patchelf --set-rpath "$out/lib" "$f" fi done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh index 5d47df9a87a..a4704fd51df 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh @@ -81,7 +81,7 @@ installPhase() { for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 99813d38236..f41229ace86 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -111,7 +111,7 @@ installPhase() { for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do if [ -e "$i" ]; then install -Dm755 $i $bin/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$libPath $bin/bin/$i fi done diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9ca48ccaf05..bc574bc0d79 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/sbin/*; do patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:$libPath" \ $i done diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4668ac24096..787c685e61e 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/platform + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/bin/platform ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0b82f1deef6..36384da2047 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -39,21 +39,21 @@ stdenv.mkDerivation rec { patch -p1 < ${./main.patch} popd substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@INTERPRETER@" "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ --replace "@PATCHELF@" "${patchelf}/bin/patchelf" # Patch node. node=$devBundle/bin/node patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ $node # Patch mongo. for p in $devBundle/mongodb/bin/mongo{,d}; do patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ $p done diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index e9a9fcff2b9..8ba554d1b77 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/nrsysmond ''; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index e86406cd469..f499743d762 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 77302f3d4a2..72291ccb006 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath "${zlib.out}/lib:${p.gcclib}" \ $out/bin/yandex-disk ''; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 5341c9840be..cf15473e240 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cd $out unzip ${src} rpmextract linux/MegaCli-8.07.07-1.noarch.rpm - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64 + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 eval fixupPhase diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 21786f3f15f..9b98ac0137c 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp ${system}/SSDGuru $out/bin/ rm -rf linux{32,64} patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out \ $out/bin/SSDGuru diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 2d1db4eb64c..68675958fd3 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin/" \ "$out/opt/sam-ba/" cp -a . "$out/opt/sam-ba/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" cat > "$out/bin/sam-ba" << EOF export LD_LIBRARY_PATH="${libPath}" exec "$out/opt/sam-ba/sam-ba${maybe64}" diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index e1d6604970e..538f9d4a945 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mv opt/staruml $out/bin ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/StarUML mkdir -p $out/lib diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index d0f35844695..b861c9b4d9d 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp xflux "$out/bin" ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux" + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux" ''; meta = { description = "Adjusts your screen to emit warmer light at night"; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 2cf07c63a84..abea3eccf12 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { cp -v lib* $out/lib ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath $out/lib:${rpath} \ $out/bin/encryptr ''; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 449a6911a15..5774de21c54 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -73,7 +73,7 @@ let $out/share/applications/enpass.desktop for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $i done # The helper's sha256 sum must match, hence the use of libredirect. diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 14a4c985d50..0062758196f 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp f-prot.conf.default $out/opt/f-prot/f-prot.conf ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate + patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate mkdir -p $out/share/man/ mkdir -p $out/share/man/man1 diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index cbd260455d8..dc99d1953d5 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = let - interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; + interpreter = "$(< \"$NIX_BINUTILS/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; in '' mkdir -p $out/opt/password-gorilla diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index a45a6ea2a04..63bba05b6a0 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/keybase-gui ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 91cecce6122..95b8e270689 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 5a85dc3433b..a79f264848b 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -67,7 +67,7 @@ let postFixup = '' for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do chmod +w "$f" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true + patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true done ''; -- cgit 1.4.1 From dbf6d20d64af8572ae4a24850244befc475eea9e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 26 Aug 2017 11:43:30 -0400 Subject: binutils-wrapper: Import separately from cc-wrapper --- pkgs/build-support/binutils-wrapper/default.nix | 2 +- pkgs/build-support/cc-wrapper/default.nix | 18 ++------ pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.7/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- pkgs/development/compilers/mono/llvm.nix | 2 +- pkgs/stdenv/darwin/default.nix | 55 ++++++++++++++++--------- pkgs/stdenv/linux/default.nix | 35 +++++++++++++--- pkgs/top-level/all-packages.nix | 22 ++++++++-- pkgs/top-level/darwin-packages.nix | 4 +- 13 files changed, 95 insertions(+), 55 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/build-support/binutils-wrapper/default.nix b/pkgs/build-support/binutils-wrapper/default.nix index e885078c3de..7e255cdb2eb 100644 --- a/pkgs/build-support/binutils-wrapper/default.nix +++ b/pkgs/build-support/binutils-wrapper/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; passthru = { - inherit libc nativeTools nativeLibc nativePrefix prefix; + inherit binutils libc nativeTools nativeLibc nativePrefix prefix; emacsBufferSetup = pkgs: '' ; We should handle propagation here too diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c9820c27ea5..30520290086 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,18 +6,17 @@ # compiler and the linker just "work". { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell +, cc ? null, libc ? null, binutils, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} -, useMacosReexportHack ? false -} @ args: +}: with stdenv.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> - cc != null && binutils != null && coreutils != null && gnugrep != null; + cc != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); @@ -27,17 +26,6 @@ assert cc.langVhdl or false -> zlib != null; let inherit (stdenv) hostPlatform targetPlatform; - binutils = import ../binutils-wrapper { - inherit (args) binutils; - inherit # name - stdenv nativeTools noLibc nativeLibc nativePrefix - libc - coreutils shell gnugrep - extraPackages extraBuildCommands - buildPackages - useMacosReexportHack; - }; - # Prefix for binaries. Customarily ends with a dash separator. # # TODO(@Ericson2314) Make unconditional, or optional but always true by diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 79b0c9ff898..2080aa64149 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev or binutils.binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index c5503da9b83..b88cd232415 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 81aaa7cd65c..ce35a71272b 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a3f652d783b..ce366cb4973 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 654e1ce0023..98d5a0edffe 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 4978570334e..c116164f503 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 1036e43ea94..70eac4e83b3 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f4801d674e8..d71cda7f8a9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -63,10 +63,40 @@ in rec { extraBuildInputs, allowedRequisites ? null}: let + buildPackages = lib.optionalAttrs (last ? stdenv) { + inherit (last) stdenv; + }; + + coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; + gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; + + binutils = import ../../build-support/binutils-wrapper { + inherit shell; + inherit (last) stdenv; + + nativeTools = false; + nativeLibc = false; + inherit buildPackages coreutils gnugrep; + libc = last.pkgs.darwin.Libsystem; + binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; + }; + + cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + inherit shell; + inherit (last) stdenv; + + nativeTools = false; + nativeLibc = false; + inherit buildPackages coreutils gnugrep binutils; + libc = last.pkgs.darwin.Libsystem; + isClang = true; + cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; + }; + thisStdenv = import ../generic { inherit config shell extraNativeBuildInputs extraBuildInputs; allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ - thisStdenv.cc.expand-response-params + cc.expand-response-params cc.binutils ]; name = "stdenv-darwin-boot-${toString step}"; @@ -75,24 +105,9 @@ in rec { hostPlatform = localSystem; targetPlatform = localSystem; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { - inherit shell; - inherit (last) stdenv; - - nativeTools = false; - nativeLibc = false; - buildPackages = lib.optionalAttrs (last ? stdenv) { - inherit (last) stdenv; - }; - libc = last.pkgs.darwin.Libsystem; - isClang = true; - cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; - binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; - coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; - gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; - }; + inherit cc; - preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' + preHook = lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -350,8 +365,8 @@ in rec { xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk - gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out - binutils-raw.dev binutils gettext + gnugrep llvmPackages.clang-unwrapped patch pcre.out gettext + binutils-raw.binutils.out binutils-raw.binutils.dev binutils binutils.binutils cc.expand-response-params ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index fab1985b976..08166c55a5a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -143,7 +143,16 @@ in ''; }; gcc-unwrapped = bootstrapTools; - binutils = bootstrapTools; + binutils = import ../../build-support/binutils-wrapper { + nativeTools = false; + nativeLibc = false; + buildPackages = { }; + libc = self.glibc; + inherit (self) coreutils gnugrep; + binutils = bootstrapTools; + name = "bootstrap-binutils-wrapper"; + stdenv = self.stdenv; + }; coreutils = bootstrapTools; gnugrep = bootstrapTools; }; @@ -165,7 +174,7 @@ in # Rebuild binutils to use from stage2 onwards. overrides = self: super: { - binutils = super.binutils.override { gold = false; }; + binutils = super.binutils_nogold; inherit (prevStage) ccWrapperStdenv glibc gcc-unwrapped coreutils gnugrep; @@ -188,9 +197,14 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - binutils gcc-unwrapped coreutils gnugrep + gcc-unwrapped coreutils gnugrep perl paxctl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. + binutils = prevStage.binutils.override { + # Rewrap the binutils with the new glibc, so both the next + # stage's wrappers use it. + libc = self.glibc; + }; }; }) @@ -235,6 +249,15 @@ in # other purposes (binutils and top-level pkgs) too. inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; + binutils = super.binutils.override { + # Don't use stdenv's shell but our own + shell = self.bash + "/bin/bash"; + # Build expand-response-params with last stage like below + buildPackages = { + inherit (prevStage) stdenv; + }; + }; + gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; @@ -299,8 +322,8 @@ in allowedRequisites = with prevStage; with lib; # Simple executable tools concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk - gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + [ gzip bzip2 xz bash binutils.binutils coreutils diffutils findutils + gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies ++ map getLib ( @@ -310,7 +333,7 @@ in # More complicated cases ++ [ glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders - gcc gcc.cc gcc.cc.lib gcc.expand-response-params + binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] ++ lib.optionals (system == "aarch64-linux") [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1f96698e2a..d0b295c0c2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5223,7 +5223,9 @@ with pkgs; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; - useMacosReexportHack = true; + binutils = clang.binutils.override { + useMacosReexportHack = true; + }; }; clang_4 = llvmPackages_4.clang; @@ -6115,6 +6117,7 @@ with pkgs; }; ccWrapperFun = callPackage ../build-support/cc-wrapper; + binutilsWrapperFun = callPackage ../build-support/binutils-wrapper; wrapCC = wrapCCWith stdenv.cc.libc ""; # legacy version, used for gnat bootstrapping @@ -6140,6 +6143,15 @@ with pkgs; inherit cc binutils libc shell name; }; + wrapBinutils = baseBinutils: binutilsWrapperFun { + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; + libc = stdenv.cc.libc; + binutils = baseBinutils; + extraBuildCommands = ""; + }; + # prolog yap = callPackage ../development/compilers/yap { }; @@ -6690,13 +6702,15 @@ with pkgs; then darwin.binutils else binutils-raw; - binutils-raw = callPackage ../development/tools/misc/binutils { + binutils-raw = wrapBinutils (callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; - }; + }); binutils_nogold = lowPrio (binutils-raw.override { - gold = false; + binutils = binutils-raw.binutils.override { + gold = false; + }; }); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 32d540a8f96..a8c8f744d8a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -10,9 +10,9 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; - binutils = callPackage ../os-specific/darwin/binutils { + binutils = pkgs.wrapBinutils (callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; - }; + }); cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; -- cgit 1.4.1 From fc8fc63b67989b0516859f7388ff89a1abf97c48 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 2 Sep 2017 13:08:09 +0200 Subject: ruby_2_0_0: fix eval due to nested list --- pkgs/development/interpreters/ruby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index f3d4ae4bb00..60076455dae 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -83,7 +83,7 @@ let enableParallelBuilding = true; - hardeningDisable = lib.optional isRuby20 [ "format" ]; + hardeningDisable = lib.optional isRuby20 "format"; patches = (import ./patchsets.nix { -- cgit 1.4.1 From f3400b5ca9298ae0bb6bab25219debcccac41567 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 13:22:13 +0100 Subject: python.pkgs.urrlib3: 1.20 -> 1.22 --- .../development/python-modules/urllib3/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +--------------------- 2 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/urllib3/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix new file mode 100644 index 00000000000..a23ae0f0b74 --- /dev/null +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, tornado, mock, nose, psutil, pysocks }: + +buildPythonPackage rec { + pname = "urllib3"; + version = "1.22"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" + "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" + ]; + + checkPhase = '' + nosetests -v --cover-min-percentage 1 + ''; + + doCheck = false; + + buildInputs = [ coverage tornado mock nose psutil pysocks ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97265230beb..bcdcb07e5dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5347,38 +5347,7 @@ in { }; }; - urllib3 = let - disabled_tests = [ - "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" - "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" - ]; - in buildPythonPackage rec { - pname = "urllib3"; - version = "1.20"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp"; - }; - - NOSE_EXCLUDE=concatStringsSep "," disabled_tests; - - checkPhase = '' - nosetests -v --cover-min-percentage 1 - ''; - - doCheck = false; - - buildInputs = with self; [ coverage tornado mock nose psutil pysocks ]; - - meta = { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; - license = licenses.mit; - }; - }; - + urllib3 = callPackage ../development/python-modules/urllib3 {}; dropbox = buildPythonPackage rec { name = "dropbox-${version}"; -- cgit 1.4.1 From b4dbd7fdb8ddb1d9dc00fc24bb616173ce6f801b Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 13:26:52 +0100 Subject: python.pkgs.chardet: 2.3.0 -> 3.0.4 --- .../development/python-modules/chardet/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/chardet/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix new file mode 100644 index 00000000000..7e50dca4066 --- /dev/null +++ b/pkgs/development/python-modules/chardet/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "chardet"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + homepage = https://github.com/chardet/chardet; + description = "Universal encoding detector"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcdcb07e5dc..aa3d8d438a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8713,21 +8713,7 @@ in { }; }; - chardet = buildPythonPackage rec { - name = "chardet-2.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/chardet/${name}.tar.gz"; - sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; - }; - - meta = { - homepage = https://github.com/chardet/chardet; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + chardet = callPackage ../development/python-modules/chardet { }; django = self.django_1_11; -- cgit 1.4.1 From 8bc620ddc2bbcf7794194f218d66b0e141d9d1a3 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 13:30:51 +0100 Subject: python.pkgs.flask-compress: 1.3.2 -> 1.4.0 --- .../python-modules/flask-compress/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/flask-compress/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix new file mode 100644 index 00000000000..c46fce2fe75 --- /dev/null +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, flask }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "1.4.0"; + pname = "Flask-Compress"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cxdbdiyxkspg7vkchfmaqr7c6q79gwvakna3fjcc6nivps971j6"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Compress responses in your Flask app with gzip"; + homepage = "https://libwilliam.github.io/flask-compress/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa3d8d438a3..a12a95b5132 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9635,23 +9635,7 @@ in { }; }; - flask-compress = buildPythonPackage rec { - name = "Flask-Compress-${version}"; - version = "1.3.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Compress/${name}.tar.gz"; - sha256 = "4fbb53e7f6ce8b1458a2c3d7a528564912f2641ab2f9f43819fc96ed7f770734"; - }; - - propagatedBuildInputs = with self; [ flask ]; - - meta = { - description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; - license = licenses.mit; - }; - }; + flask-compress = callPackage ../development/python-modules/flask-compress { }; flask-cors = buildPythonPackage rec { name = "Flask-Cors-${version}"; -- cgit 1.4.1 From 99ed36e590cb290e4092e0fec74d46081680f08f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 13:34:32 +0100 Subject: python.pkgs.flask-cors: 2.1.2 -> 3.0.2 --- .../python-modules/flask-cors/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------------ 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/flask-cors/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix new file mode 100644 index 00000000000..4521374a0bb --- /dev/null +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage +, nose, flask, six }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-Cors"; + version = "3.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mnsyyqn8akin2vz98b9fbv63hcvwmfkaapsglw5jizdkmaz628a"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ flask six ]; + + meta = with stdenv.lib; { + description = "A Flask extension adding a decorator for CORS support"; + homepage = https://github.com/corydolphin/flask-cors; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a12a95b5132..f0765779613 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9637,24 +9637,7 @@ in { flask-compress = callPackage ../development/python-modules/flask-compress { }; - flask-cors = buildPythonPackage rec { - name = "Flask-Cors-${version}"; - version = "2.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Cors/${name}.tar.gz"; - sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ flask six ]; - - meta = { - description = "A Flask extension adding a decorator for CORS support"; - homepage = https://github.com/corydolphin/flask-cors; - license = with licenses; [ mit ]; - }; - }; + flask-cors = callPackage ../development/python-modules/flask-cors { }; flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; -- cgit 1.4.1 From bfabc3a78c909a6f6f0ea88dc2d34deba61c16d1 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 13:44:05 +0100 Subject: python.pkgs.flask-restful: 0.3.5 -> 0.3.6 --- .../python-modules/flask-restful/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +----------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/flask-restful/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix new file mode 100644 index 00000000000..c54c015af12 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, nose, mock, blinker +, flask, six, pytz, aniso8601, pycrypto +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Flask-RESTful"; + version = "0.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; + }; + +# TypeError: Only byte strings can be passed to C code + patchPhase = if isPy3k then '' + rm tests/test_crypto.py tests/test_paging.py + '' else null; + buildInputs = [ nose mock blinker ]; + propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = with stdenv.lib; { + homepage = "http://flask-restful.readthedocs.io/"; + description = "REST API building blocks for Flask"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0765779613..bed6a47c78d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9671,29 +9671,7 @@ in { flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; - flask-restful = buildPythonPackage rec { - name = "Flask-RESTful-${version}"; - version = "0.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-RESTful/${name}.tar.gz"; - sha256 = "cce4aeff959b571136b5af098bebe7d3deeca7eb1411c4e722ff2c5356ab4c42"; - }; - - # TypeError: Only byte strings can be passed to C code - patchPhase = if isPy3k then '' - rm tests/test_crypto.py tests/test_paging.py - '' else null; - buildInputs = with self; [ nose mock blinker ]; - propagatedBuildInputs = with self; [ flask six pytz aniso8601 pycrypto ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - meta = { - homepage = "http://flask-restful.readthedocs.io/"; - description = "REST API building blocks for Flask"; - license = licenses.bsd3; - }; - }; + flask-restful = callPackage ../development/python-modules/flask-restful { }; flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; # Exactly 0.8.6 is required by flexget -- cgit 1.4.1 From 4050ec5836fc55fc259f1e7c3fdc5e36b8081c1a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:53:19 +0100 Subject: python.pkgs.flask-restplus_0_8: remove --- .../python-modules/flask-restplus/0.8.nix | 42 ---------------------- pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/flask-restplus/0.8.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flask-restplus/0.8.nix b/pkgs/development/python-modules/flask-restplus/0.8.nix deleted file mode 100644 index 2c415ec47e3..00000000000 --- a/pkgs/development/python-modules/flask-restplus/0.8.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, blinker -, tzlocal -, mock -, rednose -, flask -, six -, jsonschema -, pytz -, aniso8601 -, flask-restful -}: - -buildPythonPackage rec { - pname = "flask-restplus"; - version = "0.8.6"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3bb76cc156b9a09da62396d82b29fa31e4f27cccf79528538fe7155cf2785593"; - }; - - checkInputs = [ nose blinker tzlocal mock rednose ]; - propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]; - - # RuntimeError: Working outside of application context. - doCheck = false; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/noirbizarre/flask-restplus; - description = "Fast, easy and documented API development with Flask"; - license = lib.licenses.mit; - }; -} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bed6a47c78d..f8f5d00a069 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,9 +9673,7 @@ in { flask-restful = callPackage ../development/python-modules/flask-restful { }; - flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; - # Exactly 0.8.6 is required by flexget - flask-restplus_0_8 = callPackage ../development/python-modules/flask-restplus/0.8.nix { }; + flask-restplus = callPackage ../development/python-modules/flask-restplus { }; flask_script = buildPythonPackage rec { name = "Flask-Script-${version}"; -- cgit 1.4.1 From ffb043b76939c274c798ff93b449e802a6180684 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:57:01 +0100 Subject: python.pkgs.requests: 2.13.0 -> 2.18.4 --- .../python-modules/requests/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/requests/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix new file mode 100644 index 00000000000..b85bb54a4f1 --- /dev/null +++ b/pkgs/development/python-modules/requests/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchPypi, buildPythonPackage +, urllib3, idna, chardet, certifi +, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "requests"; + version = "2.18.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; + }; + + nativeBuildInputs = [ pytest ]; + propagatedBuildInputs = [ urllib3 idna chardet certifi ]; + # sadly, tests require networking + doCheck = false; + + meta = with stdenv.lib; { + description = "An Apache2 licensed HTTP library, written in Python, for human beings"; + homepage = http://docs.python-requests.org/en/latest/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 353fa9eec82..ccc01a4abf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19269,25 +19269,7 @@ in { requests2 = throw "requests2 has been deprecated. Use requests instead."; # use requests, not requests_2 - requests = buildPythonPackage rec { - name = "requests-${version}"; - version = "2.13.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; - }; - - nativeBuildInputs = [ self.pytest ]; - # sadly, tests require networking - doCheck = false; - - meta = { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; - license = licenses.asl20; - }; - }; + requests = callPackage ../development/python-modules/requests { }; requests_download = buildPythonPackage rec { pname = "requests_download"; -- cgit 1.4.1 From c9f387a55c7bbb8a67e86fa254f1684ce8972a16 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 16:01:22 +0100 Subject: python.pkgs.tzlocal: 1.2.2 -> 1.4 --- .../development/python-modules/tzlocal/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/tzlocal/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix new file mode 100644 index 00000000000..2277cb7c4ca --- /dev/null +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, tzlocal, pytz }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "tzlocal"; + version = "1.4"; + + propagatedBuildInputs = [ pytz ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + }; + + # test fail (timezone test fail) + doCheck = false; + + meta = with stdenv.lib; { + description = "Tzinfo object for the local timezone"; + homepage = https://github.com/regebro/tzlocal; + license = licenses.cddl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ccc01a4abf4..a949db1b263 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22973,25 +22973,7 @@ in { twisted = callPackage ../development/python-modules/twisted { }; - tzlocal = buildPythonPackage rec { - name = "tzlocal-1.2.2"; - - propagatedBuildInputs = with self; [ pytz ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tzlocal/${name}.tar.gz"; - sha256 = "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb"; - }; - - # test fail (timezone test fail) - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Tzinfo object for the local timezone"; - homepage = https://github.com/regebro/tzlocal; - license = licenses.cddl; - }; - }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; -- cgit 1.4.1 From 50cc30da735c75885789de1728e43d54d318a07a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 16:05:56 +0100 Subject: python.pkgs.werkzeug: 0.11.10 -> 0.12 --- .../python-modules/werkzeug/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------- 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/werkzeug/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix new file mode 100644 index 00000000000..5979d895a74 --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous +, pytest, requests, glibcLocales }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Werkzeug"; + version = "0.12.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ itsdangerous ]; + buildInputs = [ pytest requests glibcLocales ]; + + meta = with stdenv.lib; { + homepage = http://werkzeug.pocoo.org/; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a949db1b263..a4bd8e43b45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23648,28 +23648,7 @@ EOF }; }; - - werkzeug = buildPythonPackage rec { - name = "Werkzeug-0.11.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/Werkzeug/${name}.tar.gz"; - sha256 = "1vpf98k4jp4yhbv2jbyq8dj5fdasrd26rkq34pacs5n7mkxxlr6c"; - }; - - LC_ALL = "en_US.UTF-8"; - - propagatedBuildInputs = with self; [ itsdangerous ]; - buildInputs = with self; [ pytest requests pkgs.glibcLocales ]; - - - - meta = { - homepage = http://werkzeug.pocoo.org/; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - }; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; wheel = callPackage ../development/python-modules/wheel { }; -- cgit 1.4.1 From 7ea007653751da650da6aa33e2293adad3573ac0 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 16:06:31 +0100 Subject: python.pkgs.tempora: 1.4 -> 1.8 --- pkgs/development/python-modules/tempora/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 69006a31905..a8eba4cb3a0 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,19 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools_scm, six }: +, setuptools_scm +, six, pytz}: buildPythonPackage rec { - version = "1.4"; - pname = "tempora"; name = "${pname}-${version}"; + pname = "tempora"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "0ysvns22i5hzhl5ln4n86bq10j8xwvd09z8qw1zjr3s0fj3lynza"; + sha256 = "1b29d19r8h5my9kzzywi9khn1qzvk3qzp08k0f4rrsa7qks930l4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six pytz ]; } -- cgit 1.4.1 From c6539df7ab32a1650d3327452bb5e051cf3377fd Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:17:06 +0100 Subject: python.pkgs.dateutil: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/dateutil/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index c814b82dad0..b980381edbb 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchurl, six }: +{ stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { - pname = "dateutil"; name = "${pname}-${version}"; - version = "2.6.0"; + pname = "python-dateutil"; + version = "2.6.1"; - src = fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2"; + src = fetchPypi { + inherit pname version; + sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749"; }; propagatedBuildInputs = [ six ]; -- cgit 1.4.1 From 69c4724dd4be7eea0f130c44114f8fe013fe0f55 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:17:49 +0100 Subject: python.pkgs.backports_unittest-mock: init at 1.3 --- .../backports_unittest-mock/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/backports_unittest-mock/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix new file mode 100644 index 00000000000..e64f51fe7ca --- /dev/null +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "backports.unittest_mock"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6"; + }; + + propagatedBuildInputs = [ mock ]; + + buildInputs = [ setuptools_scm ]; + + meta = with stdenv.lib; { + description = "Provides a function install() which makes the mock module"; + homepage = https://github.com/jaraco/backports.unittest_mock; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4bd8e43b45..54367512727 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1259,6 +1259,8 @@ in { }; }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + babelfish = buildPythonPackage rec { version = "0.5.5"; name = "babelfish-${version}"; -- cgit 1.4.1 From 1041009a92d2bcdd2dfc752ebadd2dee033a78db Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:18:33 +0100 Subject: python.pkgs.cheroot: init at 5.5.0 --- .../development/python-modules/cheroot/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/cheroot/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix new file mode 100644 index 00000000000..c20cbabe0d6 --- /dev/null +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage +, six +, coverage, codecov, pytest, pytestcov, pytest-sugar, portend +, backports_unittest-mock, setuptools_scm }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cheroot"; + version = "5.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr"; + }; + + propagatedBuildInputs = [ six ]; + buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ]; + + checkPhase = '' + py.test cheroot + ''; + + meta = with stdenv.lib; { + description = "High-performance, pure-Python HTTP"; + homepage = https://github.com/cherrypy/cheroot; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54367512727..896cc0aa676 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ in { channels = callPackage ../development/python-modules/channels {}; + cheroot = callPackage ../development/python-modules/cheroot {}; + circus = buildPythonPackage rec { name = "circus-0.11.1"; -- cgit 1.4.1 From dc6d287dcfa9154f3a06fbc40518c2740b39c104 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:20:01 +0100 Subject: python.pkgs.portend: init at 2.1.2 --- .../development/python-modules/portend/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/portend/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix new file mode 100644 index 00000000000..9092185a40f --- /dev/null +++ b/pkgs/development/python-modules/portend/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest-sugar, pytest-warnings, setuptools_scm +, tempora }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "portend"; + version = "2.1.2"; + + buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; + propagatedBuildInputs = [ tempora ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dx8b1rn64ymx5s4mdzlw5hz59qi167z7nny36dl75ghlldn41w4"; + }; + + meta = with stdenv.lib; { + description = "Monitor TCP ports for bound or unbound states"; + homepage = https://github.com/jaraco/portend; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 896cc0aa676..5d7063904ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16638,6 +16638,8 @@ in { }; }; + portend = callPackage ../development/python-modules/portend { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = buildPythonPackage rec { -- cgit 1.4.1 From be7d6c4cfdf24020eb570783e819e9e80adbc8d2 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:27:33 +0100 Subject: python.pkgs.beautifulsoup: 4.5.3 -> 4.6.0 --- .../python-modules/beautifulsoup4/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/beautifulsoup4/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix new file mode 100644 index 00000000000..fd8bddee14b --- /dev/null +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "beautifulsoup4"; + version = "4.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0"; + }; + + buildInputs = [ nose ]; + checkPhase = '' + nosetests build + ''; + + meta = with stdenv.lib; { + homepage = http://crummy.com/software/BeautifulSoup/bs4/; + description = "HTML and XML parser"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d7063904ca..e3678e70e70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1359,26 +1359,7 @@ in { }; }); - beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j"; - }; - - buildInputs = [ self.nose ]; - checkPhase = '' - nosetests build/ - ''; - - meta = { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; - description = "HTML and XML parser"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { name = "Beaker-${version}"; -- cgit 1.4.1 From ec33fe618186d572b4bc6db9714cd320207685e8 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:31:39 +0100 Subject: python.pkgs.cherrypy: 8.7.0 -> 11.0.0 --- .../python-modules/cherrypy/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/cherrypy/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix new file mode 100644 index 00000000000..327a10f2491 --- /dev/null +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pytest, setuptools_scm, pytestrunner +, six, cheroot, portend }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "CherryPy"; + version = "11.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan"; + }; + + # wsgiserver.ssl_pyopenssl is broken on py3k. + doCheck = !isPy3k; + buildInputs = [ pytest setuptools_scm pytestrunner ]; + propagatedBuildInputs = [ six cheroot portend ]; + + meta = with stdenv.lib; { + homepage = "http://www.cherrypy.org"; + description = "A pythonic, object-oriented HTTP framework"; + license = licenses.mit.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3678e70e70..79c089c5b5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2774,27 +2774,7 @@ in { }; }; - - cherrypy = buildPythonPackage (rec { - name = "cherrypy-${version}"; - version = "8.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CherryPy/CherryPy-${version}.tar.gz"; - sha256 = "cbf418bf46458a67eb841944f2d414c23bf59d090baf2a28704bd67243e6a79f"; - }; - - # wsgiserver.ssl_pyopenssl is broken on py3k. - doCheck = !isPy3k; - buildInputs = with self; [ pytest setuptools_scm pytestrunner ]; - propagatedBuildInputs = with self; [ six ]; - - meta = { - homepage = "http://www.cherrypy.org"; - description = "A pythonic, object-oriented HTTP framework"; - }; - }); - + cherrypy = callPackage ../development/python-modules/cherrypy {}; cjson = buildPythonPackage rec { name = "python-cjson-${version}"; -- cgit 1.4.1 From 1089ccedb7362efebbbbd5e9a76a72e54c03dbc4 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:32:28 +0100 Subject: python.pkgs.pytest-warnings: init at 0.3.0 --- .../python-modules/pytest-warnings/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-warnings/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix new file mode 100644 index 00000000000..e6ebfcbb716 --- /dev/null +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-warnings"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18yxh153icmndaw8fkl1va0bk0mwzrbpaa6wxd29w3iwxym5zn2a"; + }; + + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Plugin to list Python warnings in pytest report"; + homepage = github.com/fschulze/pytest-warnings; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79c089c5b5a..836ff07afd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4232,6 +4232,8 @@ in { }; }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + pytestpep8 = buildPythonPackage rec { name = "pytest-pep8"; src = pkgs.fetchurl { -- cgit 1.4.1 From bde5cde9c65ed5e8eb2b0522acac4abca21ba46d Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:32:58 +0100 Subject: python.pkgs.pytest-sugar: init at 0.9.0 --- .../python-modules/pytest-sugar/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-sugar/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix new file mode 100644 index 00000000000..81f5a2cbd4b --- /dev/null +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-sugar"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + }; + + propagatedBuildInputs = [ termcolor pytest ]; + + meta = with stdenv.lib; { + description = "A plugin that changes the default look and feel of py.test"; + homepage = https://github.com/Frozenball/pytest-sugar; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 836ff07afd5..ab90dfd5e01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4444,6 +4444,8 @@ in { }; }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + tinycss = buildPythonPackage rec { name = "tinycss-${version}"; version = "0.3"; -- cgit 1.4.1 From 32a158b43a1e38761f44d382d13b40a6f8172842 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:35:37 +0100 Subject: python.pkgs.flask: 0.12 -> 0.12.2 --- pkgs/development/python-modules/flask/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/flask/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix new file mode 100644 index 00000000000..b16dc08a5e1 --- /dev/null +++ b/pkgs/development/python-modules/flask/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, itsdangerous, click, werkzeug, jinja2 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.12.2"; + pname = "Flask"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29"; + }; + + propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; + + meta = with stdenv.lib; { + homepage = http://flask.pocoo.org/; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab90dfd5e01..5da7d551e5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9551,22 +9551,7 @@ in { }; }; - flask = buildPythonPackage { - name = "flask-0.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask/Flask-0.12.tar.gz"; - sha256 = "12yasybryp33rdchsqgckf15zj4pjfam7ly5spmn2sijpv6h7s4k"; - }; - - propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; - - meta = { - homepage = http://flask.pocoo.org/; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = licenses.bsd3; - }; - }; + flask = callPackage ../development/python-modules/flask { }; flask_assets = buildPythonPackage rec { name = "Flask-Assets-${version}"; -- cgit 1.4.1 From 4e1b5e15fbc15d7d7ea05f7247428d0145e66dfd Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:41:12 +0100 Subject: python.pkgs.jsonschema: 2.5.3 -> 2.6.0 --- .../python-modules/jsonschema/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/jsonschema/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix new file mode 100644 index 00000000000..cd29d7b5d31 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, python +, nose, mock, vcversioner, functools32 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "jsonschema"; + version = "2.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg"; + }; + + buildInputs = [ nose mock vcversioner ]; + propagatedBuildInputs = [ functools32 ]; + + patchPhase = '' + substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \ + --replace "python" "${python}/bin/${python.executable}" + ''; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/Julian/jsonschema; + description = "An implementation of JSON Schema validation for Python"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5da7d551e5c..8b951465c39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9804,33 +9804,7 @@ in { }; }; - jsonschema = buildPythonPackage (rec { - version = "2.5.1"; - name = "jsonschema-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonschema/jsonschema-${version}.tar.gz"; - sha256 = "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn"; - }; - - buildInputs = with self; [ nose mock vcversioner ]; - propagatedBuildInputs = with self; [ functools32 ]; - - patchPhase = '' - substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" - ''; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://github.com/Julian/jsonschema; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; - }); + jsonschema = callPackage ../development/python-modules/jsonschema { }; vcversioner = buildPythonPackage rec { name = "vcversioner-${version}"; -- cgit 1.4.1 From d6e40f2c146472fb1a79acf001d6031145038456 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:46:56 +0100 Subject: python.pkgs.vcversioner: 2.14.0.0 -> 2.16.0.0 --- .../development/python-modules/vcversioner/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/vcversioner/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix new file mode 100644 index 00000000000..1b9819c035d --- /dev/null +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "vcversioner"; + version = "2.16.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"; + }; + + meta = with stdenv.lib; { + description = "take version numbers from version control"; + homepage = https://github.com/habnabit/vcversioner; + licenses = licenses.isc; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b951465c39..06f588d97c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9806,19 +9806,7 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; - vcversioner = buildPythonPackage rec { - name = "vcversioner-${version}"; - version = "2.14.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/vcversioner/vcversioner-${version}.tar.gz"; - sha256 = "11ivq1bm7v0yb4nsfbv9m7g7lyjn112gbvpjnjz8nv1fx633dm5c"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/habnabit/vcversioner"; - }; - }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; falcon = buildPythonPackage (rec { name = "falcon-1.0.0"; -- cgit 1.4.1 From 9788c3f42124ac1480638efc546f4a1ad3221ab1 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 15:49:56 +0100 Subject: python.pkgs.jinja2: 2.9.5 -> 2.9.6 --- pkgs/development/python-modules/jinja2/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------------- 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/jinja2/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix new file mode 100644 index 00000000000..ca286ae06aa --- /dev/null +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, markupsafe }: + +buildPythonPackage rec { + pname = "Jinja2"; + version = "2.9.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + }; + + propagatedBuildInputs = [ markupsafe ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://jinja.pocoo.org/; + description = "Stand-alone template engine"; + license = licenses.bsd3; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + platforms = platforms.all; + maintainers = with maintainers; [ pierron garbas sjourdois ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06f588d97c3..51459b014c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11248,34 +11248,7 @@ in { }; }; - jinja2 = buildPythonPackage rec { - pname = "Jinja2"; - version = "2.9.5"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; - }; - - propagatedBuildInputs = with self; [ markupsafe ]; - - # No tests included - doCheck = false; - - meta = { - homepage = http://jinja.pocoo.org/; - description = "Stand-alone template engine"; - license = licenses.bsd3; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ pierron garbas sjourdois ]; - }; - }; + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_time = buildPythonPackage rec { version = "0.2.0"; -- cgit 1.4.1 From 6ba195897cd896a3afed78737af089c57ddd6673 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 27 Aug 2017 16:20:43 +0100 Subject: guessit_2_0: init at 2.0.4 --- pkgs/development/python-modules/guessit/2.0.nix | 32 +++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/guessit/2.0.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix new file mode 100644 index 00000000000..960babd84e2 --- /dev/null +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestrunner +, dateutil +, babelfish +, rebulk +}: + +buildPythonPackage rec { + pname = "guessit"; + version = "2.0.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg"; + }; + + # Tests require more packages. + doCheck = false; + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ + dateutil babelfish rebulk + ]; + + meta = { + homepage = http://pypi.python.org/pypi/guessit; + license = lib.licenses.lgpl3; + description = "A library for guessing information from video files"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51459b014c0..c6798d63602 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10549,6 +10549,9 @@ in { guessit = callPackage ../development/python-modules/guessit { }; + # used by flexget + guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { }; + rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; -- cgit 1.4.1 From c1dea51fa169cbe8b8f78ac43bc86bb5b3d88be7 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 28 Aug 2017 11:00:26 +0100 Subject: pandas: fix dateutil tests --- pkgs/development/python-modules/pandas/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index ca3f20d7ca3..7bab184bb2a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -76,8 +76,13 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' + # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \ - ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""} + -k "not test_fallback_plural and \ + not test_ambiguous_flags and \ + not test_ambiguous_compat \ + ${optionalString isDarwin "and not test_locale and not test_clipboard"}" runHook postCheck ''; -- cgit 1.4.1 From f1796b8be0472e6e790a07a18e5b4c02907dffe4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:03:20 +0200 Subject: python.pkgs.service-identity: move expression --- .../python-modules/service_identity/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------- 2 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/service_identity/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix new file mode 100644 index 00000000000..69f9d7bf3f5 --- /dev/null +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, characteristic +, pyasn1 +, pyasn1-modules +, pyopenssl +, idna +, attrs +, pytest +}: + +buildPythonPackage rec { + pname = "service_identity"; + version = "16.0.0"; + name = "${pname}-${version}"; + + + src = fetchPypi { + inherit pname version; + sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; + }; + + propagatedBuildInputs = [ + characteristic pyasn1 pyasn1-modules pyopenssl idna attrs + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6798d63602..a165531365c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25585,27 +25585,7 @@ EOF }; - service-identity = buildPythonPackage rec { - name = "service-identity-${version}"; - version = "16.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz"; - sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; - }; - - propagatedBuildInputs = with self; [ - characteristic pyasn1 pyasn1-modules pyopenssl idna attrs - ]; - - buildInputs = with self; [ - pytest - ]; - - checkPhase = '' - py.test - ''; - }; + service-identity = callPackage ../development/python-modules/service_identity { }; signedjson = buildPythonPackage rec { name = "signedjson-${version}"; -- cgit 1.4.1 From 8521ea97a76c1ce3c45c0e4040a0b14a4ee6d088 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:05:30 +0200 Subject: python.pkgs.twisted: add the tls extras With setuptools it is possible to define optional sets of packages. Sometimes packages may require a dependency with such extras. In that case we could now add e.g. twisted.extras.tls to the propagatedBuildInputs. --- pkgs/development/python-modules/twisted/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 66a6022802f..8acbfc91a41 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,15 @@ -{ stdenv, buildPythonPackage, fetchurl, python, - zope_interface, incremental, automat, constantly, hyperlink +{ stdenv +, buildPythonPackage +, fetchurl +, python +, zope_interface +, incremental +, automat +, constantly +, hyperlink +, pyopenssl +, service-identity +, idna }: buildPythonPackage rec { pname = "Twisted"; @@ -13,6 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; + passthru.extras.tls = [ pyopenssl service-identity idna ]; + # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False patchPhase = stdenv.lib.optionalString stdenv.isLinux '' -- cgit 1.4.1 From 93a13c19bc43e8cf83c6df9042d02a8edc585f95 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:06:04 +0200 Subject: python.pkgs.sqlalchemy-migrate: disable tests because they depend on oslo-config which is broken. --- pkgs/development/python-modules/sqlalchemy-migrate/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 9cf1ba1b3d8..9b431f29acb 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; - buildInputs = [ unittest2 scripttest pytz pylint tempest-lib mock testtools ]; + checkInputs = [ unittest2 scripttest pytz pylint mock testtools ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; checkPhase = '' @@ -27,6 +27,9 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; + # Tests require tempest-lib which requires the broken oslo-config + doCheck = false; + meta = with stdenv.lib; { homepage = http://code.google.com/p/sqlalchemy-migrate/; description = "Schema migration tools for SQLAlchemy"; -- cgit 1.4.1 From d447471ea12bcde1f9821067084201462a25c6d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 30 Aug 2017 22:06:49 +0200 Subject: python.pkgs.sphinx-testing: 0.7.1 -> 0.7.2 --- .../python-modules/sphinx-testing/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx-testing/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix new file mode 100644 index 00000000000..2efb23c8086 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, sphinx +, six +, python +}: + +buildPythonPackage rec { + pname = "sphinx-testing"; + version = "0.7.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94"; + }; + + checkInputs = [ mock ]; + propagatedBuildInputs = [ sphinx six ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # Test failures https://github.com/sphinx-doc/sphinx-testing/issues/5 + doCheck = false; + + meta = { + homepage = https://github.com/sphinx-doc/sphinx-testing; + license = lib.licenses.bsd2; + description = "Testing utility classes and functions for Sphinx extensions"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a165531365c..3ce254acb51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21545,29 +21545,7 @@ in { }; }); - sphinx-testing = buildPythonPackage rec { - name = "sphinx-testing-${version}"; - version = "0.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx-testing/${name}.tar.gz"; - sha256 = "0cd235ce939770ae5128eda01d8611fb1e36d8129399e98565f99fcbff3a8062"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ sphinx six ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - meta = { - homepage = https://github.com/sphinx-doc/sphinx-testing; - license = licenses.bsd2; - description = "Testing utility classes and functions for Sphinx extensions"; - }; - - }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; sphinxcontrib-blockdiag = buildPythonPackage (rec { name = "${pname}-${version}"; -- cgit 1.4.1 From 6b3755ed13a0e41f8f53eeff2dbfec4e802e77a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:11:44 +0200 Subject: python.pkgs.oslo-config: mark as broken --- pkgs/development/python-modules/oslo-config/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 6323e72e2a5..51b2f0df75d 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -19,4 +19,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt --replace "argparse" "" ''; + + # Requires a bunch of new packages + meta.broken = true; } -- cgit 1.4.1 From ef49ba9d1b7ccc4bb886901e6d4ea524d46863f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:13:37 +0200 Subject: python.pkgs.service-identity: init at 17.0.0 --- pkgs/development/python-modules/service_identity/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 69f9d7bf3f5..d27c4fe2975 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "service_identity"; - version = "16.0.0"; + version = "17.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; + sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab"; }; propagatedBuildInputs = [ @@ -32,4 +32,7 @@ buildPythonPackage rec { checkPhase = '' py.test ''; + + # Tests not included in archive + doCheck = false; } \ No newline at end of file -- cgit 1.4.1 From bef9aa432ce570f39468d792f5b62fc58b388dd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:15:36 +0200 Subject: python.pkgs.treq: disable tests --- pkgs/development/python-modules/treq/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 5ee984941d0..6bd7355b34d 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six -, mock, twisted, incremental, pep8 }: +, mock, twisted, incremental, pep8, httpbin +}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,11 +12,20 @@ buildPythonPackage rec { sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16"; }; - propagatedBuildInputs = [ twisted requests six incremental service-identity ]; + propagatedBuildInputs = [ + requests + six + incremental + service-identity + twisted + # twisted [tls] requirements (we should find a way to list "extras") + twisted.extras.tls + ]; checkInputs = [ pep8 mock + httpbin ]; postPatch = '' @@ -35,6 +45,9 @@ buildPythonPackage rec { trial treq ''; + # Failing tests https://github.com/twisted/treq/issues/208 + doCheck = false; + meta = with stdenv.lib; { homepage = http://github.com/twisted/treq; description = "A requests-like API built on top of twisted.web's Agent"; -- cgit 1.4.1 From ae6c8be79176870969c9da19f71178b8fa567952 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:32:25 +0200 Subject: python.pkgs.testtools: move expression --- .../python-modules/testtools/default.nix | 38 ++++++++++++++++++++++ .../testtools/testtools_support_unittest2.patch | 22 +++++++++++++ .../testtools_support_unittest2.patch | 22 ------------- pkgs/top-level/python-packages.nix | 23 +------------ 4 files changed, 61 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/python-modules/testtools/default.nix create mode 100644 pkgs/development/python-modules/testtools/testtools_support_unittest2.patch delete mode 100644 pkgs/development/python-modules/testtools_support_unittest2.patch (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix new file mode 100644 index 00000000000..d1f3a5feeaa --- /dev/null +++ b/pkgs/development/python-modules/testtools/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, python_mimeparse +, extras +, lxml +, unittest2 +, traceback2 +, isPy3k +}: + +buildPythonPackage rec { + pname = "testtools"; + version = "1.8.0"; + name = "${pname}-${version}"; + + # Python 2 only judging from SyntaxError +# disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + }; + + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + buildInputs = [ traceback2 ]; + patches = [ ./testtools_support_unittest2.patch ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A set of extensions to the Python standard library's unit testing framework"; + homepage = http://pypi.python.org/pypi/testtools; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch new file mode 100644 index 00000000000..545e5f01ec0 --- /dev/null +++ b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch @@ -0,0 +1,22 @@ +From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001 +From: Robert Collins +Date: Wed, 1 Jul 2015 15:46:28 +1200 +Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher. + +Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e +--- + testtools/tests/test_run.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py +index ead716b..433b6f8 100644 +--- a/testtools/tests/test_run.py ++++ b/testtools/tests/test_run.py +@@ -201,6 +201,7 @@ def test_run_list_failed_import(self): + run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) + self.assertEqual(2, exc.args[0]) + self.assertThat(out.getvalue(), DocTestMatches("""\ ++unittest2.loader._FailedTest.runexample + Failed to import test module: runexample + Traceback (most recent call last): + File ".../loader.py", line ..., in _find_test_path diff --git a/pkgs/development/python-modules/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools_support_unittest2.patch deleted file mode 100644 index 545e5f01ec0..00000000000 --- a/pkgs/development/python-modules/testtools_support_unittest2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Wed, 1 Jul 2015 15:46:28 +1200 -Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher. - -Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e ---- - testtools/tests/test_run.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py -index ead716b..433b6f8 100644 ---- a/testtools/tests/test_run.py -+++ b/testtools/tests/test_run.py -@@ -201,6 +201,7 @@ def test_run_list_failed_import(self): - run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) - self.assertEqual(2, exc.args[0]) - self.assertThat(out.getvalue(), DocTestMatches("""\ -+unittest2.loader._FailedTest.runexample - Failed to import test module: runexample - Traceback (most recent call last): - File ".../loader.py", line ..., in _find_test_path diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ce254acb51..f6d5ddf4c98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22312,28 +22312,7 @@ in { }; }; - testtools = buildPythonPackage rec { - name = "testtools-${version}"; - version = "1.8.0"; - - # Python 2 only judging from SyntaxError - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testtools/${name}.tar.gz"; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; - }; - - propagatedBuildInputs = with self; [ pbr python_mimeparse extras lxml unittest2 ]; - buildInputs = with self; [ traceback2 ]; - patches = [ ../development/python-modules/testtools_support_unittest2.patch ]; - - meta = { - description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = http://pypi.python.org/pypi/testtools; - license = licenses.mit; - }; - }; + testtools = callPackage ../development/python-modules/testtools { }; traitlets = buildPythonPackage rec { pname = "traitlets"; -- cgit 1.4.1 From ed75ce39a6ab83dfb37c6dca640a032ae2aae799 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:33:14 +0200 Subject: python.pkgs.doc8: init at 0.8.0 --- pkgs/development/python-modules/doc8/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/doc8/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix new file mode 100644 index 00000000000..cb91014d6ef --- /dev/null +++ b/pkgs/development/python-modules/doc8/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, docutils +, six +, chardet +, stevedore +, restructuredtext_lint +}: + +buildPythonPackage rec { + pname = "doc8"; + version = "0.8.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + }; + + buildInputs = [ pbr ]; + propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ]; + + doCheck = false; + + meta = { + description = "Style checker for Sphinx (or other) RST documentation"; + homepage = "https://launchpad.net/doc8"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d91544e59b..6fecd42f0a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15620,6 +15620,8 @@ in { testrepository subunit coverage oslotest ]; }; + doc8 = callPackage ../development/python-modules/doc8 { }; + wrapt = buildPythonPackage rec { name = "wrapt-${version}"; version = "1.10.5"; -- cgit 1.4.1 From 5412ea35e4670a92b82b94b250649847c7ebed98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 10:33:46 +0200 Subject: python.pkgs.restructuredtext_lint: init at 1.1.1 --- .../restructuredtext_lint/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/restructuredtext_lint/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix new file mode 100644 index 00000000000..1a863c62973 --- /dev/null +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, nose +, stdenv +, flake8 +, pyyaml +, testtools +}: + +buildPythonPackage rec { + pname = "restructuredtext_lint"; + version = "1.1.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "167e8adaa5bdc30531ee91760d6c216b306a8a3372aad34b1f72d8adcc5e011e"; + }; + + checkInputs = [ nose flake8 pyyaml testtools ]; + propagatedBuildInputs = [ docutils ]; + + checkPhase = '' + ${stdenv.shell} test.sh + ''; + + meta = { + description = "reStructuredText linter"; + homepage = https://github.com/twolfson/restructuredtext-lint; + license = lib.licenses.unlicense; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fecd42f0a4..d73f340b860 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19670,6 +19670,8 @@ in { }; }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + robomachine = buildPythonPackage rec { name = "robomachine-0.6"; -- cgit 1.4.1 From 8e19e0327f914d04815676e40344729c7a0f56fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:16:48 +0200 Subject: Python: maintenance updates --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- pkgs/development/python-modules/adal/default.nix | 4 ++-- pkgs/development/python-modules/dask/default.nix | 4 ++-- pkgs/development/python-modules/discordpy/default.nix | 4 ++-- pkgs/development/python-modules/flask-cors/default.nix | 4 ++-- pkgs/development/python-modules/flask-migrate/default.nix | 4 ++-- pkgs/development/python-modules/h5py/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/m2r/default.nix | 4 ++-- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- pkgs/development/python-modules/pyshp/default.nix | 4 ++-- pkgs/development/python-modules/semver/default.nix | 4 ++-- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- pkgs/development/python-modules/tornado/default.nix | 4 ++-- pkgs/development/python-modules/zetup/default.nix | 4 ++-- pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3dd4b0acbaf..22f3579bae3 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Cython"; name = "${pname}-${version}"; - version = "0.26"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66"; + sha256 = "c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 4673e5461d3..a1fb9667395 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.6"; + version = "0.4.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325"; + sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 32d925f3648..b1d39e493b7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.1"; + version = "0.15.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34"; + sha256 = "abe6758540fdbc260f14ee71cebc3ab88682e24ff147afa89375b7006f57d3ed"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index eebcd802dd6..03b04aacebf 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.10"; + version = "0.16.11"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88"; + sha256 = "eb3c6faa7d4570cce05533d0742bbcb768629e2b3ba9e1cc79c05833db91ac4d"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 4521374a0bb..acd9430316b 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Cors"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1mnsyyqn8akin2vz98b9fbv63hcvwmfkaapsglw5jizdkmaz628a"; + sha256 = "62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index dc94be8f600..1a4bd11a1fa 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.1.0"; + version = "2.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f"; + sha256 = "b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 0bc8b969f5a..9b2821380b9 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -11,13 +11,13 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "2.7.0"; + version = "2.7.1"; pname = "h5py"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310"; + sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 51c15ad6813..1379d93c6dd 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.7"; + version = "2.0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0"; + sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 39498919708..066a9856e50 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6"; + sha256 = "7e69fe9b2752926c33399709e354da3bcca60043c7bf5e727b7126ec3a5db7db"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 14822578761..9751eaf7ce7 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.6"; + version = "3.4.7"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923"; + sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; }; meta = { diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 8465c205295..7a59690e5b0 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.19"; + version = "0.4.21"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a"; + sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 4629331e52d..ea38c096ee1 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,13 +2,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.12"; pname = "pyshp"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9"; + sha256 = "8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 2d592962558..f2f3069fbf9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "semver"; - version = "2.7.7"; + version = "2.7.8"; src = fetchPypi { inherit pname version; - sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d"; + sha256 = "a6212f5c552452e306502ac8476bbca48af62db29c4528fdd91d319d0a44b07b"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index a440abb5149..b976524ba69 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.8"; + version = "1.1.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49"; + sha256 = "3387ba58383f4e8131f109b40e2b001dec436f38cd9b9b78d38871b8608fdd9e"; }; # No tests in archive diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 11078eb8562..bc39745945d 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "4.5.1"; + version = "4.5.2"; name = "${pname}-${version}"; propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; @@ -23,6 +23,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0"; }; } diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 66a4718fe9e..a682a6e4e92 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.34"; + version = "0.2.42"; src = fetchPypi { inherit pname version; - sha256 = "0k4lm51b5qjy7yxy3n5z8vc5hlvjcsfsvwjgqzkr0pisysar1kpf"; + sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 66a0f8d77aa..49ff6e505f4 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.15"; + version = "4.4.16"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0"; + sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; }; # No tests in archive -- cgit 1.4.1 From 2eaecf762da81cda57b6d68aced454a680252c62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 12:37:16 +0200 Subject: python.pkgs.openpyxl: 2.3.5 -> 2.4.8 --- .../python-modules/openpyxl/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/openpyxl/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix new file mode 100644 index 00000000000..a214af5eab7 --- /dev/null +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jdcal +, et_xmlfile +, lxml +}: + +buildPythonPackage rec { + pname = "openpyxl"; + version = "2.4.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "ee7551efb70648fa8ee569c2b6a6dbbeff390cc94b321da5d508a573b90a4f17"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = https://openpyxl.readthedocs.org; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51264c800e6..74f5c715f8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14259,30 +14259,7 @@ in { doCheck = false; }; - openpyxl = buildPythonPackage rec { - version = "2.3.5"; - name = "openpyxl-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; - sha256 = "0qj7d8l1qc6cjwk1ps01dyh53b3p2k2k7hwmj98y2257jj5mf1s3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; - - # Tests are not included in archive. - # https://bitbucket.org/openpyxl/openpyxl/issues/610 - doCheck = false; - - meta = { - description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; - license = licenses.mit; - maintainers = with maintainers; [ lihop sjourdois ]; - platforms = platforms.all; - }; - }; + openpyxl = callPackage ../development/python-modules/openpyxl { }; ordereddict = buildPythonPackage rec { name = "ordereddict-${version}"; -- cgit 1.4.1 From 2f91d7fd361f3b5db7ad4df930a8bbea29f05f21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:16 +0200 Subject: python.pkgs.discordpy: disable tests --- pkgs/development/python-modules/discordpy/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 03b04aacebf..c9ae73b1661 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -31,6 +31,9 @@ in buildPythonPackage rec { disabled = pythonOlder "3.5"; + # No tests in archive + doCheck = false; + meta = { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; -- cgit 1.4.1 From 8fca4f3fdf864df7e41125a3d090c9ffa08a2e76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:26 +0200 Subject: python.pkgs.multidict: fix tests --- pkgs/development/python-modules/multidict/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index fc0bdf90627..4141b69f0cd 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pytest , isPy3k +, psutil }: let @@ -16,7 +17,7 @@ in buildPythonPackage rec { sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest psutil ]; checkPhase = '' py.test -- cgit 1.4.1 From 146fdc88cb092ca7c78f961f07cf1524b06c00d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:40:49 +0200 Subject: python.pkgs.aiohttp: 1.3.5 -> 2.2.5 --- .../development/python-modules/aiohttp/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 33 +------------------- 2 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/aiohttp/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix new file mode 100644 index 00000000000..72b28d01cea --- /dev/null +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chardet +, multidict +, async-timeout +, yarl +, pytest +, gunicorn +, pytest-raisesregexp +}: + +buildPythonPackage rec { + pname = "aiohttp"; + version = "2.2.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "af5bfdd164256118a0a306b3f7046e63207d1f8cba73a67dcc0bd858dcfcd3bc"; + }; + + disabled = pythonOlder "3.4"; + + doCheck = false; # Too many tests fail. + + checkInputs = [ pytest gunicorn pytest-raisesregexp ]; + propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + + meta = { + description = "Http client/server for asyncio"; + license = with lib.licenses; [ asl20 ]; + homepage = https://github.com/KeepSafe/aiohttp/; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74f5c715f8b..b592a4f2871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,38 +311,7 @@ in { aiofiles = callPackage ../development/python-modules/aiofiles { }; - aiohttp = - let yarl_0_9_8 = self.yarl.overrideAttrs (old: rec { - pname = "yarl"; - version = "0.9.8"; - name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; - }; - }); - in buildPythonPackage rec { - name = "aiohttp-${version}"; - version = "1.3.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/aiohttp/${name}.tar.gz"; - sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d"; - }; - - disabled = pythonOlder "3.4"; - - doCheck = false; # Too many tests fail. - - buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = with self; [ async-timeout chardet multidict yarl_0_9_8 ]; - - meta = { - description = "Http client/server for asyncio"; - license = with licenses; [ asl20 ]; - homepage = https://github.com/KeepSafe/aiohttp/; - }; - }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = buildPythonPackage rec { name = "${pname}-${version}"; -- cgit 1.4.1 From 2c762cd68e4b6ada0a2a2488ba78ad8394a5c2b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Sep 2017 13:55:46 +0200 Subject: python.pkgs.flit: 0.10.0 -> 0.11.4 --- pkgs/development/python-modules/flit/default.nix | 50 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +---------- 2 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/flit/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix new file mode 100644 index 00000000000..2154feeebb7 --- /dev/null +++ b/pkgs/development/python-modules/flit/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchurl +, isPy3k +, docutils +, requests +, requests_download +, zipfile36 +, pythonOlder +, pytest +, testpath +, responses +}: + +# Flit is actually an application to build universal wheels. +# It requires Python 3 and should eventually be moved outside of +# python-packages.nix. When it will be used to build wheels, +# care should be taken that there is no mingling of PYTHONPATH. + +buildPythonPackage rec { + pname = "flit"; + version = "0.11.4"; + name = "${pname}-${version}"; + +# format = "wheel"; + + src = fetchPypi { + inherit pname version; +# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; + sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + }; + + disabled = !isPy3k; + propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + + checkInputs = [ pytest testpath responses ]; + + # Disable test that needs some ini file. + checkPhase = '' + py.test -k "not test_invalid_classifier" + ''; + + meta = { + description = "A simple packaging tool for simple packages"; + homepage = https://github.com/takluyver/flit; + license = lib.licenses.bsd3; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b592a4f2871..b4ef9a8ce11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5766,28 +5766,7 @@ in { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); - flit = buildPythonPackage rec { - pname = "flit"; - version = "0.10"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "4566b2e1807abeb1fd7bfaa9b444447556f1720518edfb134b56a6a1272b0428"; - }; - - disabled = !isPy3k; - propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36]; - - meta = { - description = "A simple packaging tool for simple packages"; - homepage = https://github.com/takluyver/flit; - license = licenses.bsd3; - maintainer = maintainers.fridh; - }; - }; + flit = callPackage ../development/python-modules/flit { }; Flootty = buildPythonPackage rec { name = "Flootty-3.2.0"; -- cgit 1.4.1 From 51cf42ad0d3ccb55af182f1f0ee5eb5094ea5995 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 16:49:43 +0200 Subject: glibc: 2.25 -> 2.25-49 Various fixes within, e.g. mutexes deadlocking sometimes. https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=f7057710f14d6c --- pkgs/development/libraries/glibc/2.25-49.patch.gz | Bin 0 -> 89721 bytes .../glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch | 209 --------------------- .../CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch | 33 ---- .../glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch | 115 ------------ pkgs/development/libraries/glibc/common.nix | 22 +-- .../libraries/glibc/fix-i686-memchr.patch | 23 --- .../glibc/i686-fix-vectorized-strcspn.patch | 42 ----- 7 files changed, 11 insertions(+), 433 deletions(-) create mode 100644 pkgs/development/libraries/glibc/2.25-49.patch.gz delete mode 100644 pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch delete mode 100644 pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch delete mode 100644 pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch delete mode 100644 pkgs/development/libraries/glibc/fix-i686-memchr.patch delete mode 100644 pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glibc/2.25-49.patch.gz b/pkgs/development/libraries/glibc/2.25-49.patch.gz new file mode 100644 index 00000000000..6796347e379 Binary files /dev/null and b/pkgs/development/libraries/glibc/2.25-49.patch.gz differ diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch deleted file mode 100644 index 68e2798181f..00000000000 --- a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch +++ /dev/null @@ -1,209 +0,0 @@ -From ba67ba3275d47e0080f0e5f09d9f5102c000c97e Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Florian Weimer -Date: Sun, 28 May 2017 20:44:52 +0200 -Subject: [PATCH 3/3] rtld: Reject overly long LD_AUDIT path elements -To: libc-alpha@sourceware.org - -Also only process the last LD_AUDIT entry. ---- - elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 95 insertions(+), 15 deletions(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 30f0cae..89d8573 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -116,13 +116,95 @@ dso_name_valid_for_suid (const char *p) - return *p != '\0'; - } - --/* List of auditing DSOs. */ -+/* LD_AUDIT variable contents. Must be processed before the -+ audit_list below. */ -+const char *audit_list_string; -+ -+/* Cyclic list of auditing DSOs. audit_list->next is the first -+ element. */ - static struct audit_list - { - const char *name; - struct audit_list *next; - } *audit_list; - -+/* Iterator for audit_list_string followed by audit_list. */ -+struct audit_list_iter -+{ -+ /* Tail of audit_list_string still needing processing, or NULL. */ -+ const char *audit_list_tail; -+ -+ /* The list element returned in the previous iteration. NULL before -+ the first element. */ -+ struct audit_list *previous; -+ -+ /* Scratch buffer for returning a name which is part of -+ audit_list_string. */ -+#ifdef PATH_MAX -+ char fname[PATH_MAX]; -+#else -+ char fname[4096]; -+#endif -+}; -+ -+/* Initialize an audit list iterator. */ -+static void -+audit_list_iter_init (struct audit_list_iter *iter) -+{ -+ iter->audit_list_tail = audit_list_string; -+ iter->previous = NULL; -+} -+ -+/* Iterate through both audit_list_string and audit_list. */ -+static const char * -+audit_list_iter_next (struct audit_list_iter *iter) -+{ -+ if (iter->audit_list_tail != NULL) -+ { -+ /* First iterate over audit_list_string. */ -+ while (*iter->audit_list_tail != '\0') -+ { -+ /* Split audit list at colon. */ -+ size_t len = strcspn (iter->audit_list_tail, ":"); -+ if (len > 0 && len < sizeof(iter->fname)) -+ { -+ memcpy (iter->fname, iter->audit_list_tail, len); -+ iter->fname[len] = '\0'; -+ } -+ else -+ /* Do not return this name to the caller. */ -+ iter->fname[0] = '\0'; -+ -+ /* Skip over the substring and the following delimiter. */ -+ iter->audit_list_tail += len; -+ if (*iter->audit_list_tail == ':') -+ ++iter->audit_list_tail; -+ -+ /* If the name is valid, return it. */ -+ if (dso_name_valid_for_suid (iter->fname)) -+ return iter->fname; -+ /* Otherwise, wrap around and try the next name. */ -+ } -+ /* Fall through to the procesing of audit_list. */ -+ } -+ -+ if (iter->previous == NULL) -+ { -+ if (audit_list == NULL) -+ /* No pre-parsed audit list. */ -+ return NULL; -+ /* Start of audit list. The first list element is at -+ audit_list->next (cyclic list). */ -+ iter->previous = audit_list->next; -+ return iter->previous->name; -+ } -+ if (iter->previous == audit_list) -+ /* Cyclic list wrap-around. */ -+ return NULL; -+ iter->previous = iter->previous->next; -+ return iter->previous->name; -+} -+ - #ifndef HAVE_INLINED_SYSCALLS - /* Set nonzero during loading and initialization of executable and - libraries, cleared before the executable's entry point runs. This -@@ -1290,11 +1368,13 @@ of this helper program; chances are you did not intend to run this program.\n\ - GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); - - /* If we have auditing DSOs to load, do it now. */ -- if (__glibc_unlikely (audit_list != NULL)) -+ bool need_security_init = true; -+ if (__glibc_unlikely (audit_list != NULL) -+ || __glibc_unlikely (audit_list_string != NULL)) - { -- /* Iterate over all entries in the list. The order is important. */ - struct audit_ifaces *last_audit = NULL; -- struct audit_list *al = audit_list->next; -+ struct audit_list_iter al_iter; -+ audit_list_iter_init (&al_iter); - - /* Since we start using the auditing DSOs right away we need to - initialize the data structures now. */ -@@ -1305,9 +1385,14 @@ of this helper program; chances are you did not intend to run this program.\n\ - use different values (especially the pointer guard) and will - fail later on. */ - security_init (); -+ need_security_init = false; - -- do -+ while (true) - { -+ const char *name = audit_list_iter_next (&al_iter); -+ if (name == NULL) -+ break; -+ - int tls_idx = GL(dl_tls_max_dtv_idx); - - /* Now it is time to determine the layout of the static TLS -@@ -1316,7 +1401,7 @@ of this helper program; chances are you did not intend to run this program.\n\ - no DF_STATIC_TLS bit is set. The reason is that we know - glibc will use the static model. */ - struct dlmopen_args dlmargs; -- dlmargs.fname = al->name; -+ dlmargs.fname = name; - dlmargs.map = NULL; - - const char *objname; -@@ -1329,7 +1414,7 @@ of this helper program; chances are you did not intend to run this program.\n\ - not_loaded: - _dl_error_printf ("\ - ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", -- al->name, err_str); -+ name, err_str); - if (malloced) - free ((char *) err_str); - } -@@ -1433,10 +1518,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - goto not_loaded; - } - } -- -- al = al->next; - } -- while (al != audit_list->next); - - /* If we have any auditing modules, announce that we already - have two objects loaded. */ -@@ -1700,7 +1782,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - if (tcbp == NULL) - tcbp = init_tls (); - -- if (__glibc_likely (audit_list == NULL)) -+ if (__glibc_likely (need_security_init)) - /* Initialize security features. But only if we have not done it - earlier. */ - security_init (); -@@ -2331,9 +2413,7 @@ process_dl_audit (char *str) - char *p; - - while ((p = (strsep) (&str, ":")) != NULL) -- if (p[0] != '\0' -- && (__builtin_expect (! __libc_enable_secure, 1) -- || strchr (p, '/') == NULL)) -+ if (dso_name_valid_for_suid (p)) - { - /* This is using the local malloc, not the system malloc. The - memory can never be freed. */ -@@ -2397,7 +2477,7 @@ process_envvars (enum mode *modep) - break; - } - if (memcmp (envline, "AUDIT", 5) == 0) -- process_dl_audit (&envline[6]); -+ audit_list_string = &envline[6]; - break; - - case 7: --- -2.9.4 - diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch deleted file mode 100644 index 88b1925fa12..00000000000 --- a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4d009d39ac9ede0369e268554a181b428f177a80 Mon Sep 17 00:00:00 2001 -Message-Id: <4d009d39ac9ede0369e268554a181b428f177a80.1495998948.git.fweimer@redhat.com> -In-Reply-To: -References: -From: Florian Weimer -Date: Sun, 28 May 2017 20:37:40 +0200 -Subject: [PATCH 1/3] rtld: Completely ignore LD_LIBRARY_PATH for AT_SECURE=1 - programs -To: libc-alpha@sourceware.org - -LD_LIBRARY_PATH can only be used to reorder system search paths, which -is not useful functionality. ---- - elf/rtld.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 319ef06..824b6cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2419,7 +2419,8 @@ process_envvars (enum mode *modep) - - case 12: - /* The library search path. */ -- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) -+ if (!__libc_enable_secure -+ && memcmp (envline, "LIBRARY_PATH", 12) == 0) - { - library_path = &envline[13]; - break; --- -2.9.4 - diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch deleted file mode 100644 index 76be2a3308f..00000000000 --- a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 65ff0b7a085b85271ec8fde99f542281b495e3bc Mon Sep 17 00:00:00 2001 -Message-Id: <65ff0b7a085b85271ec8fde99f542281b495e3bc.1495998948.git.fweimer@redhat.com> -In-Reply-To: -References: -From: Florian Weimer -Date: Sun, 28 May 2017 20:57:40 +0200 -Subject: [PATCH 2/3] rtld: Reject overly long LD_PRELOAD path elements -To: libc-alpha@sourceware.org - ---- - elf/rtld.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 53 insertions(+), 16 deletions(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 824b6cf..30f0cae 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -99,6 +99,22 @@ uintptr_t __pointer_chk_guard_local - strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) - #endif - -+/* Check that AT_SECURE=0, or that the passed name does not contain -+ directories and is not overly long. Reject empty names -+ unconditionally. */ -+static bool -+dso_name_valid_for_suid (const char *p) -+{ -+ if (__glibc_unlikely (__libc_enable_secure)) -+ { -+ /* Ignore pathnames with directories for AT_SECURE=1 -+ programs, and also skip overlong names. */ -+ size_t len = strlen (p); -+ if (len >= NAME_MAX || memchr (p, '/', len) != NULL) -+ return false; -+ } -+ return *p != '\0'; -+} - - /* List of auditing DSOs. */ - static struct audit_list -@@ -716,6 +732,46 @@ static const char *preloadlist attribute_relro; - /* Nonzero if information about versions has to be printed. */ - static int version_info attribute_relro; - -+/* The LD_PRELOAD environment variable gives list of libraries -+ separated by white space or colons that are loaded before the -+ executable's dependencies and prepended to the global scope list. -+ (If the binary is running setuid all elements containing a '/' are -+ ignored since it is insecure.) Return the number of preloads -+ performed. */ -+unsigned int -+handle_ld_preload (const char *preloadlist, struct link_map *main_map) -+{ -+ unsigned int npreloads = 0; -+ const char *p = preloadlist; -+#ifdef PATH_MAX -+ char fname[PATH_MAX]; -+#else -+ char fname[4096]; -+#endif -+ -+ while (*p != '\0') -+ { -+ /* Split preload list at space/colon. */ -+ size_t len = strcspn (p, " :"); -+ if (len > 0 && len < sizeof(fname)) -+ { -+ memcpy (fname, p, len); -+ fname[len] = '\0'; -+ } -+ else -+ fname[0] = '\0'; -+ -+ /* Skip over the substring and the following delimiter. */ -+ p += len; -+ if (*p == ' ' || *p == ':') -+ ++p; -+ -+ if (dso_name_valid_for_suid (fname)) -+ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); -+ } -+ return npreloads; -+} -+ - static void - dl_main (const ElfW(Phdr) *phdr, - ElfW(Word) phnum, -@@ -1462,23 +1514,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - - if (__glibc_unlikely (preloadlist != NULL)) - { -- /* The LD_PRELOAD environment variable gives list of libraries -- separated by white space or colons that are loaded before the -- executable's dependencies and prepended to the global scope -- list. If the binary is running setuid all elements -- containing a '/' are ignored since it is insecure. */ -- char *list = strdupa (preloadlist); -- char *p; -- - HP_TIMING_NOW (start); -- -- /* Prevent optimizing strsep. Speed is not important here. */ -- while ((p = (strsep) (&list, " :")) != NULL) -- if (p[0] != '\0' -- && (__builtin_expect (! __libc_enable_secure, 1) -- || strchr (p, '/') == NULL)) -- npreloads += do_preload (p, main_map, "LD_PRELOAD"); -- -+ npreloads += handle_ld_preload (preloadlist, main_map); - HP_TIMING_NOW (stop); - HP_TIMING_DIFF (diff, start, stop); - HP_TIMING_ACCUM_NT (load_time, diff); --- -2.9.4 - diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1b53acf12b1..af85de0cf1e 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -19,6 +19,7 @@ let inherit (buildPackages) linuxHeaders; version = "2.25"; + patchSuffix = "-49"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -38,7 +39,15 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; patches = - [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ + [ + /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git + $ git co release/2.25/master; git describe + glibc-2.25-49-gbc5ace67fe + $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz + */ + ./2.25-49.patch.gz + + /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch /* Allow NixOS and Nix to handle the locale-archive. */ @@ -59,15 +68,6 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch - - /* Stack Clash */ - ./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch - ./CVE-2017-1000366-rtld-LD_PRELOAD.patch - ./CVE-2017-1000366-rtld-LD_AUDIT.patch - ] - ++ lib.optionals stdenv.isi686 [ - ./fix-i686-memchr.patch - ./i686-fix-vectorized-strcspn.patch ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; @@ -145,7 +145,7 @@ stdenv.mkDerivation ({ // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // { - name = name + "-${version}" + + name = name + "-${version}${patchSuffix}" + lib.optionalString (cross != null) "-${cross.config}"; src = fetchurl { diff --git a/pkgs/development/libraries/glibc/fix-i686-memchr.patch b/pkgs/development/libraries/glibc/fix-i686-memchr.patch deleted file mode 100644 index 32564de9f3a..00000000000 --- a/pkgs/development/libraries/glibc/fix-i686-memchr.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix i686 memchr overflow calculation (BZ#21182) - -https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03 -diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S -index 910679c..e41f324 100644 ---- a/sysdeps/i386/i686/multiarch/memchr-sse2.S -+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S -@@ -117,7 +117,6 @@ L(crosscache): - - # ifndef USE_AS_RAWMEMCHR - jnz L(match_case2_prolog1) -- lea -16(%edx), %edx - /* Calculate the last acceptable address and check for possible - addition overflow by using satured math: - edx = ecx + edx -@@ -125,6 +124,7 @@ L(crosscache): - add %ecx, %edx - sbb %eax, %eax - or %eax, %edx -+ sub $16, %edx - jbe L(return_null) - lea 16(%edi), %edi - # else diff --git a/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch b/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch deleted file mode 100644 index ba4ec7c60cb..00000000000 --- a/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch +++ /dev/null @@ -1,42 +0,0 @@ -From adc7e06fb412a2a1ee52f8cb788caf436335b9f3 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Wed, 14 Jun 2017 08:11:22 +0200 -Subject: [PATCH] i686: Add missing IS_IN (libc) guards to vectorized strcspn - -Since commit d957c4d3fa48d685ff2726c605c988127ef99395 (i386: Compile -rtld-*.os with -mno-sse -mno-mmx -mfpmath=387), vector intrinsics can -no longer be used in ld.so, even if the compiled code never makes it -into the final ld.so link. This commit adds the missing IS_IN (libc) -guard to the SSE 4.2 strcspn implementation, so that it can be used from -ld.so in the future. - -(cherry picked from commit 69052a3a95da37169a08f9e59b2cc1808312753c) ---- - ChangeLog | 5 +++++ - sysdeps/i386/i686/multiarch/strcspn-c.c | 6 ++++-- - sysdeps/i386/i686/multiarch/varshift.c | 4 +++- - 3 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c -index 6d61e19..ec230fb 100644 ---- a/sysdeps/i386/i686/multiarch/strcspn-c.c -+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c -@@ -1,2 +1,4 @@ --#define __strcspn_sse2 __strcspn_ia32 --#include -+#if IS_IN (libc) -+# define __strcspn_sse2 __strcspn_ia32 -+# include -+#endif -diff --git a/sysdeps/i386/i686/multiarch/varshift.c b/sysdeps/i386/i686/multiarch/varshift.c -index 7760b96..6742a35 100644 ---- a/sysdeps/i386/i686/multiarch/varshift.c -+++ b/sysdeps/i386/i686/multiarch/varshift.c -@@ -1 +1,3 @@ --#include -+#if IS_IN (libc) -+# include -+#endif --- -2.9.3 - -- cgit 1.4.1 From 0f91a1dbd7e62723d0082ead91c27473cb1bc2d9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 16:59:15 +0200 Subject: glibc: remove patch with blowfish support --- pkgs/development/libraries/glibc/common.nix | 5 - .../libraries/glibc/glibc-crypt-blowfish.patch | 795 --------------------- 2 files changed, 800 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index af85de0cf1e..3cc74b083c5 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -59,11 +59,6 @@ stdenv.mkDerivation ({ /* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload. */ ./dont-use-system-ld-so-preload.patch - /* Add blowfish password hashing support. This is needed for - compatibility with old NixOS installations (since NixOS used - to default to blowfish). */ - ./glibc-crypt-blowfish.patch - /* The command "getconf CS_PATH" returns the default search path "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ diff --git a/pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch deleted file mode 100644 index a0a8acdab63..00000000000 --- a/pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch +++ /dev/null @@ -1,795 +0,0 @@ -From http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/glibc/glibc-crypt-blowfish.patch?revision=1.7&view=markup - -diff -ru -N glibc-2.17-orig/crypt/crypt_blowfish.c glibc-2.17/crypt/crypt_blowfish.c ---- glibc-2.17-orig/crypt/crypt_blowfish.c 1970-01-01 01:00:00.000000000 +0100 -+++ glibc-2.17/crypt/crypt_blowfish.c 2013-01-22 23:30:12.340353965 +0100 -@@ -0,0 +1,743 @@ -+/* -+ * This code comes from John the Ripper password cracker, with reentrant -+ * and crypt(3) interfaces added, but optimizations specific to password -+ * cracking removed. -+ * -+ * Written by Solar Designer in 1998-2002 and -+ * placed in the public domain. -+ * -+ * There's absolutely no warranty. -+ * -+ * It is my intent that you should be able to use this on your system, -+ * as a part of a software package, or anywhere else to improve security, -+ * ensure compatibility, or for any other purpose. I would appreciate -+ * it if you give credit where it is due and keep your modifications in -+ * the public domain as well, but I don't require that in order to let -+ * you place this code and any modifications you make under a license -+ * of your choice. -+ * -+ * This implementation is compatible with OpenBSD bcrypt.c (version 2a) -+ * by Niels Provos , and uses some of his -+ * ideas. The password hashing algorithm was designed by David Mazieres -+ * . -+ * -+ * There's a paper on the algorithm that explains its design decisions: -+ * -+ * http://www.usenix.org/events/usenix99/provos.html -+ * -+ * Some of the tricks in BF_ROUND might be inspired by Eric Young's -+ * Blowfish library (I can't be sure if I would think of something if I -+ * hadn't seen his code). -+ */ -+ -+#include -+ -+#include -+#ifndef __set_errno -+#define __set_errno(val) errno = (val) -+#endif -+ -+#undef __CONST -+#ifdef __GNUC__ -+#define __CONST __const -+#else -+#define __CONST -+#endif -+ -+#ifdef __i386__ -+#define BF_ASM 0 /* original OW patch has 1 */ -+#define BF_SCALE 1 -+#elif defined(__alpha__) || defined(__hppa__) || defined(__x86_64__) -+#define BF_ASM 0 -+#define BF_SCALE 1 -+#else -+#define BF_ASM 0 -+#define BF_SCALE 0 -+#endif -+ -+typedef unsigned int BF_word; -+ -+/* Number of Blowfish rounds, this is also hardcoded into a few places */ -+#define BF_N 16 -+ -+typedef BF_word BF_key[BF_N + 2]; -+ -+typedef struct { -+ BF_word S[4][0x100]; -+ BF_key P; -+} BF_ctx; -+ -+/* -+ * Magic IV for 64 Blowfish encryptions that we do at the end. -+ * The string is "OrpheanBeholderScryDoubt" on big-endian. -+ */ -+static BF_word BF_magic_w[6] = { -+ 0x4F727068, 0x65616E42, 0x65686F6C, -+ 0x64657253, 0x63727944, 0x6F756274 -+}; -+ -+/* -+ * P-box and S-box tables initialized with digits of Pi. -+ */ -+static BF_ctx BF_init_state = { -+ { -+ { -+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, -+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, -+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, -+ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, -+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, -+ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, -+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, -+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, -+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, -+ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, -+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, -+ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, -+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, -+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, -+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, -+ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, -+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, -+ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, -+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, -+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, -+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, -+ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, -+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, -+ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, -+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, -+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, -+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, -+ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, -+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, -+ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, -+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, -+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, -+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, -+ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, -+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, -+ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, -+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, -+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, -+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, -+ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, -+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, -+ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, -+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, -+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, -+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, -+ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, -+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, -+ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, -+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, -+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, -+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, -+ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, -+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, -+ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, -+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, -+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, -+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, -+ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, -+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, -+ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, -+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, -+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, -+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, -+ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a -+ }, { -+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, -+ 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, -+ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, -+ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, -+ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, -+ 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, -+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, -+ 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, -+ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, -+ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, -+ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, -+ 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, -+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, -+ 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7, -+ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, -+ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, -+ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, -+ 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, -+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, -+ 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87, -+ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, -+ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, -+ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, -+ 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, -+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, -+ 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, -+ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, -+ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, -+ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, -+ 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, -+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, -+ 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, -+ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, -+ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, -+ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, -+ 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, -+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, -+ 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, -+ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, -+ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, -+ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, -+ 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, -+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, -+ 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, -+ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, -+ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, -+ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, -+ 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, -+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, -+ 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, -+ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, -+ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, -+ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, -+ 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, -+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, -+ 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, -+ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, -+ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, -+ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, -+ 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, -+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, -+ 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, -+ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, -+ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 -+ }, { -+ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, -+ 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, -+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, -+ 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, -+ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, -+ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, -+ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, -+ 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, -+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, -+ 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, -+ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, -+ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, -+ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, -+ 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, -+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, -+ 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, -+ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, -+ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, -+ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, -+ 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, -+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, -+ 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, -+ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, -+ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, -+ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, -+ 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, -+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, -+ 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, -+ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, -+ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, -+ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, -+ 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, -+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, -+ 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, -+ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, -+ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, -+ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, -+ 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, -+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, -+ 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, -+ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, -+ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, -+ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, -+ 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, -+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, -+ 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, -+ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, -+ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, -+ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, -+ 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, -+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, -+ 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, -+ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, -+ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, -+ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, -+ 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, -+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, -+ 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, -+ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, -+ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, -+ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, -+ 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, -+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, -+ 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 -+ }, { -+ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, -+ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, -+ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, -+ 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, -+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, -+ 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, -+ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, -+ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, -+ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, -+ 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, -+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, -+ 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, -+ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, -+ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, -+ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, -+ 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, -+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, -+ 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, -+ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, -+ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, -+ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, -+ 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, -+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, -+ 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, -+ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, -+ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, -+ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, -+ 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, -+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, -+ 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, -+ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, -+ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, -+ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, -+ 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, -+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, -+ 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, -+ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, -+ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, -+ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, -+ 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, -+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, -+ 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, -+ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, -+ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, -+ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, -+ 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, -+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, -+ 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, -+ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, -+ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, -+ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, -+ 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, -+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, -+ 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, -+ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, -+ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, -+ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, -+ 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, -+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, -+ 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, -+ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, -+ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, -+ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, -+ 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 -+ } -+ }, { -+ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, -+ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, -+ 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, -+ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, -+ 0x9216d5d9, 0x8979fb1b -+ } -+}; -+ -+static unsigned char BF_itoa64[64 + 1] = -+ "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; -+ -+static unsigned char BF_atoi64[0x60] = { -+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1, -+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64, -+ 64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64, -+ 64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, -+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64 -+}; -+ -+/* -+ * This may be optimized out if built with function inlining and no BF_ASM. -+ */ -+static void clean(void *data, int size) -+{ -+#if BF_ASM -+ extern void _BF_clean(void *data); -+#endif -+ memset(data, 0, size); -+#if BF_ASM -+ _BF_clean(data); -+#endif -+} -+ -+#define BF_safe_atoi64(dst, src) \ -+{ \ -+ tmp = (unsigned char)(src); \ -+ if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \ -+ tmp = BF_atoi64[tmp]; \ -+ if (tmp > 63) return -1; \ -+ (dst) = tmp; \ -+} -+ -+static int BF_decode(BF_word *dst, __CONST char *src, int size) -+{ -+ unsigned char *dptr = (unsigned char *)dst; -+ unsigned char *end = dptr + size; -+ unsigned char *sptr = (unsigned char *)src; -+ unsigned int tmp, c1, c2, c3, c4; -+ -+ do { -+ BF_safe_atoi64(c1, *sptr++); -+ BF_safe_atoi64(c2, *sptr++); -+ *dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4); -+ if (dptr >= end) break; -+ -+ BF_safe_atoi64(c3, *sptr++); -+ *dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2); -+ if (dptr >= end) break; -+ -+ BF_safe_atoi64(c4, *sptr++); -+ *dptr++ = ((c3 & 0x03) << 6) | c4; -+ } while (dptr < end); -+ -+ return 0; -+} -+ -+static void BF_encode(char *dst, __CONST BF_word *src, int size) -+{ -+ unsigned char *sptr = (unsigned char *)src; -+ unsigned char *end = sptr + size; -+ unsigned char *dptr = (unsigned char *)dst; -+ unsigned int c1, c2; -+ -+ do { -+ c1 = *sptr++; -+ *dptr++ = BF_itoa64[c1 >> 2]; -+ c1 = (c1 & 0x03) << 4; -+ if (sptr >= end) { -+ *dptr++ = BF_itoa64[c1]; -+ break; -+ } -+ -+ c2 = *sptr++; -+ c1 |= c2 >> 4; -+ *dptr++ = BF_itoa64[c1]; -+ c1 = (c2 & 0x0f) << 2; -+ if (sptr >= end) { -+ *dptr++ = BF_itoa64[c1]; -+ break; -+ } -+ -+ c2 = *sptr++; -+ c1 |= c2 >> 6; -+ *dptr++ = BF_itoa64[c1]; -+ *dptr++ = BF_itoa64[c2 & 0x3f]; -+ } while (sptr < end); -+} -+ -+static void BF_swap(BF_word *x, int count) -+{ -+ static int endianness_check = 1; -+ char *is_little_endian = (char *)&endianness_check; -+ BF_word tmp; -+ -+ if (*is_little_endian) -+ do { -+ tmp = *x; -+ tmp = (tmp << 16) | (tmp >> 16); -+ *x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF); -+ } while (--count); -+} -+ -+#if BF_SCALE -+/* Architectures which can shift addresses left by 2 bits with no extra cost */ -+#define BF_ROUND(L, R, N) \ -+ tmp1 = L & 0xFF; \ -+ tmp2 = L >> 8; \ -+ tmp2 &= 0xFF; \ -+ tmp3 = L >> 16; \ -+ tmp3 &= 0xFF; \ -+ tmp4 = L >> 24; \ -+ tmp1 = data.ctx.S[3][tmp1]; \ -+ tmp2 = data.ctx.S[2][tmp2]; \ -+ tmp3 = data.ctx.S[1][tmp3]; \ -+ tmp3 += data.ctx.S[0][tmp4]; \ -+ tmp3 ^= tmp2; \ -+ R ^= data.ctx.P[N + 1]; \ -+ tmp3 += tmp1; \ -+ R ^= tmp3; -+#else -+/* Architectures with no complicated addressing modes supported */ -+#define BF_INDEX(S, i) \ -+ (*((BF_word *)(((unsigned char *)S) + (i)))) -+#define BF_ROUND(L, R, N) \ -+ tmp1 = L & 0xFF; \ -+ tmp1 <<= 2; \ -+ tmp2 = L >> 6; \ -+ tmp2 &= 0x3FC; \ -+ tmp3 = L >> 14; \ -+ tmp3 &= 0x3FC; \ -+ tmp4 = L >> 22; \ -+ tmp4 &= 0x3FC; \ -+ tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \ -+ tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \ -+ tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \ -+ tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \ -+ tmp3 ^= tmp2; \ -+ R ^= data.ctx.P[N + 1]; \ -+ tmp3 += tmp1; \ -+ R ^= tmp3; -+#endif -+ -+/* -+ * Encrypt one block, BF_N is hardcoded here. -+ */ -+#define BF_ENCRYPT \ -+ L ^= data.ctx.P[0]; \ -+ BF_ROUND(L, R, 0); \ -+ BF_ROUND(R, L, 1); \ -+ BF_ROUND(L, R, 2); \ -+ BF_ROUND(R, L, 3); \ -+ BF_ROUND(L, R, 4); \ -+ BF_ROUND(R, L, 5); \ -+ BF_ROUND(L, R, 6); \ -+ BF_ROUND(R, L, 7); \ -+ BF_ROUND(L, R, 8); \ -+ BF_ROUND(R, L, 9); \ -+ BF_ROUND(L, R, 10); \ -+ BF_ROUND(R, L, 11); \ -+ BF_ROUND(L, R, 12); \ -+ BF_ROUND(R, L, 13); \ -+ BF_ROUND(L, R, 14); \ -+ BF_ROUND(R, L, 15); \ -+ tmp4 = R; \ -+ R = L; \ -+ L = tmp4 ^ data.ctx.P[BF_N + 1]; -+ -+#if BF_ASM -+#define BF_body() \ -+ _BF_body_r(&data.ctx); -+#else -+#define BF_body() \ -+ L = R = 0; \ -+ ptr = data.ctx.P; \ -+ do { \ -+ ptr += 2; \ -+ BF_ENCRYPT; \ -+ *(ptr - 2) = L; \ -+ *(ptr - 1) = R; \ -+ } while (ptr < &data.ctx.P[BF_N + 2]); \ -+\ -+ ptr = data.ctx.S[0]; \ -+ do { \ -+ ptr += 2; \ -+ BF_ENCRYPT; \ -+ *(ptr - 2) = L; \ -+ *(ptr - 1) = R; \ -+ } while (ptr < &data.ctx.S[3][0xFF]); -+#endif -+ -+static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial) -+{ -+ __CONST char *ptr = key; -+ int i, j; -+ BF_word tmp; -+ -+ for (i = 0; i < BF_N + 2; i++) { -+ tmp = 0; -+ for (j = 0; j < 4; j++) { -+ tmp <<= 8; -+ tmp |= (unsigned char)*ptr; -+ -+ if (!*ptr) ptr = key; else ptr++; -+ } -+ -+ expanded[i] = tmp; -+ initial[i] = BF_init_state.P[i] ^ tmp; -+ } -+} -+ -+char *_crypt_blowfish_rn(__CONST char *key, __CONST char *setting, -+ char *output, int size) -+{ -+#if BF_ASM -+ extern void _BF_body_r(BF_ctx *ctx); -+#endif -+ struct { -+ BF_ctx ctx; -+ BF_key expanded_key; -+ union { -+ BF_word salt[4]; -+ BF_word output[6]; -+ } binary; -+ } data; -+ BF_word L, R; -+ BF_word tmp1, tmp2, tmp3, tmp4; -+ BF_word *ptr; -+ BF_word count; -+ int i; -+ -+ if (size < 7 + 22 + 31 + 1) { -+ __set_errno(ERANGE); -+ return NULL; -+ } -+ -+ if (setting[0] != '$' || -+ setting[1] != '2' || -+ setting[2] != 'a' || -+ setting[3] != '$' || -+ setting[4] < '0' || setting[4] > '3' || -+ setting[5] < '0' || setting[5] > '9' || -+ setting[6] != '$') { -+ __set_errno(EINVAL); -+ return NULL; -+ } -+ -+ count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0')); -+ if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16)) { -+ clean(data.binary.salt, sizeof(data.binary.salt)); -+ __set_errno(EINVAL); -+ return NULL; -+ } -+ BF_swap(data.binary.salt, 4); -+ -+ BF_set_key(key, data.expanded_key, data.ctx.P); -+ -+ memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S)); -+ -+ L = R = 0; -+ for (i = 0; i < BF_N + 2; i += 2) { -+ L ^= data.binary.salt[i & 2]; -+ R ^= data.binary.salt[(i & 2) + 1]; -+ BF_ENCRYPT; -+ data.ctx.P[i] = L; -+ data.ctx.P[i + 1] = R; -+ } -+ -+ ptr = data.ctx.S[0]; -+ do { -+ ptr += 4; -+ L ^= data.binary.salt[(BF_N + 2) & 3]; -+ R ^= data.binary.salt[(BF_N + 3) & 3]; -+ BF_ENCRYPT; -+ *(ptr - 4) = L; -+ *(ptr - 3) = R; -+ -+ L ^= data.binary.salt[(BF_N + 4) & 3]; -+ R ^= data.binary.salt[(BF_N + 5) & 3]; -+ BF_ENCRYPT; -+ *(ptr - 2) = L; -+ *(ptr - 1) = R; -+ } while (ptr < &data.ctx.S[3][0xFF]); -+ -+ do { -+ data.ctx.P[0] ^= data.expanded_key[0]; -+ data.ctx.P[1] ^= data.expanded_key[1]; -+ data.ctx.P[2] ^= data.expanded_key[2]; -+ data.ctx.P[3] ^= data.expanded_key[3]; -+ data.ctx.P[4] ^= data.expanded_key[4]; -+ data.ctx.P[5] ^= data.expanded_key[5]; -+ data.ctx.P[6] ^= data.expanded_key[6]; -+ data.ctx.P[7] ^= data.expanded_key[7]; -+ data.ctx.P[8] ^= data.expanded_key[8]; -+ data.ctx.P[9] ^= data.expanded_key[9]; -+ data.ctx.P[10] ^= data.expanded_key[10]; -+ data.ctx.P[11] ^= data.expanded_key[11]; -+ data.ctx.P[12] ^= data.expanded_key[12]; -+ data.ctx.P[13] ^= data.expanded_key[13]; -+ data.ctx.P[14] ^= data.expanded_key[14]; -+ data.ctx.P[15] ^= data.expanded_key[15]; -+ data.ctx.P[16] ^= data.expanded_key[16]; -+ data.ctx.P[17] ^= data.expanded_key[17]; -+ -+ BF_body(); -+ -+ tmp1 = data.binary.salt[0]; -+ tmp2 = data.binary.salt[1]; -+ tmp3 = data.binary.salt[2]; -+ tmp4 = data.binary.salt[3]; -+ data.ctx.P[0] ^= tmp1; -+ data.ctx.P[1] ^= tmp2; -+ data.ctx.P[2] ^= tmp3; -+ data.ctx.P[3] ^= tmp4; -+ data.ctx.P[4] ^= tmp1; -+ data.ctx.P[5] ^= tmp2; -+ data.ctx.P[6] ^= tmp3; -+ data.ctx.P[7] ^= tmp4; -+ data.ctx.P[8] ^= tmp1; -+ data.ctx.P[9] ^= tmp2; -+ data.ctx.P[10] ^= tmp3; -+ data.ctx.P[11] ^= tmp4; -+ data.ctx.P[12] ^= tmp1; -+ data.ctx.P[13] ^= tmp2; -+ data.ctx.P[14] ^= tmp3; -+ data.ctx.P[15] ^= tmp4; -+ data.ctx.P[16] ^= tmp1; -+ data.ctx.P[17] ^= tmp2; -+ -+ BF_body(); -+ } while (--count); -+ -+ for (i = 0; i < 6; i += 2) { -+ L = BF_magic_w[i]; -+ R = BF_magic_w[i + 1]; -+ -+ count = 64; -+ do { -+ BF_ENCRYPT; -+ } while (--count); -+ -+ data.binary.output[i] = L; -+ data.binary.output[i + 1] = R; -+ } -+ -+ memcpy(output, setting, 7 + 22 - 1); -+ output[7 + 22 - 1] = BF_itoa64[(int) -+ BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30]; -+ -+/* This has to be bug-compatible with the original implementation, so -+ * only encode 23 of the 24 bytes. :-) */ -+ BF_swap(data.binary.output, 6); -+ BF_encode(&output[7 + 22], data.binary.output, 23); -+ output[7 + 22 + 31] = '\0'; -+ -+/* Overwrite the most obvious sensitive data we have on the stack. Note -+ * that this does not guarantee there's no sensitive data left on the -+ * stack and/or in registers; I'm not aware of portable code that does. */ -+ clean(&data, sizeof(data)); -+ -+ return output; -+} -+ -+char *_crypt_gensalt_blowfish_rn(unsigned long count, -+ __CONST char *input, int size, char *output, int output_size) -+{ -+ if (size < 16 || output_size < 7 + 22 + 1 || -+ (count && (count < 4 || count > 31))) { -+ if (output_size > 0) output[0] = '\0'; -+ __set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL); -+ return NULL; -+ } -+ -+ if (!count) count = 5; -+ -+ output[0] = '$'; -+ output[1] = '2'; -+ output[2] = 'a'; -+ output[3] = '$'; -+ output[4] = '0' + count / 10; -+ output[5] = '0' + count % 10; -+ output[6] = '$'; -+ -+ BF_encode(&output[7], (BF_word *)input, 16); -+ output[7 + 22] = '\0'; -+ -+ return output; -+} -diff -ru -N glibc-2.17-orig/crypt/crypt-entry.c glibc-2.17/crypt/crypt-entry.c ---- glibc-2.17-orig/crypt/crypt-entry.c 2012-12-25 04:02:13.000000000 +0100 -+++ glibc-2.17/crypt/crypt-entry.c 2013-01-22 23:30:12.342353955 +0100 -@@ -61,6 +61,8 @@ - extern char *__sha512_crypt_r (const char *key, const char *salt, - char *buffer, int buflen); - extern char *__sha512_crypt (const char *key, const char *salt); -+extern char *_crypt_blowfish_rn (const char *key, const char *setting, -+ char *output, int size); - - /* Define our magic string to mark salt for MD5 encryption - replacement. This is meant to be the same as for other MD5 based -@@ -73,6 +75,9 @@ - /* Magic string for SHA512 encryption. */ - static const char sha512_salt_prefix[] = "$6$"; - -+/* Magic string for Blowfish encryption. */ -+static const char blowfish_salt_prefix[] = "$2a$"; -+ - /* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */ - extern struct crypt_data _ufc_foobar; - -@@ -113,6 +118,11 @@ - if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0) - return __sha512_crypt_r (key, salt, (char *) data, - sizeof (struct crypt_data)); -+ -+ /* Try to find out whether we have to use Blowfish encryption replacement. */ -+ if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0) -+ return _crypt_blowfish_rn (key, salt, (char *) data, -+ sizeof (struct crypt_data)); - #endif - - /* -diff -ru -N glibc-2.17-orig/crypt/Makefile glibc-2.17/crypt/Makefile ---- glibc-2.17-orig/crypt/Makefile 2012-12-25 04:02:13.000000000 +0100 -+++ glibc-2.17/crypt/Makefile 2013-01-22 23:30:12.341353960 +0100 -@@ -26,7 +26,7 @@ - extra-libs-others := $(extra-libs) - - libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \ -- crypt_util -+ crypt_util crypt_blowfish - - tests := cert md5c-test sha256c-test sha512c-test badsalttest - -- cgit 1.4.1 From bdfc989bba48aaa44ab03f26a9e6046bfe6ebc3f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 17:19:53 +0200 Subject: glibc: remove a fixup; not needed since glibc-2.22 --- pkgs/development/libraries/glibc/common.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3cc74b083c5..5cb627ed895 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -85,12 +85,6 @@ stdenv.mkDerivation ({ + '' cat ${./glibc-remove-datetime-from-nscd.patch} \ | sed "s,@out@,$out," | patch -p1 - '' - # CVE-2014-8121, see https://bugzilla.redhat.com/show_bug.cgi?id=1165192 - + '' - substituteInPlace ./nss/nss_files/files-XXX.c \ - --replace 'status = internal_setent (stayopen);' \ - 'status = internal_setent (1);' ''; configureFlags = -- cgit 1.4.1 From 5c66a4e2210bd5f3f11af808fe61f31f3e3bfbf2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 Sep 2017 13:18:47 -0400 Subject: gnutls: 3.5.14 -> 3.5.15 --- pkgs/development/libraries/gnutls/3.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 62ff2547569..55c917f212e 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.14"; + version = "3.5.15"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1nhv0mf3apz65ljh335l8xds7wpn08ywljkrvws08apljbn2v8aa"; + sha256 = "1mgsxkbs44csw07ngwbqns2y2s03m975lk1sl5ay87wbic882q04"; }; # Skip two tests introduced in 3.5.11. Probable reasons of failure: -- cgit 1.4.1 From 6d2d7d5f46f1429ea1470bea08bb5e5c8c2af55a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 20:01:54 +0200 Subject: mesa: maintenance 17.1.7 -> 17.1.8 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 54e5626868a..bdce7ce3dbe 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.7"; + version = "17.1.8"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "1xg5v61nvabjk3rx48cwmnwv6zpqdcnkxl8bz82284mifjl75x39"; + sha256 = "75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db"; }; prePatch = "patchShebangs ."; -- cgit 1.4.1 From daa12ab7b9b081d6e8c3bf7fe399355a9cde2a81 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 20:50:38 +0200 Subject: pango: maintenance 1.40.9 -> 1.40.11 --- pkgs/development/libraries/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ecb0dd841fc..88a8ed1df4f 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; let ver_maj = "1.40"; - ver_min = "9"; + ver_min = "11"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16"; + sha256 = "5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e"; }; patches = [ -- cgit 1.4.1 From 3980abe191d4b9f8d4d60b101f67f3658f380a56 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Sep 2017 20:51:16 +0200 Subject: gkt3: maintenance 3.22.18 -> 3.22.19 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1071af61448..bc5b6a36339 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "18"; + ver_min = "19"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "b64b1c2ec20adf128ac08ee704d1f4e7b0a8d3df097d51f62edb271c7bb1bf69"; + sha256 = "9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c"; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From fd2c1fe610cdf463f21cdabe9a6280277ba34525 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:57:24 +0300 Subject: pythonPackages.GeoIP: init at 1.3.2 --- pkgs/development/python-modules/GeoIP/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/GeoIP/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix new file mode 100644 index 00000000000..6c4453774ce --- /dev/null +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -0,0 +1,30 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, geoip, nose}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "GeoIP"; + version = "1.3.2"; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ + geoip + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458"; + }; + + # Tests cannot be run because they require data that isn't included in the + # release tarball. + checkPhase = "true"; + + meta = { + description = "MaxMind GeoIP Legacy Database - Python API"; + homepage = http://www.maxmind.com/; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4ef9a8ce11..de79d5dc502 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5974,6 +5974,8 @@ in { }; }; + GeoIP = callPackage ../development/python-modules/GeoIP { }; + gmpy = buildPythonPackage rec { name = "gmpy-1.17"; disabled = isPyPy; -- cgit 1.4.1 From 81d2549e8b49fdf3f6e826dc96ad602d822b2714 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:58:31 +0300 Subject: pythonPackages.txtorcon: init at 0.19.3 --- .../python-modules/txtorcon/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/txtorcon/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix new file mode 100644 index 00000000000..60947bc769c --- /dev/null +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -0,0 +1,39 @@ +{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof +, GeoIP}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txtorcon"; + version = "0.19.3"; + + checkInputs = [ pytest mock lsof GeoIP ]; + propagatedBuildInputs = [ + incremental twisted automat zope_interface + # extra dependencies required by twisted[tls] + idna pyopenssl service-identity + ] ++ lib.optionals (!isPy3k) [ ipaddress ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp"; + }; + + # ipaddress isn't required for Python 3 although it's in requirements.txt. + # Because ipaddress doesn't install on Python 3, remove the requirement so the + # installation of this package doesn't fail on Python 3. + postPatch = "" + lib.optionalString isPy3k '' + substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" + ''; + + checkPhase = '' + pytest . + ''; + + meta = { + description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; + homepage = https://github.com/meejah/txtorcon; + maintainers = with lib.maintainers; [ jluttine ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de79d5dc502..1ba770ac031 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22736,6 +22736,8 @@ in { twisted = callPackage ../development/python-modules/twisted { }; + txtorcon = callPackage ../development/python-modules/txtorcon { }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; -- cgit 1.4.1 From 145fa7ac1f355e4d8f71ccd7e7ef4a059519f70a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 20:54:32 +0300 Subject: pythonPackages.attrs: 16.2.0 -> 17.2.0 --- pkgs/development/python-modules/attrs/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------------ 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/attrs/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix new file mode 100644 index 00000000000..e58bf3846dc --- /dev/null +++ b/pkgs/development/python-modules/attrs/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, pytest, hypothesis, zope_interface +, pympler, coverage, six, clang }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "attrs"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + }; + + # macOS needs clang for testing + buildInputs = [ + pytest hypothesis zope_interface pympler coverage six + ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Python attributes without boilerplate"; + homepage = https://github.com/hynek/attrs; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ba770ac031..a23c668d07e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -647,29 +647,7 @@ in { }; }); - attrs = buildPythonPackage (rec { - name = "attrs-${version}"; - version = "16.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/a/attrs/${name}.tar.gz"; - sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001"; - }; - - # macOS needs clang for testing - buildInputs = with self; [ pytest hypothesis zope_interface - pympler coverage ] - ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Python attributes without boilerplate"; - homepage = https://github.com/hynek/attrs; - license = licenses.mit; - }; - }); + attrs = callPackage ../development/python-modules/attrs { }; audioread = callPackage ../development/python-modules/audioread { }; -- cgit 1.4.1 From 196fbee1bbf21cb01096adc9d34e1f42e1095bfd Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 17:14:11 +0300 Subject: pythonPackages.magic-wormhole: fix inputs and patch --- pkgs/development/python-modules/magic-wormhole/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 7fedf4d48bb..cc1e663209e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,6 +17,7 @@ , humanize , pyopenssl , service-identity +, txtorcon }: buildPythonPackage rec { @@ -31,14 +32,11 @@ buildPythonPackage rec { checkInputs = [ mock ]; buildInputs = [ nettools glibcLocales ]; - propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ]; + propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ]; postPatch = '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py - sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py - # XXX: disable one test due to warning: - # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py + sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py '' + lib.optionalString (pythonAtLeast "3.3") '' sed -i -e 's|"ipaddress",||' setup.py ''; -- cgit 1.4.1 From 6a089581f89f9da656e63f234d1a099838f4898f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 4 Sep 2017 15:49:17 -0400 Subject: gcc-4.5: Fix typo --- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index dc62d1fbd52..bec2aab017e 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -65,7 +65,7 @@ let version = "4.5.4"; /* Cross-gcc settings */ gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatform; gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; -- cgit 1.4.1 From 596d87c13edfb6ded1ac7507e31aab874d53c6dc Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 3 Sep 2017 15:42:05 +0300 Subject: pythonPackages.pytest-flake8: fix strict mode --- pkgs/development/python-modules/pytest-flake8/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 93883283627..b39737ea701 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,4 @@ -{lib, buildPythonPackage, fetchPypi, pytest, flake8}: +{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -16,6 +16,16 @@ buildPythonPackage rec { sha256 = "1za5i09gz127yraigmcl443w6149714l279rmlfxg1bl2kdsc45a"; }; + patches = [ + # Fix pytest strict mode (pull request #24) + # https://github.com/tholo/pytest-flake8/pull/24 + (fetchpatch { + name = "fix-compatibility-with-pytest-strict-mode.patch"; + url = "https://github.com/tholo/pytest-flake8/commit/434e1b07b4b77bfe1ddb9b2b54470c6c3815bb1a.patch"; + sha256 = "0idwgkwwysx2cibnykd81yxrgqzkpf42j99jmpnanqzi99qnc3wx"; + }) + ]; + checkPhase = '' pytest --ignore=nix_run_setup.py . ''; -- cgit 1.4.1 From e9215bda452984b6caadd74a14763d583f401b6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:31:45 +0200 Subject: python.pkgs.bkcharts: init at 0.2 --- .../python-modules/bkcharts/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/bkcharts/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix new file mode 100644 index 00000000000..dee19b45f44 --- /dev/null +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pandas +}: + + +buildPythonPackage rec { + pname = "bkcharts"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit version pname; + sha256 = "a5eaa8e78853dcecaa46345812e4fabe9cd3b96330ebf0809f640a4a0556d72e"; + }; + + propagatedBuildInputs = [ numpy pandas ]; + + # Circular test dependency on bokeh + doCheck = false; + + meta = { + description = "High level chart types built on top of Bokeh"; + homepage = http://github.com/bokeh/bkcharts; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a23c668d07e..22a1b8e3531 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2109,6 +2109,7 @@ in { bokeh = buildPythonPackage rec { name = "bokeh-${version}"; version = "0.12.3"; + bkcharts = callPackage ../development/python-modules/bkcharts { }; src = pkgs.fetchurl { url = "mirror://pypi/b/bokeh/${name}.tar.gz"; -- cgit 1.4.1 From 54e502272886f23434306f0aeec60d1802b694be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:32:04 +0200 Subject: python.pkgs.bokeh: 0.12.3 -> 0.12.7 --- pkgs/development/python-modules/bokeh/default.nix | 82 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 48 +------------ 2 files changed, 83 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/python-modules/bokeh/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix new file mode 100644 index 00000000000..43c176a09ec --- /dev/null +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, mock +, pytest +, flask +, jinja2 +, markupsafe +, werkzeug +, itsdangerous +, dateutil +, requests +, six +, pygments +, pystache +, markdown +, pyyaml +, pyzmq +, tornado +, colorama +, isPy3k +, futures +, websocket_client +, numpy +, pandas +, greenlet +, python +, bkcharts +, pillow +, selenium +}: + +buildPythonPackage rec { + pname = "bokeh"; + name = "${pname}${version}"; + version = "0.12.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + }; + + disabled = isPyPy; + + # Some test that uses tornado fails +# doCheck = false; + + checkInputs = [ mock pytest pillow selenium ]; + + propagatedBuildInputs = [ + flask + jinja2 + markupsafe + werkzeug + itsdangerous + dateutil + requests + six + pygments + pystache + markdown + pyyaml + pyzmq + tornado + colorama + bkcharts + ] + ++ lib.optionals ( !isPy3k ) [ futures ] + ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ] + ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s bokeh/tests + ''; + + meta = { + description = "Statistical and novel interactive HTML plots for Python"; + homepage = "http://github.com/bokeh/bokeh"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22a1b8e3531..759a9ed2250 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2106,55 +2106,9 @@ in { }; }; - bokeh = buildPythonPackage rec { - name = "bokeh-${version}"; - version = "0.12.3"; bkcharts = callPackage ../development/python-modules/bkcharts { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bokeh/${name}.tar.gz"; - sha256 = "e138941b62f59bc48bc5b8d249e90c03fed31c1d5abe47ab2ce9e4c83202f73c"; - }; - - disabled = isPyPy; - - # Some test that uses tornado fails - doCheck = false; - - buildInputs = with self; [ mock pytest ]; - - propagatedBuildInputs = with self; [ - flask - jinja2 - markupsafe - werkzeug - itsdangerous - dateutil - requests - six - pygments - pystache - markdown - pyyaml - pyzmq - tornado - colorama - ] - ++ optionals ( !isPy3k ) [ futures ] - ++ optionals ( isPy26 ) [ argparse ] - ++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ] - ++ optionals ( !isPyPy ) [ numpy pandas greenlet ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s bokeh/tests - ''; - - meta = { - description = "Statistical and novel interactive HTML plots for Python"; - homepage = "http://github.com/bokeh/bokeh"; - license = licenses.bsd3; - }; - }; + bokeh = callPackage ../development/python-modules/bokeh { }; boto = buildPythonPackage rec { name = "boto-${version}"; -- cgit 1.4.1 From 413b54bcef65a31bc2dda01b3e084682fad78c4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:45:55 +0200 Subject: python.pkgs.prompt_toolkit: 1.0.14 -> 1.0.15 --- .../python-modules/prompt_toolkit/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 37 +++----------------- 2 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/prompt_toolkit/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix new file mode 100644 index 00000000000..9704f1b92c9 --- /dev/null +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, docopt +, six +, wcwidth +, pygments +}: + +buildPythonPackage rec { + pname = "prompt_toolkit"; + name = "${pname}-${version}"; + version = "1.0.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + }; + checkPhase = '' + rm prompt_toolkit/win32_types.py + py.test -k 'not test_pathcompleter_can_expanduser' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ docopt six wcwidth pygments ]; + + meta = { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nckx ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 759a9ed2250..dca008eee60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16457,41 +16457,14 @@ in { }; - prompt_toolkit = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "1.0.14"; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; - src = pkgs.fetchurl { - sha256 = "cc66413b1b4b17021675d9f2d15d57e640b06ddfd99bb724c73484126d22622f"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; - }; - checkPhase = '' - rm prompt_toolkit/win32_types.py - py.test -k 'not test_pathcompleter_can_expanduser' - ''; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ docopt six wcwidth pygments ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - prompt_toolkit_52 = self.prompt_toolkit.override(self: rec { - name = "prompt_toolkit-${version}"; + prompt_toolkit_52 = self.prompt_toolkit.overridePythonAttrs(oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; version = "0.52"; - src = pkgs.fetchurl { + src = oldAttrs.src.override { + inherit version; sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m"; - url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; # No tests included in archive -- cgit 1.4.1 From 3771bf74a8da875e241d8aca071f79222cf3317f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:46:30 +0200 Subject: python.pkgs: fix various missing lib/stdenv --- pkgs/development/python-modules/cherrypy/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 2 +- pkgs/development/python-modules/pytest-sugar/default.nix | 2 +- pkgs/development/python-modules/pytest-warnings/default.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 327a10f2491..cffffde8e3d 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "http://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; - license = licenses.mit.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 9092185a40f..cb418678a99 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = https://github.com/jaraco/portend; - license = lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 81f5a2cbd4b..2965d169599 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; - license = lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index e6ebfcbb716..6b835abcafe 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest ]; - meta = with stdenv.lib; { + meta = { description = "Plugin to list Python warnings in pytest report"; homepage = github.com/fschulze/pytest-warnings; license = lib.licenses.mit; -- cgit 1.4.1 From 66b6c043579ca8f6bf528830f2f754dd4d4ed96b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:51:44 +0200 Subject: python.pkgs.contextlib2: 0.5.3 -> 0.5.5 --- .../python-modules/contextlib2/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +--------- 2 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/contextlib2/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix new file mode 100644 index 00000000000..cadaa8914b2 --- /dev/null +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.5.5"; + name = "${pname}-${version}"; + + src = fetchPypi rec { + inherit pname version; + sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; + }; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = http://contextlib2.readthedocs.org/; + license = lib.licenses.psfl; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dca008eee60..19199c13626 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3178,15 +3178,7 @@ in { }; - contextlib2 = buildPythonPackage rec { - name = "contextlib2-${version}"; - version = "0.5.3"; - - src = pkgs.fetchurl rec { - url = "mirror://pypi/c/contextlib2/${name}.tar.gz"; - sha256 = "01k2921labkbn28kw60jmqzvr4nxzfnx4vcsyjb3rir177qh1r9h"; - }; - }; + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; cookiecutter = buildPythonPackage rec { version = "1.4.0"; -- cgit 1.4.1 From 5d057a2d7f28e1c37c111c0d90ee32a1a9a9de7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 09:56:36 +0200 Subject: python.pkgs.coverage: 4.0.1 -> 4.4.1 --- .../python-modules/coverage/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/coverage/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix new file mode 100644 index 00000000000..137cef06b9e --- /dev/null +++ b/pkgs/development/python-modules/coverage/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "4.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = http://nedbatchelder.com/code/coverage/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19199c13626..f611902a9fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3223,24 +3223,7 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; - coverage = buildPythonPackage rec { - name = "coverage-4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/coverage/${name}.tar.gz"; - sha256 = "0nrd817pzjw1haaz6gambgwf4jdjnh9kyxkgj6l8qgl6hdxga45w"; - }; - - # TypeError: __call__() takes 1 positional argument but 2 were given - doCheck = !isPy3k; - buildInputs = with self; [ mock ]; - - meta = { - description = "Code coverage measurement for python"; - homepage = http://nedbatchelder.com/code/coverage/; - license = licenses.bsd3; - }; - }; + coverage = callPackage ../development/python-modules/coverage { }; covCore = buildPythonPackage rec { name = "cov-core-1.15.0"; -- cgit 1.4.1 From a2fb79f86504c7d84b61aa18e79ea3b7fba4a9d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:04:11 +0200 Subject: python.pkgs.dill: 0.2.6 -> 0.2.7.1 --- pkgs/development/python-modules/dill/default.nix | 32 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/dill/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix new file mode 100644 index 00000000000..79c87772ffe --- /dev/null +++ b/pkgs/development/python-modules/dill/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "dill"; + version = "0.2.7.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "97fd758f5fe742d42b11ec8318ecfcff8776bccacbfcec05dfd6276f5d450f73"; + }; + + # Messy test suite. Even when running the tests like tox does, it fails + doCheck = false; + checkPhase = '' + for test in tests/*.py; do + ${python.interpreter} $test + done + ''; + # Following error without setting checkPhase + # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} + + meta = { + description = "Serialize all of python (almost)"; + homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f611902a9fc..f14cf82dc68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4946,24 +4946,7 @@ in { }; - dill = buildPythonPackage rec { - name = "dill-${version}"; - version = "0.2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dill/${name}.zip"; - sha256 = "6c1ccca68be483fa8c66e85a89ffc850206c26373aa77a97b83d8d0994e7f1fd"; - }; - - # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0} - doCheck = false; - - meta = { - description = "Serialize all of python (almost)"; - homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; - license = licenses.bsd3; - }; - }; + dill = callPackage ../development/python-modules/dill { }; discogs_client = buildPythonPackage rec { name = "discogs-client-2.0.2"; -- cgit 1.4.1 From 63e13345ae808814c3307f32d9812df57419e38b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:08:04 +0200 Subject: python.pkgs.entrypoints: 0.2.2 -> 0.2.3 --- .../python-modules/entrypoints/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +--------- 2 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/entrypoints/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix new file mode 100644 index 00000000000..d812fd55a88 --- /dev/null +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, configparser +, pytest +}: + +buildPythonPackage rec { + pname = "entrypoints"; + version = "0.2.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + }; + + checkInputs = [ pytest]; + + propagatedBuildInputs = [ configparser ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Discover and load entry points from installed packages"; + homepage = https://github.com/takluyver/entrypoints; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f14cf82dc68..17560e316c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5330,19 +5330,7 @@ in { }; }); - entrypoints = buildPythonPackage rec { - pname = "entrypoints"; - version = "0.2.2"; - name = "${pname}-${version}"; - format = "wheel"; - - src = fetchPypi { - inherit pname version format; - sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; - }; - - propagatedBuildInputs = with self; [ configparser ]; - }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {}; -- cgit 1.4.1 From b85dbed153ea7fce7e37cffd9ebda61d39f4e9dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Sep 2017 10:28:56 +0200 Subject: python.pkgs.pytimeparse: 1.1.6 -> 1.1.7 --- pkgs/development/python-modules/pytimeparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index ce5ff058664..374263c2b70 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytimeparse"; - version = "1.1.6"; + version = "1.1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; + sha256 = "51b641bcd435e0cb6b9701ed79cf7ee97fa6bf2dbb5d41baa16e5486e5d9b17a"; }; propagatedBuildInputs = [ nose ]; -- cgit 1.4.1 From 252b36a28db1dd9036cfcbfbaa64b63e6ea5655a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 14 Aug 2017 16:39:03 -0400 Subject: misc pkgs: Recategorize some dependencies --- pkgs/development/libraries/glew/1.10.nix | 5 ++--- pkgs/development/libraries/glew/default.nix | 4 ++-- .../libraries/kde-frameworks/extra-cmake-modules/default.nix | 2 +- pkgs/development/pure-modules/glpk/default.nix | 4 ++-- pkgs/development/tools/misc/autoconf/2.13.nix | 3 ++- pkgs/development/tools/misc/help2man/default.nix | 3 ++- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/parsing/flex/2.5.35.nix | 2 +- pkgs/development/tools/parsing/flex/2.6.1.nix | 2 +- pkgs/development/tools/parsing/flex/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 2 +- pkgs/tools/misc/kdecoration-viewer/default.nix | 3 ++- 13 files changed, 19 insertions(+), 17 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 159bf47e130..3f8119d36d6 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h - buildInputs = [] ++ optionals stdenv.isDarwin [ AGL ]; + buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 814e4496b77..57bb4cb631d 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + buildInputs = [ xlibsWrapper libXmu libXi ]; + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 86be0398e06..654eb94b51a 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -7,7 +7,7 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components - propagatedNativeBuildInputs = [ cmake pkgconfig ]; + propagatedBuildInputs = [ cmake pkgconfig ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 452cf51e634..4927ac445f4 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ]; + propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-gmp=yes" ]; }); - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure glpkWithExtras ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 0b32f02f258..d4748337626 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - buildInputs = [m4 perl lzma]; + nativebuildInputs = [ lzma ]; + buildInputs = [ m4 perl ]; doCheck = true; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 5e2edce56f0..ada2dd1a89a 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; }; - buildInputs = [ makeWrapper perl gettext LocaleGettext ]; + nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; + buildInputs = [ perl LocaleGettext ]; doCheck = false; # target `check' is missing diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index f25fbcd00d8..bf134c459d9 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - propagatedNativeBuildInputs = [ m4 ]; nativeBuildInputs = [ perl help2man ]; + propagatedBuildInputs = [ m4 ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index f3357de867e..4f78b0c71c1 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison texinfo help2man autoreconfHook ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; crossAttrs = { preConfigure = '' diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 7ee2e27e60a..f27fac9bcb5 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index addf3b6197a..92fba47b756 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; - propagatedNativeBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 513e4ceee62..28463dc6163 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -6,7 +6,7 @@ with stdenv.lib; overrideDerivation xorgserver (oldAttrs: { name = "xwayland-${xorgserver.version}"; - propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3df01dccced..33731688cac 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; - propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs; + propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 33ccf28cb0d..62783bb30df 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; }; - buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; meta = with stdenv.lib; { description = "Allows to preview a KDecoration plugin"; -- cgit 1.4.1 From fea02e30f1cce6a853c0b4724d503caee811f96f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 5 Sep 2017 20:12:47 +0200 Subject: ncurses: 6.0-20170729 -> 6.0-20170902 Fixes issues with xterm terminfo. --- pkgs/development/libraries/ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 35b6659ad7e..b8c7ff2f07d 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = if abiVersion == "5" then "5.9" else "6.0-20170729"; + version = if abiVersion == "5" then "5.9" else "6.0-20170902"; name = "ncurses-${version}"; src = fetchurl (if abiVersion == "5" then { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; } else { url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; - sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga"; + sha256 = "1cks4gsz4148jw6wpqia4w5jx7cfxr29g2kmpvp0ssmvwczh8dr4"; }); patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; -- cgit 1.4.1 From f3ac052f24cc07126f05654c18be31b4ed0e452d Mon Sep 17 00:00:00 2001 From: Bernd Amend Date: Sun, 3 Sep 2017 23:59:58 +0200 Subject: cmake: 3.8.2 -> 3.9.1 --- .../tools/build-managers/cmake/default.nix | 10 +-- .../build-managers/cmake/search-path-3.2.patch | 77 ---------------------- .../build-managers/cmake/search-path-3.9.patch | 62 +++++++++++++++++ 3 files changed, 67 insertions(+), 82 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/cmake/search-path-3.2.patch create mode 100644 pkgs/development/tools/build-managers/cmake/search-path-3.9.patch (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 13c404374b0..2668489e58b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -12,8 +12,8 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.8"; - minorVersion = "2"; + majorVersion = "3.9"; + minorVersion = "1"; version = "${majorVersion}.${minorVersion}"; in @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt - sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d"; + # from https://cmake.org/files/v3.9/cmake-3.9.1-SHA-256.txt + sha256 = "d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb"; }; prePatch = optionalString (!useSharedLibraries) '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; # Don't search in non-Nix locations such as /usr, but do search in our libc. - patches = [ ./search-path-3.2.patch ] + patches = [ ./search-path-3.9.patch ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch deleted file mode 100644 index 623a7208a86..00000000000 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake ---- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300 -+++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300 -@@ -32,9 +32,6 @@ - # List common installation prefixes. These will be used for all - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- /usr/local /usr / -- - # CMake install location - "${_CMAKE_INSTALL_DIR}" - ) -@@ -53,44 +50,25 @@ - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @libc_dev@/include - ) -- - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @libc_bin@/bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - - # Enable use of lib64 search path variants by default. -diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake ---- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700 -+++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700 -@@ -66,7 +66,7 @@ - - if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") - # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) -+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) - endif() - - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch new file mode 100644 index 00000000000..6213138402b --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch @@ -0,0 +1,62 @@ +diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake +--- cmake-3.9.1/Modules/Platform/UnixPaths.cmake 2017-08-10 13:36:32.000000000 +0000 ++++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake 2017-09-03 01:24:31.901473539 +0000 +@@ -22,9 +22,6 @@ + # List common installation prefixes. These will be used for all + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Standard +- /usr/local /usr / +- + # CMake install location + "${_CMAKE_INSTALL_DIR}" + ) +@@ -43,31 +40,26 @@ + + # Non "standard" but common install prefixes + list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- /usr/X11R6 +- /usr/pkg +- /opt + ) + + # List common include file locations not under the common prefixes. + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # X11 +- /usr/include/X11 ++ @libc_dev@/include + ) + + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # X11 +- /usr/lib/X11 ++ @libc_lib@/lib + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 ++ @libc_lib@/lib + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ @libc_dev@/include + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ @libc_dev@/include + ) + + # Enable use of lib32 and lib64 search path variants by default. +diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake +--- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake 2017-08-10 13:36:32.000000000 +0000 ++++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake 2017-09-03 01:19:32.808355986 +0000 +@@ -66,7 +66,7 @@ + + if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") + # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) +- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) ++ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) + endif() + + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- cgit 1.4.1 From b49b9da3ce990d4420145dc1a4dd43fd8fa71ee0 Mon Sep 17 00:00:00 2001 From: Bernd Amend Date: Mon, 4 Sep 2017 00:54:34 +0200 Subject: cmake: add withQt5 option and make it the default --- pkgs/development/tools/build-managers/cmake/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 2668489e58b..a912b04d217 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -6,8 +6,12 @@ , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses , useQt4 ? false, qt4 +, withQt5 ? false, qtbase }: +assert withQt5 -> useQt4 == false; +assert useQt4 -> withQt5 == false; + with stdenv.lib; let @@ -18,7 +22,7 @@ let in stdenv.mkDerivation rec { - name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}"; inherit majorVersion; @@ -46,7 +50,8 @@ stdenv.mkDerivation rec { [ setupHook pkgconfig ] ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses - ++ optional useQt4 qt4; + ++ optional useQt4 qt4 + ++ optional withQt5 qtbase; propagatedBuildInputs = optional stdenv.isDarwin ps; @@ -63,7 +68,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--docdir=share/doc/${name}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional useQt4 "--qt-gui" + ++ optional (useQt4 || withQt5) "--qt-gui" ++ optionals (!useNcurses) [ "--" "-DBUILD_CursesDialog=OFF" ]; dontUseCmakeConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c0671ef80a..cb5e45afbcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6882,13 +6882,14 @@ with pkgs; inherit (darwin) ps; }; - cmake = callPackage ../development/tools/build-managers/cmake { + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { inherit (darwin) ps; }; cmakeCurses = cmake.override { useNcurses = true; }; - cmakeWithGui = cmakeCurses.override { useQt4 = true; }; + cmakeWithGui = cmakeCurses.override { withQt5 = true; }; + cmakeWithQt4Gui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools; -- cgit 1.4.1 From ec8d41f08c95cff79ccb28132146226f4f75c6fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Sep 2017 12:22:33 +0200 Subject: Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" This reverts commit 0a944b345e89ca0096974d168f49e1c6830c3fc2, reversing changes made to 61733ed6ccde3427016720f2e0cd191d3d95152c. I dislike these massive stdenv changes with unclear motivation, especially when they involve gratuitous mass renames like NIX_CC -> NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused months of pain, so let's not do that again. --- doc/stdenv.xml | 50 +--- .../audio/google-musicmanager/default.nix | 2 +- .../google-play-music-desktop-player/default.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 2 +- pkgs/applications/editors/atom/default.nix | 4 +- pkgs/applications/editors/brackets/default.nix | 4 +- pkgs/applications/editors/jetbrains/default.nix | 2 +- pkgs/applications/editors/kodestudio/default.nix | 14 +- pkgs/applications/editors/lighttable/default.nix | 2 +- pkgs/applications/editors/sublime/default.nix | 2 +- pkgs/applications/editors/sublime3/default.nix | 2 +- pkgs/applications/editors/typora/default.nix | 2 +- pkgs/applications/editors/vscode/default.nix | 2 +- pkgs/applications/graphics/draftsight/default.nix | 2 +- pkgs/applications/misc/adobe-reader/builder.sh | 2 +- pkgs/applications/misc/googleearth/default.nix | 2 +- pkgs/applications/misc/houdini/runtime.nix | 2 +- pkgs/applications/misc/hyper/default.nix | 2 +- pkgs/applications/misc/ipmiview/default.nix | 4 +- pkgs/applications/misc/kdbplus/default.nix | 2 +- pkgs/applications/misc/kiwix/default.nix | 2 +- pkgs/applications/misc/rescuetime/default.nix | 2 +- pkgs/applications/misc/simplenote/default.nix | 2 +- .../networking/bittorrentsync/generic.nix | 2 +- .../networking/browsers/firefox-bin/default.nix | 2 +- .../networking/browsers/google-chrome/default.nix | 2 +- .../mozilla-plugins/flashplayer/default.nix | 2 +- .../mozilla-plugins/flashplayer/standalone.nix | 2 +- .../mozilla-plugins/google-talk-plugin/default.nix | 2 +- .../networking/browsers/opera/default.nix | 2 +- .../browsers/tor-browser-bundle-bin/default.nix | 2 +- .../networking/browsers/vivaldi/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/networking/dropbox/default.nix | 2 +- .../instant-messengers/discord/default.nix | 2 +- .../instant-messengers/franz/default.nix | 2 +- .../instant-messengers/hipchat/default.nix | 2 +- .../messenger-for-desktop/default.nix | 2 +- .../instant-messengers/rambox/default.nix | 2 +- .../instant-messengers/skypeforlinux/default.nix | 2 +- .../instant-messengers/slack/default.nix | 2 +- .../instant-messengers/teamspeak/client.nix | 2 +- .../instant-messengers/teamspeak/server.nix | 4 +- .../instant-messengers/viber/default.nix | 2 +- .../instant-messengers/zoom-us/default.nix | 8 +- pkgs/applications/networking/insync/default.nix | 2 +- .../mailreaders/nylas-mail-bin/default.nix | 4 +- .../mailreaders/thunderbird-bin/default.nix | 2 +- .../networking/remote/anydesk/default.nix | 2 +- .../networking/remote/citrix-receiver/default.nix | 2 +- .../networking/resilio-sync/default.nix | 2 +- pkgs/applications/office/marp/default.nix | 2 +- pkgs/applications/office/moneyplex/default.nix | 4 +- pkgs/applications/office/wpsoffice/default.nix | 2 +- .../science/electronics/eagle/default.nix | 2 +- .../science/logic/saw-tools/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 2 +- .../science/logic/verifast/default.nix | 2 +- pkgs/applications/science/math/mathematica/10.nix | 2 +- pkgs/applications/science/math/mathematica/9.nix | 2 +- .../science/math/mathematica/default.nix | 2 +- .../science/math/scilab-bin/default.nix | 2 +- .../science/medicine/aliza/default.nix | 4 +- .../science/programming/fdr/default.nix | 2 +- pkgs/applications/taxes/aangifte-2006/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2007/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2008/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2009/default.nix | 2 +- pkgs/applications/taxes/aangifte-2010/default.nix | 2 +- pkgs/applications/taxes/aangifte-2011/default.nix | 2 +- pkgs/applications/taxes/aangifte-2012/default.nix | 2 +- .../taxes/aangifte-2013-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2013/default.nix | 2 +- .../taxes/aangifte-2014-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2014/default.nix | 2 +- .../version-management/gitkraken/default.nix | 2 +- pkgs/applications/video/makemkv/builder.sh | 2 +- pkgs/build-support/binutils-wrapper/add-flags.sh | 40 --- .../binutils-wrapper/add-hardening.sh | 53 ---- pkgs/build-support/binutils-wrapper/default.nix | 288 --------------------- .../binutils-wrapper/ld-solaris-wrapper.sh | 25 -- pkgs/build-support/binutils-wrapper/ld-wrapper.sh | 189 -------------- pkgs/build-support/binutils-wrapper/setup-hook.sh | 63 ----- pkgs/build-support/cc-wrapper/add-flags.sh | 39 ++- pkgs/build-support/cc-wrapper/add-hardening.sh | 10 + pkgs/build-support/cc-wrapper/cc-wrapper.sh | 14 +- pkgs/build-support/cc-wrapper/default.nix | 131 ++++++++-- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 +- .../build-support/cc-wrapper/ld-solaris-wrapper.sh | 25 ++ pkgs/build-support/cc-wrapper/ld-wrapper.sh | 174 +++++++++++++ .../cc-wrapper/macos-sierra-reexport-hack.bash | 106 ++++++++ pkgs/build-support/cc-wrapper/setup-hook.sh | 23 ++ pkgs/build-support/cc-wrapper/utils.sh | 32 --- pkgs/desktops/maxx/default.nix | 2 +- pkgs/development/arduino/arduino-core/default.nix | 6 +- pkgs/development/compilers/cmucl/binary.nix | 2 +- pkgs/development/compilers/crystal/default.nix | 2 +- pkgs/development/compilers/cudatoolkit/default.nix | 2 +- pkgs/development/compilers/gcc/builder.sh | 2 +- pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 +- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +- pkgs/development/compilers/gnatboot/default.nix | 2 +- pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.7/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- pkgs/development/compilers/mentor/default.nix | 2 +- pkgs/development/compilers/mono/llvm.nix | 2 +- pkgs/development/compilers/mozart/binary.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 2 +- .../compilers/oraclejdk/dlj-bundle-builder.sh | 4 +- .../compilers/oraclejdk/jdk-linux-base.nix | 2 +- pkgs/development/compilers/rust/binaryBuild.nix | 8 +- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/compilers/zulu/default.nix | 2 +- pkgs/development/interpreters/dart/default.nix | 2 +- pkgs/development/interpreters/rebol/default.nix | 2 +- pkgs/development/libraries/libstdc++5/default.nix | 5 +- .../libraries/oracle-instantclient/default.nix | 2 +- pkgs/development/libraries/wtk/builder.sh | 2 +- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- pkgs/development/mobile/flashtool/default.nix | 2 +- pkgs/development/mobile/genymotion/default.nix | 2 +- pkgs/development/tools/electron/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 2 +- pkgs/development/tools/node-webkit/nw11.nix | 4 +- pkgs/development/tools/node-webkit/nw12.nix | 4 +- pkgs/development/tools/node-webkit/nw9.nix | 4 +- pkgs/development/tools/phantomjs/default.nix | 2 +- pkgs/development/tools/sauce-connect/default.nix | 2 +- pkgs/development/tools/thrust/default.nix | 2 +- pkgs/development/tools/unity3d/default.nix | 4 +- pkgs/games/adom/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/factorio/default.nix | 2 +- pkgs/games/oilrush/default.nix | 2 +- pkgs/games/openarena/default.nix | 2 +- pkgs/games/planetaryannihilation/default.nix | 4 +- pkgs/games/scrolls/default.nix | 2 +- pkgs/games/sdlmame/default.nix | 2 +- pkgs/games/terraria-server/default.nix | 4 +- pkgs/games/vessel/default.nix | 4 +- pkgs/games/worldofgoo/default.nix | 2 +- pkgs/misc/cups/drivers/kyocera/default.nix | 2 +- pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix | 2 +- pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh | 2 +- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 +- pkgs/misc/cups/drivers/samsung/default.nix | 2 +- pkgs/misc/drivers/gutenprint/bin.nix | 2 +- pkgs/misc/drivers/sundtek/default.nix | 2 +- pkgs/misc/foldingathome/default.nix | 2 +- pkgs/os-specific/darwin/binutils/default.nix | 15 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 2 +- pkgs/os-specific/linux/dmtcp/default.nix | 2 +- .../linux/firmware/raspberrypi/default.nix | 2 +- .../linux/nvidia-x11/builder-legacy173.sh | 2 +- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- pkgs/os-specific/linux/prl-tools/default.nix | 2 +- pkgs/servers/mattermost/default.nix | 2 +- pkgs/servers/meteor/default.nix | 6 +- .../monitoring/newrelic-sysmond/default.nix | 2 +- pkgs/servers/sql/oracle-xe/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 55 ++-- pkgs/stdenv/linux/default.nix | 35 +-- pkgs/tools/filesystems/yandex-disk/default.nix | 2 +- pkgs/tools/misc/megacli/default.nix | 2 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 2 +- pkgs/tools/misc/sam-ba/default.nix | 2 +- pkgs/tools/misc/staruml/default.nix | 2 +- pkgs/tools/misc/xflux/default.nix | 2 +- pkgs/tools/package-management/rpm/default.nix | 9 +- pkgs/tools/security/encryptr/default.nix | 2 +- pkgs/tools/security/enpass/default.nix | 2 +- pkgs/tools/security/fprot/default.nix | 2 +- pkgs/tools/security/gorilla-bin/default.nix | 2 +- pkgs/tools/security/keybase-gui/default.nix | 2 +- pkgs/tools/text/xidel/default.nix | 2 +- pkgs/top-level/all-packages.nix | 38 +-- pkgs/top-level/darwin-packages.nix | 4 +- pkgs/top-level/haxe-packages.nix | 2 +- 185 files changed, 739 insertions(+), 1072 deletions(-) delete mode 100644 pkgs/build-support/binutils-wrapper/add-flags.sh delete mode 100644 pkgs/build-support/binutils-wrapper/add-hardening.sh delete mode 100644 pkgs/build-support/binutils-wrapper/default.nix delete mode 100644 pkgs/build-support/binutils-wrapper/ld-solaris-wrapper.sh delete mode 100644 pkgs/build-support/binutils-wrapper/ld-wrapper.sh delete mode 100644 pkgs/build-support/binutils-wrapper/setup-hook.sh create mode 100755 pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh create mode 100644 pkgs/build-support/cc-wrapper/ld-wrapper.sh create mode 100644 pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash (limited to 'pkgs/development') diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 5d6d9f59509..dac53bc2b80 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1,3 +1,4 @@ + @@ -1342,61 +1343,36 @@ someVar=$(stripHash $name) - Binutils Wrapper + CC Wrapper - Binutils Wrapper wraps the binary utilities for a bunch of miscellaneous purposes. - Specifically, GNU Binutils (for Linux, but a mix of cctools and GNU Binutils for Darwin), and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Binutils Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on binutils-wrapper. + CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. + Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper. + Packages typically depend on only CC Wrapper, instead of those 3 inputs directly. - Binutils Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out. - For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux). - Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand. + Dependency finding is undoubtedly the main task of CC wrapper. It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables. - Binutils Wrapper's setup hook causes any lib and lib64 subdirectories to NIX_LDFLAGS. - Sine CC Wrapper and Binutils Wrapper use the same strategy, most of the Binutils Wrapper code is sparsely commented and refers to CC Wrapper. - But CC Wrapper's code, by contrast, has quite lengthy comments. - Binutils Wrapper merely cites those, rather than repeating them, to avoid falling out of sync. + CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS. + The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose. - They are defined to just be the base name of the tools, under the assumption that Binutils Wrapper's binaries will be on the path. + They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path. Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used. - Secondly, this helps packages not get confused when cross-compiling, in which case multiple Binutils Wrappers may be simultaneous in use (targeting different platforms). - BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional Binutils Wrappers, properly disambiguating them. + Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms). + BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them. - A problem with this final task is that Binutils Wrapper is honest and defines LD as ld. + A problem with this final task is that CC Wrapper is honest and defines LD as ld. Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback. - This triple-threat means Binutils Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use. + This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use. The workaround is to define, just for the problematic package, LD as the C compiler. A good way to do this would be preConfigure = "LD=$CC". - - CC Wrapper - - - CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes. - Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Binutils Wrapper. - Packages typically depend on CC Wrapper, which in turn (at run time) depends on Binutils Wrapper. - - - Dependency finding is undoubtedly the main task of CC Wrapper. - This works just like Binutils Wrapper, except the any include subdirectory of any relevant dependency is added to NIX_CFLAGS_COMPILE. - The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished. - - - CC Wrapper also like Binutils Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above. - Importantly, while it includes a cc symlink to the c compiler for portability, the CC will be defined using the compiler's "real name" (i.e. gcc or clang). - This helps lousy build systems that inspect on the name of the compiler rather than run it. - - - - Perl Adds the lib/site_perl subdirectory diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 27ce9eb3d13..72bec52b266 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager ''; diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 2f235966a39..9d9af631183 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { cp -r ./usr/share $out cp -r ./usr/bin $out - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" wrapProgram $out/bin/google-play-music-desktop-player \ diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 6b780cf0a75..d02c551be8a 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mkdir $out/bin ln -s $out/renoise $out/bin/renoise - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise ''; meta = { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 29019c14f85..ad0f7ee14c5 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation { rpath="$out/share/spotify:$libdir" patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/share/spotify/spotify librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 2238aafee70..e3e889abd87 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { fixupPhase - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/share/atom" \ $out/share/atom/atom - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 2dd43f9ba3c..23cb16c0733 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ $out/opt/brackets/Brackets - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${bracketsLibs}" \ $out/opt/brackets/Brackets-node diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5c042f2fe49..95f3c0801d2 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -35,7 +35,7 @@ let ln -s ${cmake} bin/cmake lldbLibPath=$out/clion-${version}/bin/lldb/lib - interp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 patchelf --set-interpreter $interp \ diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index ef07d7515aa..a0e94128909 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -50,31 +50,31 @@ in postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' # Patch Binaries patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out:${atomEnv.libPath}" \ $out/kodestudio patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib" \ $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64 patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib" \ $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64 patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64 patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64 patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \ $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64 diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d16d2d2cc64..74a83c1278a 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mv ./${name}-linux/* $out/share/LightTable patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \ $out/share/LightTable/LightTable diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 57e00f7227d..9cf5bd97d0a 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index aa19a2ca19a..c295313621e 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -50,7 +50,7 @@ in let buildPhase = '' for i in sublime_text plugin_host crash_reporter; do patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $i done diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 4be9b6dda20..0733bd79665 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" ln -s "$out/share/typora/Typora" "$out/bin/typora" diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 3457429f4db..1f91bdfa3a5 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -72,7 +72,7 @@ in postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/vscode/code ''; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 32cce492589..17334c5b366 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { mkdir $out/bin for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do echo "Patching $exe..." - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:\$ORIGIN/../Libraries \ $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \ diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 75a2bdcf4b0..41281385c99 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -17,7 +17,7 @@ rm $p/Reader/intellinux/plug_ins/PPKLite.api # More pointless files. rm $p/bin/UNINSTALL -patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ +patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $p/Reader/intellinux/bin/acroread diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index b343c1bf785..df8cb71d6f9 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { rm $out/bin/google-earth $out/opt/google/earth/free/google-earth ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${fullPath}:\$ORIGIN" \ $out/opt/google/earth/free/googleearth-bin diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index c2fe99744d1..b3ce98895e6 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; postFixup = '' - INTERPRETER="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" + INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for BIN in $(find $out/bin -type f -executable); do if patchelf $BIN 2>/dev/null ; then echo "Patching ELF $BIN" diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index ba18e346a2f..3c9eeac891d 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv opt "$out/" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" mv usr/* "$out/" ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index dd43e703d35..f9078475994 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/javaws - patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./jre/bin/java + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java ''; installPhase = '' diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index f3855f2bb92..bf1b77534ce 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/libexec patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} \ ./q/l32/q mv ./q/l32/q $out/libexec/q diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 2459b3c411e..c5b75a0be55 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { postInstall = '' cp -r src/dependencies/xulrunner $out/lib/kiwix - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 50f09ce1b5c..03d058783b2 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/rescuetime wrapProgram $out/bin/rescuetime \ diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index c84c25038d6..7367c820705 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -47,7 +47,7 @@ fixupPhase - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}:$out/share/simplenote" \ $out/share/simplenote/simplenote diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix index 342385c4b00..3fa7fe18040 100644 --- a/pkgs/applications/networking/bittorrentsync/generic.nix +++ b/pkgs/applications/networking/bittorrentsync/generic.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D btsync "$out/bin/btsync" - patchelf --interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" + patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync" ''; meta = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8abcb0cfaac..f59cb402720 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation { updater crashreporter webapprt-stub do if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/firefox-bin-${version}/$executable" fi done diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index ad79aef88a4..9a4d90701b2 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do patchelf --set-rpath $rpath $elf - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $elf + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index cc076fa02f0..0452e7486e6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$rpath" \ $out/bin/flash-player-properties ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 9c37979a359..9a805eb55e4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$rpath" \ $out/bin/flashplayer${lib.optionalString debug "debugger"} ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 2e815f77780..461db272b12 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \ $out/libexec/google/talkplugin/GoogleTalkPlugin diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 66eaf8ecfba..52a2ce9164c 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -114,7 +114,7 @@ in stdenv.mkDerivation { | while read f do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${rpath}" \ "$f" done diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 7967fe53979..756ed095991 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { buildCommand = '' # For convenience ... TBB_IN_STORE=$out/share/tor-browser - interp=$(< $NIX_BINUTILS/nix-support/dynamic-linker) + interp=$(< $NIX_CC/nix-support/dynamic-linker) # Unpack & enter mkdir -p "$TBB_IN_STORE" diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7c6ad60116c..a1238cb5964 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildPhase = '' echo "Patching Vivaldi binaries" patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/vivaldi/vivaldi-bin '' + stdenv.lib.optionalString proprietaryCodecs '' diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index dcbf609d08e..9af4cf3f0ed 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" bin/container-executor; + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; ''; installPhase = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 975c5e4a87b..a76d6bc2fa4 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -108,7 +108,7 @@ in mkDerivation { ''; preFixup = '' - INTERP=$(cat $NIX_BINUTILS/nix-support/dynamic-linker) + INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) RPATH="${ldpath}:$out/${appdir}" getType='s/ *Type: *\([A-Z]*\) (.*/\1/' find "$out/${appdir}" -type f -print | while read obj; do diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 701ba477bee..853a6c96a7a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Copying how adobe-reader does it, # see pkgs/applications/misc/adobe-reader/builder.sh - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/opt/discord:$libPath" \ $out/opt/discord/Discord diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index f41805748e5..a238009cd11 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" Franz + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz mkdir -p $out/bin $out/opt/franz diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index ccbb10c743b..326f9563070 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { mv usr/share $out for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $file || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true done diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix index 1db674f9ae1..37a3746669b 100644 --- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation { # patch the binaries for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/libexec $file || true done diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b5ce53177a7..7cb89f019e0 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" rambox + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox mkdir -p $out/bin $out/opt/rambox diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index f4ad5b74f60..d476b9b35c4 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation { postFixup = '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux" ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 1d1bc86d7cc..f36f0956f65 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { chmod -R g-w $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 7d1f3fa6791..efafbd9050c 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index bfd2469c1ce..c86de07bc84 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { '' echo "patching ts3server" patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3server cp tsdns/tsdnsserver tsdnsserver patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ tsdnsserver diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index afc977ad383..71d1bccc2b1 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { chmod -R g-w $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true done diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 208d45ed3dd..91c77fc9d7c 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -65,10 +65,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin cp -ar * $packagePath - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zoom - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/qtdiag - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $packagePath/zopen + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 # it works for me without it, but, well... paxmark m $packagePath/zoom diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 4a6bec5d1da..93efdb74c08 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; postPatch = '' - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" client/insync-portable + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable ''; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 2350b9f9465..4c768325fee 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Patch binaries binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) - patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \ + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ --set PATH "${coreutils}/bin" - patchelf --interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") \ + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 8a4eb4991ad..4f714cabf79 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { for executable in \ thunderbird crashreporter thunderbird-bin plugin-container updater do - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 93cb7c82b61..a6858a7b5fd 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "${libPath}" \ $out/bin/anydesk diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f6c7285e3b7..c656ff24df8 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { echo "Patching ELF intrepreter and rpath for $f" chmod u+w "$f" patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$ICAInstDir:$libPath" "$f" done diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 6df757626f8..7622cb76ad2 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { installPhase = '' install -D rslsync "$out/bin/rslsync" patchelf \ - --interpreter "$(< $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} "$out/bin/rslsync" ''; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 124efb13946..0e53d58a083 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}:$out/lib/marp" \ $out/bin/Marp ''; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 279a406327b..4530305ee12 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { ${coreutils}/bin/cp "\$MDIR/moneyplex" "\$MDIR/moneyplex.patched" ${coreutils}/bin/chmod 0755 "\$MDIR/moneyplex.patched" fi - if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_BINUTILS/nix-support/dynamic-linker) ] || + if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_CC/nix-support/dynamic-linker) ] || [ ! \`${patchelf}/bin/patchelf --print-rpath \$MDIR/moneyplex.patched\` = "${libPath}" ]; then - ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched" + ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched" fi exec \$MDIR/moneyplex.patched diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 85deae9ec02..41dd8595c30 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec{ mkdir $out/bin for i in wps wpp et; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --force-rpath --set-rpath "$prefix/office6:$libPath" \ $prefix/office6/$i diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index 9ac4cc82039..edc5845e988 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script - dynlinker="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" + dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF #!${stdenv.shell} diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index e2c3e1fdc00..949b34420b7 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { fixupPhase = '' for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${libPath}" $out/$x; done ''; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 2ad991e00e3..db7e0c0c938 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv tcsh $sharedir/TPTP2X/tptp2X_install -default - patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X mkdir -p $out/bin ln -s $sharedir/TPTP2X/tptp2X $out/bin diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 3ee3f8b7dec..ada586fc4e6 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -10,7 +10,7 @@ let ] + ":${stdenv.cc.cc.lib}/lib64"; patchExe = x: '' - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; in diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 005c1c49609..6a49976c86b 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index e190d8fde7f..c4fd0c384c1 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { elif [ "$type" == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ldpath}" \ "$f" patchelf --shrink-rpath "$f" diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 89701991e58..1e23cfea27f 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index de6868698a7..f6e255ee46e 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$fullLibPath" bin/scilab-bin find . -name '*.so' -type f | while read file; do patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 74aefc26fc4..b0471b80e2f 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation { libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; in '' ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/aliza ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/aliza-vtkvol wrapProgram $out/bin/aliza \ diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index ce48dd6fce7..8ed8e0e73b0 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof do - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/lib" \ "$out/bin/$b" done diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index aab55608ba5..1b709b613bd 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index f35bf307fbe..79e5b309769 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -5,7 +5,7 @@ echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index f35bf307fbe..79e5b309769 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -5,7 +5,7 @@ echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index bad9be35753..c944fc3d68b 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index fc2758adff2..b5a85415c37 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index b45c99f6705..a38bc4254bb 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 9fb42d7b993..2e51ef9ed4c 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix index 8b97233c879..5ee0edb4b5e 100644 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 54cb8688590..3cf85961a9b 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix index 6a0023d756c..78bb8214257 100644 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix index 697e0cd3561..0151cca52b2 100644 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ b/pkgs/applications/taxes/aangifte-2014/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ $i done diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 0d410d230d4..c7f7a4b02e4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index ee2dd392bb7..416d5c0f0b0 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -27,7 +27,7 @@ libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file? for i in ${bin} ; do patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ ${i} done diff --git a/pkgs/build-support/binutils-wrapper/add-flags.sh b/pkgs/build-support/binutils-wrapper/add-flags.sh deleted file mode 100644 index a69e2313af3..00000000000 --- a/pkgs/build-support/binutils-wrapper/add-flags.sh +++ /dev/null @@ -1,40 +0,0 @@ -# See cc-wrapper for comments. -var_templates_list=( - NIX+IGNORE_LD_THROUGH_GCC - NIX+LDFLAGS - NIX+LDFLAGS_BEFORE - NIX+LDFLAGS_AFTER - NIX+LDFLAGS_HARDEN -) -var_templates_bool=( - NIX+SET_BUILD_ID - NIX+DONT_SET_RPATH -) - -declare -a role_infixes=() -if [ "${NIX_BINUTILS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then - role_infixes+=(_BUILD_) -fi -if [ "${NIX_BINUTILS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then - role_infixes+=(_) -fi -if [ "${NIX_BINUTILS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then - role_infixes+=(_TARGET_) -fi - -for var in "${var_templates_list[@]}"; do - mangleVarList "$var" "${role_infixes[@]}" -done -for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" "${role_infixes[@]}" -done - -if [ -e @out@/nix-support/libc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" -fi - -if [ -e @out@/nix-support/libc-ldflags-before ]; then - NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" -fi - -export NIX_BINUTILS_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/binutils-wrapper/add-hardening.sh b/pkgs/build-support/binutils-wrapper/add-hardening.sh deleted file mode 100644 index 6dabc2007bc..00000000000 --- a/pkgs/build-support/binutils-wrapper/add-hardening.sh +++ /dev/null @@ -1,53 +0,0 @@ -hardeningFlags=(relro bindnow) -# Intentionally word-split in case 'hardeningEnable' is defined in -# Nix. Also, our bootstrap tools version of bash is old enough that -# undefined arrays trip `set -u`. -if [[ -v hardeningEnable[@] ]]; then - hardeningFlags+=(${hardeningEnable[@]}) -fi -hardeningLDFlags=() - -declare -A hardeningDisableMap - -# Intentionally word-split in case 'hardeningDisable' is defined in Nix. -for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ -do - hardeningDisableMap[$flag]=1 -done - -if [[ -n "${NIX_DEBUG:-}" ]]; then - printf 'HARDENING: disabled flags:' >&2 - (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 - echo >&2 -fi - -if [[ -z "${hardeningDisableMap[all]:-}" ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then - echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; - fi - for flag in "${hardeningFlags[@]}" - do - if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then - case $flag in - pie) - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningLDFlags+=('-pie') - fi - ;; - relro) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi - hardeningLDFlags+=('-z' 'relro') - ;; - bindnow) - if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi - hardeningLDFlags+=('-z' 'now') - ;; - *) - # Ignore unsupported. Checked in Nix that at least *some* - # tool supports each flag. - ;; - esac - fi - done -fi diff --git a/pkgs/build-support/binutils-wrapper/default.nix b/pkgs/build-support/binutils-wrapper/default.nix deleted file mode 100644 index 7e255cdb2eb..00000000000 --- a/pkgs/build-support/binutils-wrapper/default.nix +++ /dev/null @@ -1,288 +0,0 @@ -# The Nixpkgs CC is not directly usable, since it doesn't know where -# the C library and standard header files are. Therefore the compiler -# produced by that package cannot be installed directly in a user -# environment and used from the command line. So we use a wrapper -# script that sets up the right environment variables so that the -# compiler and the linker just "work". - -{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, binutils ? null, libc ? null -, coreutils ? null, shell ? stdenv.shell, gnugrep ? null -, extraPackages ? [], extraBuildCommands ? "" -, buildPackages ? {} -, useMacosReexportHack ? false -}: - -with stdenv.lib; - -assert nativeTools -> nativePrefix != ""; -assert !nativeTools -> - binutils != null && coreutils != null && gnugrep != null; -assert !(nativeLibc && noLibc); -assert (noLibc || nativeLibc) == (libc == null); - -let - inherit (stdenv) hostPlatform targetPlatform; - - # Prefix for binaries. Customarily ends with a dash separator. - # - # TODO(@Ericson2314) Make unconditional, or optional but always true by - # default. - prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) - (targetPlatform.config + "-"); - - binutilsVersion = (builtins.parseDrvName binutils.name).version; - binutilsName = (builtins.parseDrvName binutils.name).name; - - libc_bin = if libc == null then null else getBin libc; - libc_dev = if libc == null then null else getDev libc; - libc_lib = if libc == null then null else getLib libc; - binutils_bin = if nativeTools then "" else getBin binutils; - # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else getBin coreutils; - - dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; - - # See description in cc-wrapper. - infixSalt = dashlessTarget; - - # The dynamic linker has different names on different platforms. This is a - # shell glob that ought to match it. - dynamicLinker = - /**/ if libc == null then null - else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" - else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" - # ARM with a wildcard, which can be "" or "-armhf". - else if targetPlatform.isArm then "${libc_lib}/lib/ld-linux*.so.3" - else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" - else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" - else if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" - else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" - else null; - - expand-response-params = - if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" - then import ../expand-response-params { inherit (buildPackages) stdenv; } - else ""; - -in - -stdenv.mkDerivation { - name = prefix - + (if name != "" then name else "${binutilsName}-wrapper") - + (stdenv.lib.optionalString (binutils != null && binutilsVersion != "") "-${binutilsVersion}"); - - preferLocalBuild = true; - - inherit binutils_bin shell libc_bin libc_dev libc_lib coreutils_bin; - gnugrep_bin = if nativeTools then "" else gnugrep; - - binPrefix = prefix; - inherit infixSalt; - - outputs = [ "out" "man" ]; - - passthru = { - inherit binutils libc nativeTools nativeLibc nativePrefix prefix; - - emacsBufferSetup = pkgs: '' - ; We should handle propagation here too - (mapc - (lambda (arg) - (when (file-directory-p (concat arg "/lib")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) - (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) - '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) - ''; - }; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - src=$PWD - ''; - - installPhase = - '' - set -u - - mkdir -p $out/bin $out/nix-support $man/nix-support - - wrap() { - local dst="$1" - local wrapper="$2" - export prog="$3" - set +u - substituteAll "$wrapper" "$out/bin/$dst" - set -u - chmod +x "$out/bin/$dst" - } - '' - - + (if nativeTools then '' - echo ${nativePrefix} > $out/nix-support/orig-binutils - - ldPath="${nativePrefix}/bin" - '' else '' - echo $binutils_bin > $out/nix-support/orig-binutils - - ldPath="${binutils_bin}/bin" - '' - - + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' - # Solaris needs an additional ld wrapper. - ldPath="${nativePrefix}/bin" - exec="$ldPath/${prefix}ld" - wrap ld-solaris ${./ld-solaris-wrapper.sh} - '') - - + '' - # Create a symlink to as (the assembler). - if [ -e $ldPath/${prefix}as ]; then - ln -s $ldPath/${prefix}as $out/bin/${prefix}as - fi - - '' + (if !useMacosReexportHack then '' - wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} - '' else '' - ldInner="${prefix}ld-reexport-delegate" - wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} - wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" - unset ldInner - '') + '' - - if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then - wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold - fi - - if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd - fi - - set +u - ''; - - propagatedBuildInputs = extraPackages; - - setupHook = ./setup-hook.sh; - - postFixup = - '' - set -u - '' - - + optionalString (libc != null) ('' - ## - ## General libc support - ## - - echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags - - echo "${libc_lib}" > $out/nix-support/orig-libc - echo "${libc_dev}" > $out/nix-support/orig-libc-dev - - ## - ## Dynamic linker support - ## - - if [[ -z ''${dynamicLinker+x} ]]; then - echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 - local dynamicLinker="${libc_lib}/lib/ld*.so.?" - fi - - # Expand globs to fill array of options - dynamicLinker=($dynamicLinker) - - case ''${#dynamicLinker[@]} in - 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; - 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; - *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; - esac - - if [ -n "$dynamicLinker" ]; then - echo $dynamicLinker > $out/nix-support/dynamic-linker - - '' + (if targetPlatform.isDarwin then '' - printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else '' - if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then - echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 - fi - - local ldflagsBefore=(-dynamic-linker "$dynamicLinker") - '') + '' - fi - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to ld - # (the *last* value counts, so ours should come first). - printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before - '') - - + optionalString (!nativeTools) '' - - ## - ## User env support - ## - - # Propagate the underling unwrapped binutils so that if you - # install the wrapper, you get tools like objdump, the manpages, - # etc. as well (same for any binaries of libc). - printWords ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages - '' - - + '' - - ## - ## Hardening support - ## - - # some linkers on some platforms don't support specific -z flags - export hardening_unsupported_flags="" - if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" bindnow" - fi - if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then - hardening_unsupported_flags+=" relro" - fi - '' - - + optionalString hostPlatform.isCygwin '' - hardening_unsupported_flags+=" pic" - '' - - + '' - set +u - substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh - - ## - ## Extra custom steps - ## - - '' - + extraBuildCommands; - - inherit dynamicLinker expand-response-params; - - # for substitution in utils.sh - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; - - crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - }; - - meta = - let binutils_ = if binutils != null then binutils else {}; in - (if binutils_ ? meta then removeAttrs binutils.meta ["priority"] else {}) // - { description = - stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" binutils_ - + " (wrapper script)"; - } // optionalAttrs useMacosReexportHack { - platforms = stdenv.lib.platforms.darwin; - }; -} diff --git a/pkgs/build-support/binutils-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/binutils-wrapper/ld-solaris-wrapper.sh deleted file mode 100644 index 72c999ff8bc..00000000000 --- a/pkgs/build-support/binutils-wrapper/ld-solaris-wrapper.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!@shell@ -set -eu -o pipefail -shopt -s nullglob - -declare -a args=("$@") -# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( -# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 -# but still no success. -declare -a argsBefore=(-z ignore) argsAfter=() - -# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. -# GNU binutils does not have this problem: -# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter -while (( $# )); do - case "${args[$i]}" in - -L) argsBefore+=("$1" "$2"); shift ;; - -L?*) argsBefore+=("$1") ;; - *) argsAfter+=("$1") ;; - esac - shift -done - -# Trace: -set -x -exec "@ld@" "${argsBefore[@]}" "${argsAfter[@]}" diff --git a/pkgs/build-support/binutils-wrapper/ld-wrapper.sh b/pkgs/build-support/binutils-wrapper/ld-wrapper.sh deleted file mode 100644 index dd30c4d55ef..00000000000 --- a/pkgs/build-support/binutils-wrapper/ld-wrapper.sh +++ /dev/null @@ -1,189 +0,0 @@ -#! @shell@ -set -eu -o pipefail -shopt -s nullglob - -path_backup="$PATH" - -# phase separation makes this look useless -# shellcheck disable=SC2157 -if [ -n "@coreutils_bin@" ]; then - PATH="@coreutils_bin@/bin" -fi - -source @out@/nix-support/utils.sh - -if [ -z "${NIX_BINUTILS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then - source @out@/nix-support/add-flags.sh -fi - - -# Optionally filter out paths not refering to the store. -expandResponseParams "$@" -if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" - && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then - rest=() - nParams=${#params[@]} - declare -i n=0 - while (( "$n" < "$nParams" )); do - p=${params[n]} - p2=${params[n+1]:-} # handle `p` being last one - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then - skip "${p:2}" - elif [ "$p" = -L ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "$p" = -rpath ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then - n+=1; skip "$p2" - elif [ "${p:0:1}" = / ] && badPath "$p"; then - # We cannot skip this; barf. - echo "impure path \`$p' used in link" >&2 - exit 1 - elif [ "${p:0:9}" = --sysroot ]; then - # Our ld is not built with sysroot support (Can we fix that?) - : - else - rest+=("$p") - fi - n+=1 - done - # Old bash empty array hack - params=(${rest+"${rest[@]}"}) -fi - -source @out@/nix-support/add-hardening.sh - -extraAfter=("${hardeningLDFlags[@]}") -extraBefore=() - -if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then - extraAfter+=($NIX_@infixSalt@_LDFLAGS) - extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) -fi - -extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) - -# Choose 32-bit dynamic linker if needed -if [ -e @out@/nix-support/dynamic-linker-m32 ]; then - prev= - for p in ${params+"${params[@]}"}; do - if [[ "$prev" = "-m" && "$p" = "elf_i386" ]]; then - extraAfter+=( - '-dynamic-linker' - "$(< @out@/nix-support/dynamic-linker-m32)" - ) - break - fi - prev="$p" - done -fi - -declare -a libDirs -declare -A libs -relocatable= - -# Find all -L... switches for rpath, and relocatable flags for build id. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then - prev= - # Old bash thinks empty arrays are undefined, ugh. - for p in \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} - do - case "$prev" in - -L) - libDirs+=("$p") - ;; - -l) - libs["lib${p}.so"]=1 - ;; - -dynamic-linker | -plugin) - # Ignore this argument, or it will match *.so and be added to rpath. - ;; - *) - case "$p" in - -L/*) - libDirs+=("${p:2}") - ;; - -l?*) - libs["lib${p:2}.so"]=1 - ;; - "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) - # This is a direct reference to a shared library. - libDirs+=("${p%/*}") - libs["${p##*/}"]=1 - ;; - -r | --relocatable | -i) - relocatable=1 - esac - ;; - esac - prev="$p" - done -fi - - -# Add all used dynamic libraries to the rpath. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then - # For each directory in the library search path (-L...), - # see if it contains a dynamic library used by a -l... flag. If - # so, add the directory to the rpath. - # It's important to add the rpath in the order of -L..., so - # the link time chosen objects will be those of runtime linking. - declare -A rpaths - for dir in ${libDirs+"${libDirs[@]}"}; do - if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then - dir="$dir2" - fi - if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - continue - fi - for path in "$dir"/*; do - file="${path##*/}" - if [ "${libs[$file]:-}" ]; then - # This library may have been provided by a previous directory, - # but if that library file is inside an output of the current - # derivation, it can be deleted after this compilation and - # should be found in a later directory, so we add all - # directories that contain any of the libraries to rpath. - rpaths["$dir"]=1 - extraAfter+=(-rpath "$dir") - break - fi - done - done - - if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then - extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) - fi -fi - - -# Only add --build-id if this is a final link. FIXME: should build gcc -# with --enable-linker-build-id instead? -if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then - extraAfter+=(--build-id) -fi - - -# Optionally print debug info. -if [ -n "${NIX_DEBUG:-}" ]; then - # Old bash workaround, see above. - echo "extra flags before to @prog@:" >&2 - printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 - echo "original flags to @prog@:" >&2 - printf " %q\n" ${params+"${params[@]}"} >&2 - echo "extra flags after to @prog@:" >&2 - printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 -fi - -PATH="$path_backup" -# Old bash workaround, see above. -exec @prog@ \ - ${extraBefore+"${extraBefore[@]}"} \ - ${params+"${params[@]}"} \ - ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/binutils-wrapper/setup-hook.sh b/pkgs/build-support/binutils-wrapper/setup-hook.sh deleted file mode 100644 index 3395ddd3391..00000000000 --- a/pkgs/build-support/binutils-wrapper/setup-hook.sh +++ /dev/null @@ -1,63 +0,0 @@ -# Binutils Wrapper hygiene -# -# See comments in cc-wrapper's setup hook. This works exactly the same way. - -binutilsWrapper_addLDVars () { - case $depOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "binutils-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; - return 1 ;; - esac - - if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib64" - fi - - if [[ -d "$1/lib" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib" - fi -} - -if [ -n "${crossConfig:-}" ]; then - export NIX_BINUTILS_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role="BUILD_" -else - export NIX_BINUTILS_WRAPPER_@infixSalt@_TARGET_HOST=1 - role="" -fi - -envHooks+=(binutilsWrapper_addLDVars) - -# shellcheck disable=SC2157 -if [ -n "@binutils_bin@" ]; then - addToSearchPath _PATH @binutils_bin@/bin -fi - -# shellcheck disable=SC2157 -if [ -n "@libc_bin@" ]; then - addToSearchPath _PATH @libc_bin@/bin -fi - -# shellcheck disable=SC2157 -if [ -n "@coreutils_bin@" ]; then - addToSearchPath _PATH @coreutils_bin@/bin -fi - -# Export tool environment variables so various build systems use the right ones. - -export NIX_${role}BINUTILS=@out@ - -for CMD in \ - ar as nm objcopy ranlib strip strings size ld windres -do - if - PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null - then - export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; - fi -done - -# No local scope in sourced file -unset role diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index fb6e38302a5..39633fce69a 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -4,14 +4,19 @@ # that case, it is cheaper/better to not repeat this step and let the forked # wrapped binary just inherit the work of the forker's wrapper script. -var_templates_list=( +var_templates=( NIX+CFLAGS_COMPILE NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK NIX+GNATFLAGS_COMPILE -) -var_templates_bool=( + NIX+IGNORE_LD_THROUGH_GCC + NIX+LDFLAGS + NIX+LDFLAGS_BEFORE + NIX+LDFLAGS_AFTER + + NIX+SET_BUILD_ID + NIX+DONT_SET_RPATH NIX+ENFORCE_NO_NATIVE ) @@ -30,11 +35,17 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. -for var in "${var_templates_list[@]}"; do - mangleVarList "$var" "${role_infixes[@]}" -done -for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" "${role_infixes[@]}" +for var in "${var_templates[@]}"; do + outputVar="${var/+/_@infixSalt@_}" + export ${outputVar}+='' + # For each role we serve, we accumulate the input parameters into our own + # cc-wrapper-derivation-specific environment variables. + for infix in "${role_infixes[@]}"; do + inputVar="${var/+/${infix}}" + if [ -v "$inputVar" ]; then + export ${outputVar}+="${!outputVar:+ }${!inputVar}" + fi + done done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. @@ -55,13 +66,17 @@ if [ -e @out@/nix-support/gnat-cflags ]; then NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" fi +if [ -e @out@/nix-support/libc-ldflags ]; then + NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" +fi + if [ -e @out@/nix-support/cc-ldflags ]; then - # We don't import this above, but just tack this on know. binutils-wrapper's - # add-flags will not clobber it. - # - # TODO(@Ericson2314): Consider `NIX_@infixSalt@_CFLAGS_LINK` instead NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi +if [ -e @out@/nix-support/libc-ldflags-before ]; then + NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" +fi + # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 3983e866ee1..34358e04194 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -6,6 +6,7 @@ if [[ -v hardeningEnable[@] ]]; then hardeningFlags+=(${hardeningEnable[@]}) fi hardeningCFlags=() +hardeningLDFlags=() declare -A hardeningDisableMap @@ -43,6 +44,7 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningCFlags+=('-pie') + hardeningLDFlags+=('-pie') fi ;; pic) @@ -57,6 +59,14 @@ if [[ -z "${hardeningDisableMap[all]:-}" ]]; then if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling format >&2; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; + relro) + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling relro >&2; fi + hardeningLDFlags+=('-z' 'relro') + ;; + bindnow) + if [[ -n "${NIX_DEBUG:-}" ]]; then echo HARDENING: enabling bindnow >&2; fi + hardeningLDFlags+=('-z' 'now') + ;; *) # Ignore unsupported. Checked in Nix that at least *some* # tool supports each flag. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 524e5309847..aacaf196f31 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -11,18 +11,12 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi -source @out@/nix-support/utils.sh - -# Flirting with a layer violation here. -if [ -z "${NIX_BINUTILS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then - source @binutils@/nix-support/add-flags.sh -fi - -# Put this one second so libc ldflags take priority. if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +source @out@/nix-support/utils.sh + # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -63,6 +57,10 @@ while (( "$n" < "$nParams" )); do cppInclude=0 elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 + elif [ "$p" = -m32 ]; then + if [ -e @out@/nix-support/dynamic-linker-m32 ]; then + NIX_@infixSalt@_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" + fi fi n+=1 done diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 30520290086..0114170b8eb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,20 +6,23 @@ # compiler and the linker just "work". { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils, coreutils ? null, shell ? stdenv.shell +, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} +, useMacosReexportHack ? false }: with stdenv.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> - cc != null && coreutils != null && gnugrep != null; + cc != null && binutils != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); +assert stdenv.targetPlatform != stdenv.hostPlatform -> runCommand != null; + # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. assert cc.langVhdl or false -> zlib != null; @@ -40,6 +43,7 @@ let libc_dev = if libc == null then null else getDev libc; libc_lib = if libc == null then null else getLib libc; cc_solib = getLib cc; + binutils_bin = if nativeTools then "" else getBin binutils; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; @@ -55,6 +59,21 @@ let # unstable implementation detail, however. infixSalt = dashlessTarget; + # The dynamic linker has different names on different platforms. This is a + # shell glob that ought to match it. + dynamicLinker = + /**/ if libc == null then null + else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" + else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" + # ARM with a wildcard, which can be "" or "-armhf". + else if targetPlatform.isArm then "${libc_lib}/lib/ld-linux*.so.3" + else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" + else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" + else if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" + else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else null; + expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } @@ -69,7 +88,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc shell libc_bin libc_dev libc_lib binutils coreutils_bin; + inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; binPrefix = prefix; @@ -83,11 +102,13 @@ stdenv.mkDerivation { emacsBufferSetup = pkgs: '' ; We should handle propagation here too - (mapc - (lambda (arg) - (when (file-directory-p (concat arg "/include")) - (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include")))) - '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/include")) + (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include"))) + (when (file-directory-p (concat arg "/lib")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) + (when (file-directory-p (concat arg "/lib64")) + (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; @@ -117,18 +138,45 @@ stdenv.mkDerivation { echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin" + ldPath="${nativePrefix}/bin" '' else '' echo $cc > $out/nix-support/orig-cc ccPath="${cc}/bin" + ldPath="${binutils_bin}/bin" + '' + + + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' + # Solaris needs an additional ld wrapper. + ldPath="${nativePrefix}/bin" + exec="$ldPath/${prefix}ld" + wrap ld-solaris ${./ld-solaris-wrapper.sh} '') + '' - # Create symlinks to everything in the binutils wrapper. - for bbin in $binutils/bin/*; do - mkdir -p "$out/bin" - ln -s "$bbin" "$out/bin/$(basename $bbin)" - done + # Create a symlink to as (the assembler). This is useful when a + # cc-wrapper is installed in a user environment, as it ensures that + # the right assembler is called. + if [ -e $ldPath/${prefix}as ]; then + ln -s $ldPath/${prefix}as $out/bin/${prefix}as + fi + + '' + (if !useMacosReexportHack then '' + wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} + '' else '' + ldInner="${prefix}ld-reexport-delegate" + wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} + wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner" + unset ldInner + '') + '' + + if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then + wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold + fi + + if [ -e ${binutils_bin}/bin/ld.bfd ]; then + wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd + fi # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler @@ -188,7 +236,7 @@ stdenv.mkDerivation { ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl ''; - propagatedBuildInputs = [ binutils ] ++ extraPackages; + propagatedBuildInputs = extraPackages; setupHook = ./setup-hook.sh; @@ -197,7 +245,7 @@ stdenv.mkDerivation { set -u '' - + optionalString (libc != null) '' + + optionalString (libc != null) ('' ## ## General libc support ## @@ -215,9 +263,48 @@ stdenv.mkDerivation { # another -idirafter is necessary to add that directory again. echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev - '' + + ## + ## Dynamic linker support + ## + + if [[ -z ''${dynamicLinker+x} ]]; then + echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2 + local dynamicLinker="${libc_lib}/lib/ld*.so.?" + fi + + # Expand globs to fill array of options + dynamicLinker=($dynamicLinker) + + case ''${#dynamicLinker[@]} in + 0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;; + 1) echo "Using dynamic linker: '$dynamicLinker'" >&2;; + *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;; + esac + + if [ -n "$dynamicLinker" ]; then + echo $dynamicLinker > $out/nix-support/dynamic-linker + + '' + (if targetPlatform.isDarwin then '' + printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook + '' else '' + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + local ldflagsBefore=(-dynamic-linker "$dynamicLinker") + '') + '' + fi + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before + '') + optionalString (!nativeTools) '' @@ -258,6 +345,7 @@ stdenv.mkDerivation { # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). + printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages '' @@ -267,7 +355,14 @@ stdenv.mkDerivation { ## Hardening support ## + # some linkers on some platforms don't support specific -z flags export hardening_unsupported_flags="" + if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" bindnow" + fi + if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + hardening_unsupported_flags+=" relro" + fi '' + optionalString hostPlatform.isCygwin '' @@ -286,7 +381,7 @@ stdenv.mkDerivation { '' + extraBuildCommands; - inherit expand-response-params; + inherit dynamicLinker expand-response-params; # for substitution in utils.sh expandResponseParams = "${expand-response-params}/bin/expand-response-params"; @@ -301,5 +396,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; + } // optionalAttrs useMacosReexportHack { + platforms = stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 63e5d99d501..f0c922a3d5b 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -13,12 +13,12 @@ if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -source @out@/nix-support/utils.sh - if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi +source @out@/nix-support/utils.sh + # Figure out if linker flags should be passed. GCC prints annoying # warnings when they are not needed. diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh new file mode 100755 index 00000000000..72c999ff8bc --- /dev/null +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -0,0 +1,25 @@ +#!@shell@ +set -eu -o pipefail +shopt -s nullglob + +declare -a args=("$@") +# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( +# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 +# but still no success. +declare -a argsBefore=(-z ignore) argsAfter=() + +# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. +# GNU binutils does not have this problem: +# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter +while (( $# )); do + case "${args[$i]}" in + -L) argsBefore+=("$1" "$2"); shift ;; + -L?*) argsBefore+=("$1") ;; + *) argsAfter+=("$1") ;; + esac + shift +done + +# Trace: +set -x +exec "@ld@" "${argsBefore[@]}" "${argsAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh new file mode 100644 index 00000000000..a9cc1e3f9e6 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -0,0 +1,174 @@ +#! @shell@ +set -eu -o pipefail +shopt -s nullglob + +path_backup="$PATH" + +# phase separation makes this look useless +# shellcheck disable=SC2157 +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Optionally filter out paths not refering to the store. +expandResponseParams "$@" +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" + && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then + rest=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -L ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -rpath ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:1}" = / ] && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + elif [ "${p:0:9}" = --sysroot ]; then + # Our ld is not built with sysroot support (Can we fix that?) + : + else + rest+=("$p") + fi + n+=1 + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + +source @out@/nix-support/add-hardening.sh + +extraAfter=("${hardeningLDFlags[@]}") +extraBefore=() + +if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then + extraAfter+=($NIX_@infixSalt@_LDFLAGS) + extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) +fi + +extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) + +declare -a libDirs +declare -A libs +relocatable= + +# Find all -L... switches for rpath, and relocatable flags for build id. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ]; then + prev= + # Old bash thinks empty arrays are undefined, ugh. + for p in \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} + do + case "$prev" in + -L) + libDirs+=("$p") + ;; + -l) + libs["lib${p}.so"]=1 + ;; + -dynamic-linker | -plugin) + # Ignore this argument, or it will match *.so and be added to rpath. + ;; + *) + case "$p" in + -L/*) + libDirs+=("${p:2}") + ;; + -l?*) + libs["lib${p:2}.so"]=1 + ;; + "${NIX_STORE:-}"/*.so | "${NIX_STORE:-}"/*.so.*) + # This is a direct reference to a shared library. + libDirs+=("${p%/*}") + libs["${p##*/}"]=1 + ;; + -r | --relocatable | -i) + relocatable=1 + esac + ;; + esac + prev="$p" + done +fi + + +# Add all used dynamic libraries to the rpath. +if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then + # For each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + # It's important to add the rpath in the order of -L..., so + # the link time chosen objects will be those of runtime linking. + declare -A rpaths + for dir in ${libDirs+"${libDirs[@]}"}; do + if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then + dir="$dir2" + fi + if [ -n "${rpaths[$dir]:-}" ] || [[ "$dir" != "${NIX_STORE:-}"/* ]]; then + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + continue + fi + for path in "$dir"/*; do + file="${path##*/}" + if [ "${libs[$file]:-}" ]; then + # This library may have been provided by a previous directory, + # but if that library file is inside an output of the current + # derivation, it can be deleted after this compilation and + # should be found in a later directory, so we add all + # directories that contain any of the libraries to rpath. + rpaths["$dir"]=1 + extraAfter+=(-rpath "$dir") + break + fi + done + done + + if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then + extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) + fi +fi + + +# Only add --build-id if this is a final link. FIXME: should build gcc +# with --enable-linker-build-id instead? +if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && [ ! "$relocatable" ]; then + extraAfter+=(--build-id) +fi + + +# Optionally print debug info. +if [ -n "${NIX_DEBUG:-}" ]; then + # Old bash workaround, see above. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash new file mode 100644 index 00000000000..b7aa7ea5c09 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -0,0 +1,106 @@ +#! @shell@ + +set -eu -o pipefail + +path_backup="$PATH" +if [ -n "@coreutils_bin@" ]; then + PATH="@coreutils_bin@/bin" +fi + +declare -r recurThreshold=300 + +declare overflowCount=0 +for ((n=0; n < $#; ++n)); do + case "${!n}" in + -l*) let overflowCount+=1 ;; + -reexport-l*) let overflowCount+=1 ;; + *) ;; + esac +done + +declare -a allArgs=() + +if (( "$overflowCount" <= "$recurThreshold" )); then + allArgs=("$@") +else + declare -a childrenLookup=() childrenLink=() + + while (( $# )); do + case "$1" in + -L/*) + childrenLookup+=("$1") + allArgs+=("$1") + ;; + -L) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -l) + echo "cctools LD does not support '-L foo' or '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -lazy_framework | -lto_library) + # We aren't linking any "azy_library", "to_library", etc. + allArgs+=("$1") + ;; + -lazy-l | -weak-l) allArgs+=("$1") ;; + # We can't so easily prevent header issues from these. + -lSystem) allArgs+=("$1") ;; + # Special case as indirection seems like a bad idea for something + # so fundamental. Can be removed for simplicity. + -l?* | -reexport-l?*) childrenLink+=("$1") ;; + *) allArgs+=("$1") ;; + esac + + shift + done + + declare n=0 + while (( $n < "${#childrenLink[@]}" )); do + if [[ "${childrenLink[n]}" = -l* ]]; then + childrenLink[n]="-reexport${childrenLink[n]}" + fi + let ++n + done + unset n + + declare -r outputNameLibless=$(basename $( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + elif [[ "${outputName:0:3}" = lib ]]; then + echo "${outputName:3}" + else + echo "${outputName}" + fi)) + declare -ra children=("$outputNameLibless-reexport-delegate-0" \ + "$outputNameLibless-reexport-delegate-1") + + mkdir -p "$out/lib" + + PATH="$PATH:@out@/bin" + + symbolBloatObject=$outputNameLibless-symbol-hack.o + if [[ ! -e $symbolBloatObject ]]; then + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ + | @binPrefix@as -- -o $symbolBloatObject + fi + + # first half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" + + # second half of libs + @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "${childrenLookup[@]}" "$symbolBloatObject" \ + "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" + + allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +fi + +PATH="$path_backup" +exec @prog@ "${allArgs[@]}" diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 9273f50c667..e43c1609edb 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -74,6 +74,14 @@ ccWrapper_addCVars () { export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi + if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib64" + fi + + if [[ -d "$1/lib" ]]; then + export NIX_${role}LDFLAGS+=" -L$1/lib" + fi + if [[ -d "$1/Library/Frameworks" ]]; then export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi @@ -108,6 +116,11 @@ if [ -n "@cc@" ]; then addToSearchPath _PATH @cc@/bin fi +# shellcheck disable=SC2157 +if [ -n "@binutils_bin@" ]; then + addToSearchPath _PATH @binutils_bin@/bin +fi + # shellcheck disable=SC2157 if [ -n "@libc_bin@" ]; then addToSearchPath _PATH @libc_bin@/bin @@ -125,5 +138,15 @@ export NIX_${role}CC=@out@ export ${role}CC=@named_cc@ export ${role}CXX=@named_cxx@ +for CMD in \ + ar as nm objcopy ranlib strip strings size ld windres +do + if + PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null + then + export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + fi +done + # No local scope in sourced file unset role diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index a9ab2b23f24..c84a094e26b 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -1,35 +1,3 @@ -mangleVarList() { - local var="$1" - shift - local -a role_infixes=("$@") - - local outputVar="${var/+/_@infixSalt@_}" - declare -gx ${outputVar}+='' - # For each role we serve, we accumulate the input parameters into our own - # cc-wrapper-derivation-specific environment variables. - for infix in "${role_infixes[@]}"; do - local inputVar="${var/+/${infix}}" - if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" - fi - done -} - -mangleVarBool() { - local var="$1" - shift - local -a role_infixes=("$@") - - local outputVar="${var/+/_@infixSalt@_}" - declare -gxi ${outputVar}+='' - for infix in "${role_infixes[@]}"; do - local inputVar="${var/+/${infix}}" - if [ -v "$inputVar" ]; then - let "${outputVar} |= ${!inputVar}" - fi - done -} - skip () { if [ -n "${NIX_DEBUG:-}" ]; then echo "skipping impure path $1" >&2 diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 5797d6566a8..891d644071c 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { while IFS= read -r -d ''$'\0' i; do if isELF "$i"; then - bin=`patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$i"; echo $?` + bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?` patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i" if [ "$bin" -eq 0 ]; then wrapProgram "$i" \ diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 79f65c18114..fdb9d1be6ad 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { cp ${teensyduino_src} ./TeensyduinoInstall.${teensy_architecture} chmod +w ./TeensyduinoInstall.${teensy_architecture} upx -d ./TeensyduinoInstall.${teensy_architecture} - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ ./TeensyduinoInstall.${teensy_architecture} chmod +x ./TeensyduinoInstall.${teensy_architecture} @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { preFixup = '' for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$file" || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib $file || true done @@ -203,7 +203,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString withTeensyduino '' # Patch the Teensy loader binary patchelf --debug \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ $out/share/arduino/hardware/tools/teensy ''} diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 4086e8d4dd6..2833c5378c1 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out tar -C $out -xjf ${dist} - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/lisp ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b17363516fd..62a504ef966 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { --suffix DYLD_LIBRARY_PATH : $libPath '' else '' - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ crystal-${version}-1/embedded/bin/crystal patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \ crystal-${version}-1/embedded/bin/crystal diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f65fd4711ae..0b219b80447 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -49,7 +49,7 @@ let echo "patching $i..." if [[ ! $i =~ \.so ]]; then patchelf \ - --set-interpreter "''$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $i + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i fi rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 patchelf --set-rpath $rpath2 --force-rpath $i diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 443f674cf1d..ee56425f00b 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -25,7 +25,7 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_BINUTILS/nix-support/libc-ldflags) $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before || true)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 5d03573dbab..60749a29b58 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 10aa63ed4e3..6140cde4a9e 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 43775a343c1..100bb87768b 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1cb2d390431..a209e392bc6 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { cp -R * $out set +e for a in $out/bin/* ; do - patchelf --interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a done set -e diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 2080aa64149..79b0c9ff898 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev or binutils.binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index b88cd232415..c5503da9b83 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index ce35a71272b..81aaa7cd65c 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ce366cb4973..a3f652d783b 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 98d5a0edffe..654e1ce0023 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index c116164f503..4978570334e 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 2922cef7e7a..74905c6ffae 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -18,7 +18,7 @@ let tar --strip-components=1 -xjf "$src" -C "$out" # Patch binaries - interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" + interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do # Skip non-executable files case "$file" in diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 70eac4e83b3..1036e43ea94 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils.binutils.dev}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 4857af08757..ebe562fcde3 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { tar xvf $src -C $out --strip-components=1 for exe in $out/bin/{ozemulator,ozwish} ; do - patchelf --set-interpreter $(< $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $libPath \ $exe done diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 009f36f57f5..8382be7a209 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { mkdir -p "$out" tar --strip-components=1 -xjf "$src" -C "$out" - interpreter="$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" + interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 2cee0adc7d0..459bfce5098 100644 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh @@ -5,7 +5,7 @@ unzip ${src} || true # set the dynamic linker of unpack200, necessary for construct script echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 +patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 echo "constructing JDK and JRE installations" if test -z "$installjdk"; then @@ -46,7 +46,7 @@ rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index ca954f53ab1..2a00cf5f2d2 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -179,7 +179,7 @@ let result = stdenv.mkDerivation rec { # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index cd20fb4afde..37b06555bdb 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -42,17 +42,17 @@ rec { ${optionalString (needsPatchelf && bootstrapping) '' patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" ''} ${optionalString needsPatchelf '' patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc @@ -88,7 +88,7 @@ rec { ${optionalString needsPatchelf '' patchelf \ --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" ''} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 1cddcd6bc5b..707f7966dd9 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $out/share/sbcl/sbcl + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 89e77769f5a..094007aa2d0 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { echo ${version} > VERSION configureFlagsArray+=("--cc=cc") - configureFlagsArray+=("--elfinterp=$(< $NIX_BINUTILS/nix-support/dynamic-linker)") + configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 72ee89dc350..f7638757ff7 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { # set all the dynamic linkers find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index bb800bb62a9..3d19f7ba291 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $out/bin/dart ''; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 5af1fd62256..8a13c4efce6 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' cp ${r3} make/r3-make chmod 777 make/r3-make - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" ./make/r3-make + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make cd make perl -pi -e 's#-m32##g' makefile perl -pi -e 's#sudo .*#echo#g' makefile diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix index 4f4040ce5ed..abe0538b8a9 100644 --- a/pkgs/development/libraries/libstdc++5/default.nix +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -62,10 +62,7 @@ stdenv.mkDerivation rec { # being generated to make sure that they use our glibc. EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir" - extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags)" - extraLDFlags+=" $(cat $NIX_BINUTILS/nix-support/libc-ldflags-before)" - + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" for i in $extraLDFlags; do EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" done diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 9119e4beb4f..d0085752623 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { done for exe in $out/bin/sqlplus; do - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ $exe done diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index ed9c052cf09..86f2719537c 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -22,6 +22,6 @@ for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" {} \; + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; find $out -type f -perm -0100 \ -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 5486230541f..fc2981f7f1f 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { } # Create wrappers - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/bin/clinfo + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo # Fix modes diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index f9cd6bc3c40..0c1bb5d4d42 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux ln -s swt32.jar x10flasher_lib/swtlin/swt.jar diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index c957f4151a0..745111171bb 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fixupPhase = '' patchInterpreter() { - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/libexec/genymotion/$1" } diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 7a4e326ee8a..74884e6f5a8 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -31,7 +31,7 @@ let fixupPhase patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ $out/lib/electron/electron diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 5a20a2ac167..86be86cb6d6 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { cp -r * "$out" # Patch it - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/Logic" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" # Build the LD_PRELOAD library that makes Logic work from a read-only directory diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 373032686ae..5028ac9580c 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 5205d534ab8..8e2953839b7 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -36,8 +36,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/nwjs cp -R * $out/share/nwjs - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/nwjs/nw - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/nwjs/nwjc + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 803f55f8134..ba5d6c8e334 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nw - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0 diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 9daa93ca3bb..8b6b655b6a5 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 4f06c3ad63d..3caec9a75c1 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchPhase = stdenv.lib.optionalString stdenv.isLinux '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ bin/sc ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a59c8153caf..91a01edc23a 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/libexec/thrust unzip -d $out/libexec/thrust/ $src - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/libexec/thrust/thrust_shell wrapProgram $out/libexec/thrust/thrust_shell \ --prefix "LD_LIBRARY_PATH" : "${thrustEnv}/lib:${thrustEnv}/lib64" diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index e3d0f7f5845..c7ba985d0f7 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -99,10 +99,10 @@ in stdenv.mkDerivation rec { if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then if [[ "$ftype" =~ 32-bit ]]; then rpath="${libPath32}" - intp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker-m32)" + intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)" else rpath="${libPath64}" - intp="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" + intp="$(cat $NIX_CC/nix-support/dynamic-linker)" fi oldRpath="$(patchelf --print-rpath "$1")" diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 77157e962e1..016c965b6c0 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lpath}" \ $out/adom diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index c9fa3a1d05e..092f0773708 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"} - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF #!/bin/sh cd $out/opt/andyetitmoves diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index e8db1de7628..e10d97a047b 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -82,7 +82,7 @@ let cp -a data $out/share/factorio cp -a bin/${arch.inTar}/factorio $out/bin/factorio patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $out/bin/factorio ''; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b6c4e5f71f9..d637c159595 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { cd bin for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $f + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 41feab11f2a..1e396318bbb 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; - interpreter = "$(< \"$NIX_BINUTILS/nix-support/dynamic-linker\")"; + interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ]; in '' mkdir -pv $out/bin diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 1f3223a3054..451d4b71296 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index dd84c38b486..c2beeb13cad 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { cp -r ../Scrolls_Data "$out/opt/Scrolls/" chmod +x "$out/opt/Scrolls/Scrolls" - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$libPath" "$out/opt/Scrolls/Scrolls" mkdir "$out/bin" diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 5064c8d9d34..947e52e1f13 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ alsaLib qt48 SDL fontconfig freetype SDL_ttf xorg.libX11 xorg.libXinerama stdenv.cc.cc ]}" \ share/sdlmame/sdlmame diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 15a5c2ec907..5fcb5063bbc 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. find "$out" | while read filepath; do if file "$filepath" | grep -q "ELF.*executable"; then - echo "setting interpreter $(cat "$NIX_BINUTILS/nix-support/dynamic-linker") in $filepath" - patchelf --set-interpreter "$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" "$filepath" + echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" + patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } fi done diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 64f19ff7ab8..34b9a606fb9 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { echo @@@ # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. - LD_PRELOAD=./isatty.so $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $src << IM_A_BOT + LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ IM_A_BOT @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # props to Ethan Lee (the Vessel porter) for understanding # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ $out/libexec/strangeloop/vessel/x86/vessel.x86 diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index d69a50f56e7..ba887d91de1 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/2dboy/WorldOfGoo/ mkdir -p $out/bin - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 cp -r * $out/libexec/2dboy/WorldOfGoo/ diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index b75b903d06e..be9d4f83709 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 English/rastertokpsl $out/lib/cups/filter/rastertokpsl patchelf \ --set-rpath ${libPath} \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $out/lib/cups/filter/rastertokpsl mkdir -p $out/share/cups/model/Kyocera diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index fba2bb88acb..b0a03046934 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { coreutils ghostscript gnugrep gnused which ]} - interpreter=$(cat $NIX_BINUTILS/nix-support/dynamic-linker) + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3 patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3 diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index 0d68fc5b09c..f750df6e506 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -27,7 +27,7 @@ ln -s ppd model cd $out/lib/cups/filter for i in $(ls); do echo "Patching $i..." - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $i || + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || echo "Couldn't set interpreter!" patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. done diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 22a0986e1fb..b30b4c4a2c1 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { echo "Patching $exe" patchelf \ --set-rpath ${libPath} \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $exe done unset GLOBIGNORE diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index e837807c89e..556c408012d 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { preFixup = '' for bin in "$out/bin/"*; do - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" done diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 768b9902c4b..ac3e96e2658 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { $out/cups/lib/backend/{canon,epson} \ $out/sbin/cups-genppd.5.0 \ ; do - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 1d7021137c0..4dc0f2591d8 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -34,7 +34,7 @@ in postFixup = '' find $out -type f -exec \ - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" {} \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \ patchelf --set-rpath ${rpath} {} \; ''; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index 1b8bdc891b0..aaa932c0a1c 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = '' BINFILES="fah6 mpiexec"; for a in $BINFILES; do - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $a + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a done mkdir -p $out/bin cp $BINFILES $out/bin diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 690fd93fcf8..933e7558dbb 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -2,15 +2,12 @@ , hostPlatform, targetPlatform }: -# despite the name, binutils-raw is in fact wrapped. -let binutils-unwrapped = binutils-raw.binutils; in - # Make sure both underlying packages claim to have prepended their binaries # with the same prefix. -assert binutils-unwrapped.prefix == cctools.prefix; +assert binutils-raw.prefix == cctools.prefix; let - inherit (binutils-unwrapped) prefix; + inherit (binutils-raw) prefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" @@ -23,7 +20,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-unwrapped.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt + ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -40,7 +37,7 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - for i in ${binutils-unwrapped.dev or binutils-unwrapped.out}/include/*.h; do + for i in ${binutils-raw.dev or binutils-raw.out}/include/*.h; do ln -s "$i" "$out/include/$(basename $i)" done @@ -49,8 +46,8 @@ stdenv.mkDerivation { done # FIXME: this will give us incorrect man pages for bits of cctools - ln -s ${binutils-unwrapped.out}/share $out/share - ln -s ${binutils-unwrapped.out}/lib $out/lib + ln -s ${binutils-raw.out}/share $out/share + ln -s ${binutils-raw.out}/lib $out/lib ln -s ${cctools}/libexec $out/libexec ''; diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 3d7bb74ce21..e7825a0ebd6 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules) + '' mv $out/etc/vulkan $out/share - interpreter="$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" + interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" libPath="$out/lib:$out/lib/gbm:$depLibPath" '' + optionalString (!stdenv.is64bit) '' for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 1fdff871b73..e67e54f7b43 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure \ --replace '#define ELF_INTERPRETER "$interp"' \ - "#define ELF_INTERPRETER \"$(cat $NIX_BINUTILS/nix-support/dynamic-linker)\"" + "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\"" ''; preConfigure = '' diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index a029b582f38..bb714f60c2d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for f in $out/bin/*; do if isELF "$f"; then - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$f" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" patchelf --set-rpath "$out/lib" "$f" fi done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh index a4704fd51df..5d47df9a87a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh @@ -81,7 +81,7 @@ installPhase() { for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index f41229ace86..99813d38236 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -111,7 +111,7 @@ installPhase() { for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do if [ -e "$i" ]; then install -Dm755 $i $bin/bin/$i - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$libPath $bin/bin/$i fi done diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index bc574bc0d79..9ca48ccaf05 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/sbin/*; do patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:$libPath" \ $i done diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 787c685e61e..4668ac24096 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/bin/platform + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/platform ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 36384da2047..0b82f1deef6 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -39,21 +39,21 @@ stdenv.mkDerivation rec { patch -p1 < ${./main.patch} popd substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ --replace "@PATCHELF@" "${patchelf}/bin/patchelf" # Patch node. node=$devBundle/bin/node patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ $node # Patch mongo. for p in $devBundle/mongodb/bin/mongo{,d}; do patchelf \ - --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ $p done diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 8ba554d1b77..e9a9fcff2b9 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/nrsysmond ''; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index f499743d762..e86406cd469 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d71cda7f8a9..f4801d674e8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -63,40 +63,10 @@ in rec { extraBuildInputs, allowedRequisites ? null}: let - buildPackages = lib.optionalAttrs (last ? stdenv) { - inherit (last) stdenv; - }; - - coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; - gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; - - binutils = import ../../build-support/binutils-wrapper { - inherit shell; - inherit (last) stdenv; - - nativeTools = false; - nativeLibc = false; - inherit buildPackages coreutils gnugrep; - libc = last.pkgs.darwin.Libsystem; - binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; - }; - - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { - inherit shell; - inherit (last) stdenv; - - nativeTools = false; - nativeLibc = false; - inherit buildPackages coreutils gnugrep binutils; - libc = last.pkgs.darwin.Libsystem; - isClang = true; - cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; - }; - thisStdenv = import ../generic { inherit config shell extraNativeBuildInputs extraBuildInputs; allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ - cc.expand-response-params cc.binutils + thisStdenv.cc.expand-response-params ]; name = "stdenv-darwin-boot-${toString step}"; @@ -105,9 +75,24 @@ in rec { hostPlatform = localSystem; targetPlatform = localSystem; - inherit cc; + cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + inherit shell; + inherit (last) stdenv; + + nativeTools = false; + nativeLibc = false; + buildPackages = lib.optionalAttrs (last ? stdenv) { + inherit (last) stdenv; + }; + libc = last.pkgs.darwin.Libsystem; + isClang = true; + cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; + binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; + coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; + gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; + }; - preHook = lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' + preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -365,8 +350,8 @@ in rec { xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk - gnugrep llvmPackages.clang-unwrapped patch pcre.out gettext - binutils-raw.binutils.out binutils-raw.binutils.dev binutils binutils.binutils + gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out + binutils-raw.dev binutils gettext cc.expand-response-params ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 08166c55a5a..fab1985b976 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -143,16 +143,7 @@ in ''; }; gcc-unwrapped = bootstrapTools; - binutils = import ../../build-support/binutils-wrapper { - nativeTools = false; - nativeLibc = false; - buildPackages = { }; - libc = self.glibc; - inherit (self) coreutils gnugrep; - binutils = bootstrapTools; - name = "bootstrap-binutils-wrapper"; - stdenv = self.stdenv; - }; + binutils = bootstrapTools; coreutils = bootstrapTools; gnugrep = bootstrapTools; }; @@ -174,7 +165,7 @@ in # Rebuild binutils to use from stage2 onwards. overrides = self: super: { - binutils = super.binutils_nogold; + binutils = super.binutils.override { gold = false; }; inherit (prevStage) ccWrapperStdenv glibc gcc-unwrapped coreutils gnugrep; @@ -197,14 +188,9 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - gcc-unwrapped coreutils gnugrep + binutils gcc-unwrapped coreutils gnugrep perl paxctl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. - binutils = prevStage.binutils.override { - # Rewrap the binutils with the new glibc, so both the next - # stage's wrappers use it. - libc = self.glibc; - }; }; }) @@ -249,15 +235,6 @@ in # other purposes (binutils and top-level pkgs) too. inherit (prevStage) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; - binutils = super.binutils.override { - # Don't use stdenv's shell but our own - shell = self.bash + "/bin/bash"; - # Build expand-response-params with last stage like below - buildPackages = { - inherit (prevStage) stdenv; - }; - }; - gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; @@ -322,8 +299,8 @@ in allowedRequisites = with prevStage; with lib; # Simple executable tools concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils.binutils coreutils diffutils findutils - gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk + gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies ++ map getLib ( @@ -333,7 +310,7 @@ in # More complicated cases ++ [ glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders - binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params + gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] ++ lib.optionals (system == "aarch64-linux") [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 72291ccb006..77302f3d4a2 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${zlib.out}/lib:${p.gcclib}" \ $out/bin/yandex-disk ''; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index cf15473e240..5341c9840be 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cd $out unzip ${src} rpmextract linux/MegaCli-8.07.07-1.noarch.rpm - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64 + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 eval fixupPhase diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 9b98ac0137c..21786f3f15f 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cp ${system}/SSDGuru $out/bin/ rm -rf linux{32,64} patchelf \ - --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out \ $out/bin/SSDGuru diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 68675958fd3..2d1db4eb64c 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin/" \ "$out/opt/sam-ba/" cp -a . "$out/opt/sam-ba/" - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}" cat > "$out/bin/sam-ba" << EOF export LD_LIBRARY_PATH="${libPath}" exec "$out/opt/sam-ba/sam-ba${maybe64}" diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 538f9d4a945..e1d6604970e 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mv opt/staruml $out/bin ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/StarUML mkdir -p $out/lib diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index b861c9b4d9d..d0f35844695 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp xflux "$out/bin" ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "$libPath" "$out/bin/xflux" ''; meta = { description = "Adjusts your screen to emit warmer light at night"; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6a9c4667128..78d815eb7c1 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -13,13 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; - # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as - # linkage requirements - # - # Binutils.binutils for headers - propagatedBuildInputs = [ - popt elfutils nss db bzip2 libarchive binutils binutils.binutils - ]; + # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index abea3eccf12..2cf07c63a84 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { cp -v lib* $out/lib ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $out/lib:${rpath} \ $out/bin/encryptr ''; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 5774de21c54..449a6911a15 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -73,7 +73,7 @@ let $out/share/applications/enpass.desktop for i in $out/bin/{Enpass,EnpassHelper/EnpassHelper}; do - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) $i + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i done # The helper's sha256 sum must match, hence the use of libredirect. diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 0062758196f..14a4c985d50 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp f-prot.conf.default $out/opt/f-prot/f-prot.conf ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - patchelf --interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate mkdir -p $out/share/man/ mkdir -p $out/share/man/man1 diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index dc99d1953d5..cbd260455d8 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = let - interpreter = "$(< \"$NIX_BINUTILS/nix-support/dynamic-linker\")"; + interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; in '' mkdir -p $out/opt/password-gorilla diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index 63bba05b6a0..a45a6ea2a04 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/keybase-gui ''; postFixup = '' - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 95b8e270689..91cecce6122 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ec3328211..d7071ac940e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1809,7 +1809,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc stdenv.cc.binutils '' + emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' # hardening flags break WASM support cat > $out/nix-support/add-hardening.sh '' emscriptenfastcomp-unwrapped; @@ -5259,9 +5259,7 @@ with pkgs; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; - binutils = clang.binutils.override { - useMacosReexportHack = true; - }; + useMacosReexportHack = true; }; clang_4 = llvmPackages_4.clang; @@ -5353,12 +5351,8 @@ with pkgs; extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - # Binutils with glibc multi - binutils = cc.binutils.override { - libc = glibc_multi; - }; - in wrapCCWith glibc_multi binutils extraBuildCommands (cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith glibc_multi binutils "" cc.cc); + in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) @@ -6160,20 +6154,19 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = libc: binutils: extraBuildCommands: baseCC: ccWrapperFun { + wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; cc = baseCC; isGNU = baseCC.isGNU or false; isClang = baseCC.isClang or false; - inherit libc binutils extraBuildCommands; + inherit libc extraBuildCommands; }; ccWrapperFun = callPackage ../build-support/cc-wrapper; - binutilsWrapperFun = callPackage ../build-support/binutils-wrapper; - wrapCC = wrapCCWith stdenv.cc.libc stdenv.cc.binutils ""; + wrapCC = wrapCCWith stdenv.cc.libc ""; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { nativeTools = stdenv.cc.nativeTools or false; @@ -6197,15 +6190,6 @@ with pkgs; inherit cc binutils libc shell name; }; - wrapBinutils = baseBinutils: binutilsWrapperFun { - nativeTools = stdenv.cc.nativeTools or false; - nativeLibc = stdenv.cc.nativeLibc or false; - nativePrefix = stdenv.cc.nativePrefix or ""; - libc = stdenv.cc.libc; - binutils = baseBinutils; - extraBuildCommands = ""; - }; - # prolog yap = callPackage ../development/compilers/yap { }; @@ -6766,15 +6750,13 @@ with pkgs; then darwin.binutils else binutils-raw; - binutils-raw = wrapBinutils (callPackage ../development/tools/misc/binutils { + binutils-raw = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; - }); + }; binutils_nogold = lowPrio (binutils-raw.override { - binutils = binutils-raw.binutils.override { - gold = false; - }; + gold = false; }); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a8c8f744d8a..32d540a8f96 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -10,9 +10,9 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; - binutils = pkgs.wrapBinutils (callPackage ../os-specific/darwin/binutils { + binutils = callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; - }); + }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index a79f264848b..5a85dc3433b 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -67,7 +67,7 @@ let postFixup = '' for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do chmod +w "$f" - patchelf --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) "$f" || true + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true done ''; -- cgit 1.4.1 From 9d6ac8eadaade4f8564aa54b64bb9eb0dabfa322 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 9 Sep 2017 07:53:46 +0200 Subject: mesa: maintenance 17.1.8 -> 17.1.9 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bdce7ce3dbe..c9cb0b36bc5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.8"; + version = "17.1.9"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db"; + sha256 = "5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a"; }; prePatch = "patchShebangs ."; -- cgit 1.4.1 From ab62b7e9b9c05498cd5e2d9f2521a3d51d5aeedf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 12 Sep 2017 12:23:53 +0300 Subject: Revert "libgcrypt: Add pre-ARMv7 patch" This reverts commit 1cfe9539f99d4d0f9dd00a48f79d13e8a37b4d08. No longer needed after the upgrade in 095af3e63b26e4. --- pkgs/development/libraries/libgcrypt/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 8d71cfd313d..e32ba050c38 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -22,15 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ libgpgerror ] ++ stdenv.lib.optional enableCapabilities libcap; - # Shouldn't be needed after 1.8.1 - patches = if stdenv.isArm && stdenv.system != "armv7l-linux" - then fetchpatch { - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=4a7aa30ae9f3ce798dd886c2f2d4164c43027748"; - name = "arm.patch"; - sha256 = "1dq9s0xwpbg7s5sghvssmwh4v88x733zm6c8ab3flllq8h7c8fq5"; - } - else null; - # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' -- cgit 1.4.1