From 80e09678f7f0957d27bebf8d6d933303e5dab3ca Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 24 Aug 2015 18:57:06 -0700 Subject: [PATCH 01/41] darwin: use system dyld see https://github.com/NixOS/nixpkgs/issues/9432 --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8965fc6bef0..9822b1a026a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation { if stdenv.isArm then "ld-linux*.so.3" else if stdenv.system == "powerpc-linux" then "ld.so.1" else if stdenv.system == "mips64el-linux" then "ld.so.1" else - if stdenv.system == "x86_64-darwin" then "${dyld}/lib/dyld" else + if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else abort "Don't know the name of the dynamic linker for this platform.") else ""; From 16a615a0f6e04208873fa7ec9c825fc4e71b8ee6 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 24 Aug 2015 18:57:41 -0700 Subject: [PATCH 02/41] IOKit: add 10.11-only dependency --- pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index e2fdef60001..d7d4d8b659e 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -6,6 +6,7 @@ rec { ]; IOKit = [ "/System/Library/Frameworks/IOKit.framework" + "/usr/lib/libenergytrace.dylib" ]; DiskArbitration = [ "/System/Library/Frameworks/DiskArbitration.framework" From c1f2fd461994b0e890a2a34981cc5ed6ae40d09d Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 24 Aug 2015 19:24:00 -0700 Subject: [PATCH 03/41] update pure-darwin bootstrap tools with new hash --- pkgs/stdenv/pure-darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix index 2f31144a11e..51780b6f774 100644 --- a/pkgs/stdenv/pure-darwin/default.nix +++ b/pkgs/stdenv/pure-darwin/default.nix @@ -32,7 +32,7 @@ let mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; }; cpio = fetch { file = "cpio"; sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; }; }; - tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; }; + tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "1xim0wm4ld45ysdmgpsa6b1f6srdnfj054ilv86k0pa5plvcmsf4"; }; in rec { allPackages = import ../../top-level/all-packages.nix; From 881fd7f589c365011184e4fe711d12aded5afafa Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 11:12:01 -0700 Subject: [PATCH 04/41] disable libsystem_stats (temporarily?) --- .../darwin/apple-source-releases/Libsystem/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index ecab0941332..108b430d783 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -34,7 +34,9 @@ appleDerivation rec { "system_platform" "system_pthread" "system_sandbox" - "system_stats" + # does not exist in El Capitan beta + # FIXME: does anything on yosemite actually need this? + # "system_stats" "unc" "unwind" "xpc" From 34c092b11479b7dac2cfda6c806772d8951ca077 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 12:08:59 -0700 Subject: [PATCH 05/41] libgcrypt: fix test crash on Darwin --- pkgs/development/libraries/libgcrypt/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index b01caeb5dd3..b9a24ae61be 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la ''; + # TODO: figure out why this is even necessary and why the missing dylib only crashes + # random instead of every test + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/lib + cp src/.libs/libgcrypt.20.dylib $out/lib + ''; + doCheck = true; meta = { From 3bf5d87f9efe19c441a796afc054a5f4be6e83b1 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 17:12:36 -0700 Subject: [PATCH 06/41] apple-sdk: add El Capitan impure-deps --- pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index d7d4d8b659e..be518b5b9fc 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -41,6 +41,8 @@ rec { ]; CoreGraphics = [ "/System/Library/Frameworks/CoreGraphics.framework" + "/System/Library/Frameworks/Metal.framework/Versions/A/Metal" + "/System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator" "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport" "/usr/lib/libbsm.0.dylib" "/usr/lib/libz.1.dylib" @@ -64,7 +66,9 @@ rec { ]; QuartzCore = [ "/System/Library/Frameworks/QuartzCore.framework" + "/System/Library/Frameworks/CoreImage.framework" "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport" + "/usr/lib/libFosl_dynamic.dylib" ]; PCSC = [ "/System/Library/Frameworks/PCSC.framework" @@ -102,8 +106,10 @@ rec { "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" + "/usr/lib/libChineseTokenizer.dylib" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" + "/usr/lib/libScreenReader.dylib" "/usr/lib/libarchive.2.dylib" "/usr/lib/libbsm.0.dylib" "/usr/lib/libbz2.1.0.dylib" @@ -117,6 +123,7 @@ rec { "/usr/lib/libicucore.A.dylib" "/usr/lib/liblangid.dylib" "/usr/lib/liblzma.5.dylib" + "/usr/lib/libmarisa.dylib" "/usr/lib/libmecabra.dylib" "/usr/lib/libpam.2.dylib" "/usr/lib/libresolv.9.dylib" @@ -136,6 +143,7 @@ rec { ]; CoreData = [ "/System/Library/Frameworks/CoreData.framework" + "/usr/lib/libcompression.dylib" ]; Cocoa = [ "/System/Library/Frameworks/Cocoa.framework" From 557fa590426471723e05780666c79ed6afef5cb3 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 17:12:50 -0700 Subject: [PATCH 07/41] libsecurity_generic: add El Capitan impure-deps --- .../apple-source-releases/libsecurity_generic/impure_deps.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix index 7725b9f3d1a..266cded0d47 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix @@ -40,6 +40,7 @@ "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata" "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices" "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit" + "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList" "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText" "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo" "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN" From 4e8279b43b30d119468e8ba76716c1d6bdcf67f5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 17:14:02 -0700 Subject: [PATCH 08/41] darwin purity: ruby-2.1.6 --- pkgs/development/interpreters/ruby/ruby-2.1.6.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix index c9016a338af..b4600f5c9af 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix @@ -7,6 +7,7 @@ , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true , ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true +, libiconv, libobjc, libunwind }: let @@ -47,7 +48,8 @@ stdenv.mkDerivation rec { # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ (op (!cursesSupport && stdenv.isDarwin) readline); + ++ (op (!cursesSupport && stdenv.isDarwin) readline) + ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 017601a3a4d..d6737cbc4dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5146,7 +5146,9 @@ let ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }; ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }; ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }; - ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { }; + ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { + inherit (darwin) libobjc libunwind; + }; ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { inherit (darwin) libobjc libunwind; }; From e5fe8aab745687446b45679189610b1579d97b5f Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 19:03:49 -0700 Subject: [PATCH 09/41] add reattach-to-user-namespace --- .../reattach-to-user-namespace/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix new file mode 100644 index 00000000000..0460c516d29 --- /dev/null +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "reattach-to-user-namespace-2.4"; + src = fetchgit { + url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; + sha256 = "1f9q1wxq764zidnx5hbdkbbyxxzfih0l0cjpgr0pxzwbmd2q6cvv"; + rev = "2765aeab8f337c29e260a912bf4267a2732d8640"; + }; + buildFlags = "ARCHES=x86_64"; + installPhase = '' + mkdir -p $out/bin + cp reattach-to-user-namespace $out/bin/ + ''; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6737cbc4dd..83edf273f82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -665,6 +665,8 @@ let derez = callPackage ../os-specific/darwin/derez { }; rez = callPackage ../os-specific/darwin/rez { }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; From 9d1748d384efd1baa17152e71db9d305d635db4b Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 26 Aug 2015 17:05:29 -0700 Subject: [PATCH 10/41] terminal-notifier: allow kernel to find Info.plist file --- pkgs/applications/misc/terminal-notifier/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 94655614023..2afebec9ee3 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications - ln -s $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier $out/bin/terminal-notifier + cat >$out/bin/terminal-notifier < Date: Wed, 26 Aug 2015 17:06:10 -0700 Subject: [PATCH 11/41] add new libs to impure-deps for CoreServices affects nodejs, vim, etc. --- pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index be518b5b9fc..b1a3becac1a 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -31,6 +31,8 @@ rec { "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling" + "/usr/lib/libChineseTokenizer.dylib" + "/usr/lib/libmarisa.dylib" "/usr/lib/libmecabra.dylib" "/usr/lib/libcmph.dylib" "/usr/lib/libiconv.2.dylib" From 28a18999faeab25b92649027f4411e7f41d793da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 28 Aug 2015 07:42:17 +0200 Subject: [PATCH 12/41] ruby: use fetchFromSavannah to enable better availability for proxied users. --- pkgs/development/interpreters/ruby/config.nix | 6 ++++-- pkgs/development/interpreters/ruby/ruby-2.1.0.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.1.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.2.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.3.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.1.6.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.2.0.nix | 4 ++-- pkgs/development/interpreters/ruby/ruby-2.2.2.nix | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/ruby/config.nix b/pkgs/development/interpreters/ruby/config.nix index c03c0520d7a..c4f3160d160 100644 --- a/pkgs/development/interpreters/ruby/config.nix +++ b/pkgs/development/interpreters/ruby/config.nix @@ -1,6 +1,8 @@ # Ruby >= 2.1.0 tries to download config.{guess,sub} -fetchgit: fetchgit { - url = "git://git.sv.gnu.org/config.git"; +{ fetchFromSavannah }: + +fetchFromSavannah { + repo = "config"; rev = "576c839acca0e082e536fd27568b90a446ce5b96"; sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0"; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index 95ab84eedb8..0fe9daa50e4 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_0.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index abd09c0f276..8b2c04e853f 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_1.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index 8612cd6bd43..2cad52cc56d 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_2.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix index 1ba97daac04..50cc3484730 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -13,7 +13,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_3.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix index b4600f5c9af..0bf89de1d98 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_1_6.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix index e22e64681a3..a29b7466400 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_2_0.override { useRailsExpress = false; }; in diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix index 9e015ce9d7b..df40f674989 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -14,7 +14,7 @@ let op = stdenv.lib.optional; ops = stdenv.lib.optionals; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; - config = import ./config.nix fetchgit; + config = import ./config.nix { inherit fetchFromSavannah; }; baseruby = ruby_2_2_2.override { useRailsExpress = false; }; in From 86e53bdff394951165fddc8aac5a1cfde79fc4c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 17:57:13 -0700 Subject: [PATCH 13/41] curl: 7.43.0 -> 7.44.0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 6901c74cc48..f9f638ec813 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.43.0"; + name = "curl-7.44.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1ycdhp47v8z6y64s7ihi5jl28dzc5w8wqn0wrhy4hc152ahm99ms"; + sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From c6d73dcbb0d568c04e740e85a8b0e6372789f1ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 30 Aug 2015 18:13:58 -0700 Subject: [PATCH 14/41] boost: Add 1.59 --- pkgs/development/libraries/boost/1.59.nix | 40 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.59.nix diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix new file mode 100644 index 00000000000..2666b1d6c5d --- /dev/null +++ b/pkgs/development/libraries/boost/1.59.nix @@ -0,0 +1,40 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.59.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; + sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; + }; + + patches = if stdenv.isCygwin then [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ] else null; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8222886f241..c8d1a21fd79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5986,6 +5986,7 @@ let boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost157 = callPackage ../development/libraries/boost/1.57.nix { }; boost158 = callPackage ../development/libraries/boost/1.58.nix { }; + boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost = boost158; boost_process = callPackage ../development/libraries/boost-process { }; From 0f44a1c8d77392a0b5b9c3dfc5210e1f7137d822 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 30 Aug 2015 18:14:17 -0700 Subject: [PATCH 15/41] boost: Make 1.59 the default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8d1a21fd79..64d9637d83a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5987,7 +5987,7 @@ let boost157 = callPackage ../development/libraries/boost/1.57.nix { }; boost158 = callPackage ../development/libraries/boost/1.58.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; - boost = boost158; + boost = boost159; boost_process = callPackage ../development/libraries/boost-process { }; From 883fadf6d15bfcbf62c82ea09b208714533317e8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 31 Aug 2015 10:23:01 -0700 Subject: [PATCH 16/41] bash: Remove stale 4.1 patches --- pkgs/shells/bash/bash-4.1-patches.nix | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 pkgs/shells/bash/bash-4.1-patches.nix diff --git a/pkgs/shells/bash/bash-4.1-patches.nix b/pkgs/shells/bash/bash-4.1-patches.nix deleted file mode 100644 index 2affe1efa60..00000000000 --- a/pkgs/shells/bash/bash-4.1-patches.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56") -(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij") -(patch "003" "0v95ng8qa78dbh26rr6jpzkn3s6n78xymymkvvvkz35rpgfksxli") -(patch "004" "17pzykkywh5jmdy1ikj9xyxm7qm29ii2fmrfpyjr1wy16jx67h3q") -(patch "005" "06lwfgxx9kacz018nr4dmxqqrzipcg8pjn61gr6yfjv6s7c3k5ji") -(patch "006" "0j9c1zhhwvc2p4cdxi77nxmcxa00cimaxwbhasyqgc606g7sp1jr") -(patch "007" "19q5qba77hfda8g4xylh77awiakhr1d1asgbqcrbakxs50n2l0bl") -(patch "008" "058j911q9wcbr93w59jnpgmdpx4qsq3gvd6m9nwgdk9j2hjjqb2f") -(patch "009" "1lany70f0rx1i2xikzkahr1zskh8620j05ic0gc5x2p89ab0ch5x") -(patch "010" "05fqv7w12g9izy332wypynilgxzdh87vy5q2pqq3bjdncyl5hxvr") -(patch "011" "088n54yh5zp8aa917y1ng3802amchgal1acn0v0mdjqj0yi82aqv") -(patch "012" "0vbvc1vxljyd882wk6rcd64xrf1lda6wirys41mqjbl0lalj8bi7") -(patch "013" "1y7x62i0q3wkr9jdjzvm2rl9dp11vzp8fwkz2zb2x21l0pi25mya") -(patch "014" "0gpizgbx1w712awpd11x5nvahpranl0aiq16nhp3xmm8vvz1wpar") -(patch "015" "17nf6kw1vhmzn9nzb1vyn8r4wp2nl109f9yawzavjkf06670ln7c") -(patch "016" "129hknigxhxrh1rbjhc4fm6argpjb6lp9fl616narbnzsv3qhc3l") -(patch "017" "0vy02x6fmpd6i66n97r4fwrq9pncbgzya07iyca2bb6yyzmymgg5") -] From 461a9ee562cb93b15b7dd495b6d1029ea42d6e30 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 31 Aug 2015 10:25:12 -0700 Subject: [PATCH 17/41] bash4.3: p39 -> p42 --- pkgs/shells/bash/bash-4.3-patches.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix index cd085f78700..c994ed636a9 100644 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -40,4 +40,7 @@ patch: [ (patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") (patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") (patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") +(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") +(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") +(patch "042" "1bwhssay66n75fy0pxcrwbm032s6fvfg7dblzbrzzn5k38a56nmp") ] From 0631e2233d43c628ebb414dcc59e77000f2ccb85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2015 00:30:19 +0200 Subject: [PATCH 18/41] libtiff: 4.0.4beta -> 4.0.5 --- pkgs/development/libraries/libtiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 25f6cf5b6b7..692fab9f654 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.4beta"; + version = "4.0.5"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; + sha256 = "171hgy4mylwmvdm7gp6ffjva81m4j56v3fbqsbfl7avzxn1slpp2"; }; outputs = [ "out" "doc" "man" ]; From 57dc088f9e65419a98fd69fb85e5aa3cb3f7a3a1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 13:52:34 -0700 Subject: [PATCH 19/41] librevenge: Fix boost 1.59 compat --- pkgs/development/libraries/librevenge/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index b3543236158..fa90c76b24a 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; + # Fix an issue with boost 1.59 + # This is fixed upstream so please remove this when updating + postPatch = '' + sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in + ''; + meta = { inherit (s) version; description = ''A base library for writing document import filters''; From ffd9e6a6ae57666420b94edf47d7f55450c0e955 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 2 Sep 2015 14:35:31 -0700 Subject: [PATCH 20/41] gnash: Mark as broken We should weed out any last users of this dying project and hopefully remove it at some juncture in the future if no one steps up to maintain it. --- pkgs/applications/video/gnash/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index fc773211f69..5a170047e8f 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -117,5 +117,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; + broken = true; }; } // {mozillaPlugin = "/plugins";} From 14e715a55da0d4f62651c0401ecc7933e062c5f9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 10:52:30 -0700 Subject: [PATCH 21/41] lvtk: Boost 1.59 compat --- pkgs/development/libraries/audio/lvtk/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 6e2b9a31b30..401743ac517 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -9,10 +9,18 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - buildInputs = [ boost gtkmm lv2 pkgconfig python ]; + nativeBuildInputs = [ pkgconfig python ]; + buildInputs = [ boost gtkmm lv2 ]; + + # Fix including the boost libraries during linking + postPatch = '' + sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build + ''; configurePhase = '' - python waf configure --prefix=$out --boost-includes="${boost.dev}/include" + python waf configure --prefix=$out \ + --boost-includes="${boost.dev}/include" \ + --boost-libs="${boost.lib}/lib" ''; buildPhase = "python waf"; From 6bdb5b90ca02f5faf3517b89e771cce3e24d19f5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 13:24:43 -0700 Subject: [PATCH 22/41] libvisio: 0.1.0 -> 0.1.3 --- pkgs/development/libraries/libvisio/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index d03fabcc653..123e455bc4b 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -3,17 +3,20 @@ }: stdenv.mkDerivation rec { - name = "libvisio-0.1.0"; + name = "libvisio-0.1.3"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "1vpb7nbk5qh6w3jz9rl9w8p25invcvj46parb9ld13h9777kyf0j"; + sha256 = "1blgdwxprqkasm2175imcvy647sqv6xyf3k09p0b1i7hlq889wvy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; - configureFlags = "--disable-werror"; + configureFlags = [ + "--disable-werror" + "--disable-tests" + ]; meta = { description = "A library providing ability to interpret and import visio diagrams into various applications"; From 6fc70d6b2edcdf0b9e97056184d493cc15622d95 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 13:25:18 -0700 Subject: [PATCH 23/41] libvisio: Boost 1.59 compat --- pkgs/development/libraries/libvisio/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index 123e455bc4b..bda14d72947 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; + # Boost 1.59 compatability fix + # Attempt removing when updating + postPatch = '' + sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in + ''; + configureFlags = [ "--disable-werror" "--disable-tests" From 677fe9f9340866853f793e3ea3dc41daa40e94e9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 14:09:08 -0700 Subject: [PATCH 24/41] libe-book: Boost 1.59 compat --- pkgs/development/libraries/libe-book/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index fa47c1587c3..02195dede93 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -15,10 +15,16 @@ let buildInputs = [ gperf pkgconfig librevenge libxml2 boost icu cppunit zlib ]; + + # Boost 1.59 compatability fix + # Attempt removing when updating + postPatch = '' + sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in + ''; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit buildInputs postPatch; src = fetchurl { inherit (s) url sha256; }; From 11315f9e7065cb0badc75f461387350a15318f8e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 14:16:34 -0700 Subject: [PATCH 25/41] libcdr: 0.1.0 -> 0.1.1 --- pkgs/development/libraries/libcdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 90318e3e991..daf8708e45c 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }: stdenv.mkDerivation rec { - name = "libcdr-0.1.0"; + name = "libcdr-0.1.1"; src = fetchurl { url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g"; + sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj"; }; buildInputs = [ libwpg libwpd lcms librevenge icu boost ]; From 799a02f209ba5d9f33add87bd20023f6b61f2598 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 14:16:44 -0700 Subject: [PATCH 26/41] libcdr: Boost 1.59 compat --- pkgs/development/libraries/libcdr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index daf8708e45c..670484f0ae6 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + # Boost 1.59 compatability fix + # Attempt removing when updating + postPatch = '' + sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in + ''; + configureFlags = if stdenv.cc.isClang then [ "--disable-werror" ] else null; From 3df7b15932909cfa1081c76e37439b6ed6e02d0a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 14:31:10 -0700 Subject: [PATCH 27/41] folly: 0.52.0 -> 0.57.0 --- pkgs/development/libraries/folly/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 0cea9413bae..5ca5fe638ef 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,19 +2,18 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.52.0"; + version = "0.57.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "16g3hpy1gy56zqnhwzkvzzpm6dgm01qa9yaigmrqr9b59c3k6cqf"; + sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9"; }; - buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; - - nativeBuildInputs = [ autoreconfHook python boost ]; + nativeBuildInputs = [ autoreconfHook python ]; + buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; postUnpack = "sourceRoot=\${sourceRoot}/folly"; preBuild = '' From 3f5207a3965c5b80aa2dfbdb94375d84bcf0d930 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 14:31:21 -0700 Subject: [PATCH 28/41] folly: Build with boost < 1.59 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be348fd5cd3..a2673540382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6307,7 +6307,9 @@ let fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; - folly = callPackage ../development/libraries/folly { }; + folly = callPackage ../development/libraries/folly { + boost = boost157; + }; makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: import ../development/libraries/fontconfig/make-fonts-conf.nix { From b8b47ecea048ff01276ba631e1da319ee23c4d2f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 17:31:22 -0700 Subject: [PATCH 29/41] codeblock: Boost 1.59 compat --- pkgs/applications/editors/codeblocks/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 750234b6399..53b7b5750a0 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pch=no" ] ++ optional contribPlugins "--with-contrib-plugins"; + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + meta = with stdenv.lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; From a1c92c4593b8cda29187d757771329d1634c5689 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 3 Sep 2015 17:31:35 -0700 Subject: [PATCH 30/41] libreoffice: Boost 1.59 compat --- pkgs/applications/office/libreoffice/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 21551beb9dc..e18fd727e00 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -131,6 +131,10 @@ stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + preConfigure = '' # Needed to find genccode PATH=$PATH:${icu}/sbin From ec3ffeb19966ded0970cb4f214f2b712aaa93c6c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Sep 2015 14:26:38 +0300 Subject: [PATCH 31/41] libunwind: add a patch to address https://github.com/JuliaLang/julia/issues/3469 Should be beneficial to other LLVM+libunwind projects as well (e.g. Pyston) --- pkgs/development/libraries/libunwind/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index ecaa643b143..3fc8b508559 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl, fetchpatch, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; - patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ]; + patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch + # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html + (fetchpatch { + url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch"; + sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha"; + }) + ]; postPatch = '' sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure From b68e45dfa7fc642a9eb93009f9611647160eb02a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 4 Sep 2015 11:21:37 -0700 Subject: [PATCH 32/41] mini-httpd: Boost 1.59 compat --- pkgs/servers/http/mini-httpd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 3a1cf687069..a03ac828752 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fixes compat with boost 1.59 + # Please attempt removing when updating + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + meta = { homepage = "http://mini-httpd.nongnu.org/"; description = "a minimalistic high-performance web server"; From f67ddbaa6f049cdd2a5e2333e3679c4f5f4b638f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Sep 2015 09:58:43 +0200 Subject: [PATCH 33/41] mesa: maintenance update 10.6.5 -> 10.6.6 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2af843346c6..44095856fd7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "10.6.5"; + version = "10.6.6"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f"; + sha256 = "570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778"; }; prePatch = "patchShebangs ."; From 8f33b8cc93006c97a8f6b7ede20214992ed31fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Sep 2015 10:21:43 +0200 Subject: [PATCH 34/41] mass rewrite of find parameters to cross-platform style Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution. Now we have no modes starting with `/` or `+`. Rewrite the `-perm` parameters of find: - completely safe: rewrite `/0100` and `+100` to `-0100`, - slightly semantics-changing: rewrite `+111` to `-0100`. I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD. --- pkgs/applications/networking/copy-com/default.nix | 2 +- pkgs/applications/networking/dropbox/default.nix | 4 ++-- pkgs/applications/science/logic/otter/default.nix | 6 +++--- pkgs/applications/science/math/content/default.nix | 2 +- pkgs/applications/science/math/mathematica/9.nix | 2 +- pkgs/applications/science/math/mathematica/default.nix | 2 +- pkgs/build-support/builder-defs/builder-defs.nix | 2 +- pkgs/build-support/setup-hooks/patch-shebangs.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/oraclejdk/dlj-bundle-builder.sh | 2 +- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 +- pkgs/development/interpreters/ruby/bundler-head.nix | 2 +- pkgs/development/interpreters/ruby/bundler.nix | 2 +- pkgs/development/libraries/ncbi/default.nix | 2 +- pkgs/development/libraries/wtk/builder.sh | 4 ++-- pkgs/development/mobile/androidenv/androidndk.nix | 2 +- pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +- pkgs/development/python-modules/generic/wrap.sh | 2 +- pkgs/development/tools/misc/patchelf/setup-hook.sh | 2 +- pkgs/servers/plex/default.nix | 2 +- pkgs/tools/graphics/quirc/default.nix | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix index 7dd2702325b..968218309ed 100644 --- a/pkgs/applications/networking/copy-com/default.nix +++ b/pkgs/applications/networking/copy-com/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { RPATH=${libPaths}:$out/${appdir} echo "Updating rpaths to $RPATH in:" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3fa6fb51ee1..0af5dfba3f2 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -101,12 +101,12 @@ in stdenv.mkDerivation { rm "$out/${appdir}/qt.conf" rm -fr "$out/${appdir}/plugins" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; mkdir -p "$out/share/applications" diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix index 653c5dad03f..398f6c9a3e2 100644 --- a/pkgs/applications/science/logic/otter/default.nix +++ b/pkgs/applications/science/logic/otter/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { buildPhase = '' find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 177efd667a3..e843c5ea9d8 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -82,7 +82,7 @@ rec { find . -name '*.so' -exec cp '{}' $out/lib ';' find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';' find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';' - find . -perm +111 -a ! -name '*.*' -exec cp '{}' $out/bin ';' + find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';' cp -r . $out/share/${name}/build-snapshot '') ["buildContent" "defEnsureDir" "minInit"]; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index c9357d7352f..3c7f758d91b 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { preFixup = '' echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') if [ -z "$type" ]; then : diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 5fc70417883..39f2409a987 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { preFixup = '' echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') if [ -z "$type" ]; then : diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index e7c64501614..6ea4ec86c48 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -569,7 +569,7 @@ let inherit (builtins) head tail trace; in # Interpreters that are already in the store are left untouched. echo "patching script interpreter paths" local f - for f in $(find "${dir}" -xtype f -perm /0100); do + for f in $(find "${dir}" -xtype f -perm -0100); do local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then local newPath=$(type -P $(basename $oldPath) || true) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 44ebad0d593..152755992f6 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -18,7 +18,7 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - find "$dir" -type f -perm /0100 | while read f; do + find "$dir" -type f -perm -0100 | while read f; do if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then # missing shebang => not a script continue diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 4e660853f20..96ec4e6c114 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. (if stdenv.isLinux then '' - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 7a6f1b78fa4..31df7f1fa35 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\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 3d781e9d558..03dd4dcd35b 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib" ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 56669ae0f2f..459bfce5098 100644 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh @@ -45,7 +45,7 @@ fi rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli # set all the dynamic linkers -find $out -type f -perm +100 \ +find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 35ee1a04a26..c5588787922 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -142,7 +142,7 @@ let result = stdenv.mkDerivation rec { rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} # set all the dynamic linkers - find $out -type f -perm +100 \ + find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 0aa6e9f90ce..a81f2f771bc 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -10,7 +10,7 @@ buildRubyGem { }; dontPatchShebangs = true; postInstall = '' - find $out -type f -perm /0100 | while read f; do + find $out -type f -perm -0100 | while read f; do substituteInPlace $f \ --replace "/usr/bin/env" "${coreutils}/bin/env" done diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix index 6dc01f9929c..1bf9fd91e5b 100644 --- a/pkgs/development/interpreters/ruby/bundler.nix +++ b/pkgs/development/interpreters/ruby/bundler.nix @@ -6,7 +6,7 @@ buildRubyGem { sha256 = "1zkxw6699bbmsamrij2lirscbh0j58p1p3bql22jsxvx34j6w5nc"; dontPatchShebangs = true; postInstall = '' - find $out -type f -perm /0100 | while read f; do + find $out -type f -perm -0100 | while read f; do substituteInPlace $f \ --replace "/usr/bin/env" "${coreutils}/bin/env" done diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index a74cd81854e..5d3b6170a3a 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -40,7 +40,7 @@ rec { cp ../make/makedis.csh $out/share/${name}/build-snapshot cp *.h $out/include cp *.c *.h $out/source - find . -perm +111 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';' + find . -perm -0100 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';' '') ["defEnsureDir" "build" "minInit"]; name = "NCBI-Toolbox-" + version; diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index ef0085da924..86f2719537c 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -21,7 +21,7 @@ rpath= for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done -find $out -type f -perm +100 \ +find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; -find $out -type f -perm +100 \ +find $out -type f -perm -0100 \ -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 9f5393949ca..cc1c2810524 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { find $out \( \ \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm /0100 \) \ + \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ --set-rpath ${zlib}/lib:${ncurses}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 5e04bbf0116..90994ae708e 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { find $out \( \ \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm /0100 \) \ + \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ --set-rpath ${zlib}/lib:${ncurses}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 6ad603e0138..557f79f865e 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,7 +26,7 @@ wrapPythonProgramsIn() { done # Find all regular files in the output directory that are executable. - for f in $(find "$dir" -type f -perm /0100); do + for f in $(find "$dir" -type f -perm -0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 944b418d1b4..a76fbfbd509 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -9,7 +9,7 @@ patchELF() { if [ -e "$prefix" ]; then find "$prefix" \( \ \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm /0100 \) \ + \( -type f -a -perm -0100 \) \ \) -print -exec patchelf --shrink-rpath '{}' \; fi stopNest diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 1c7ff5c49df..c0bfd42ce68 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done - find $out/usr/lib/plexmediaserver/Resources -type f -a -perm /0100 \ + find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index cab02f6573d..d84989d4372 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; preInstall = '' mkdir -p "$out"/{bin,lib,include} - find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';' + find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' ''; makeFlags = "PREFIX=$(out)"; meta = { From 090f27859ce2ae85396585bdb8b0056c1b1839b6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 11 Sep 2015 13:29:28 +0000 Subject: [PATCH 35/41] gettext: 0.19.5.1 -> 0.19.6 (close #9799) --- pkgs/development/libraries/gettext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a56795a4c15..874c767046b 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libiconv, xz }: stdenv.mkDerivation (rec { - name = "gettext-0.19.5.1"; + name = "gettext-0.19.6"; src = fetchurl { url = "mirror://gnu/gettext/${name}.tar.gz"; - sha256 = "0cbp498ckjwj7qr8b9pmkry8hkhldgkvg5yix8hi9c8z1hxxb651"; + sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd"; }; outputs = [ "out" "doc" ]; From d65776b6a61827790289301625e2f3afd9cb9de2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 12 Sep 2015 12:07:28 +0200 Subject: [PATCH 36/41] help2man: 1.47.1 -> 1.47.2 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2f811d9ae82..4386e7eaf74 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.1"; + name = "help2man-1.47.2"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "01ib718afwc28bmh1n0p5h7245vs3rrfm7bj1sq4avmh1kv2d6y5"; + sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; From f7cb16ff9b3b61ce2a829959bb878efe14bb4e26 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 12 Sep 2015 11:58:59 -0700 Subject: [PATCH 37/41] Revert "apple-sdk: add El Capitan impure-deps" This reverts commit 3bf5d87f9efe19c441a796afc054a5f4be6e83b1. --- pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index b1a3becac1a..e7f598f55a5 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -43,8 +43,6 @@ rec { ]; CoreGraphics = [ "/System/Library/Frameworks/CoreGraphics.framework" - "/System/Library/Frameworks/Metal.framework/Versions/A/Metal" - "/System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator" "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport" "/usr/lib/libbsm.0.dylib" "/usr/lib/libz.1.dylib" @@ -68,9 +66,7 @@ rec { ]; QuartzCore = [ "/System/Library/Frameworks/QuartzCore.framework" - "/System/Library/Frameworks/CoreImage.framework" "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport" - "/usr/lib/libFosl_dynamic.dylib" ]; PCSC = [ "/System/Library/Frameworks/PCSC.framework" @@ -108,10 +104,8 @@ rec { "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" - "/usr/lib/libChineseTokenizer.dylib" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" - "/usr/lib/libScreenReader.dylib" "/usr/lib/libarchive.2.dylib" "/usr/lib/libbsm.0.dylib" "/usr/lib/libbz2.1.0.dylib" @@ -125,7 +119,6 @@ rec { "/usr/lib/libicucore.A.dylib" "/usr/lib/liblangid.dylib" "/usr/lib/liblzma.5.dylib" - "/usr/lib/libmarisa.dylib" "/usr/lib/libmecabra.dylib" "/usr/lib/libpam.2.dylib" "/usr/lib/libresolv.9.dylib" @@ -145,7 +138,6 @@ rec { ]; CoreData = [ "/System/Library/Frameworks/CoreData.framework" - "/usr/lib/libcompression.dylib" ]; Cocoa = [ "/System/Library/Frameworks/Cocoa.framework" From b3b2928ca6c5c619a4ed5dcf5e56a8e90c2321f0 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 12 Sep 2015 11:59:08 -0700 Subject: [PATCH 38/41] Revert "libsecurity_generic: add El Capitan impure-deps" This reverts commit 557fa590426471723e05780666c79ed6afef5cb3. --- .../apple-source-releases/libsecurity_generic/impure_deps.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix index 266cded0d47..7725b9f3d1a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix @@ -40,7 +40,6 @@ "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata" "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices" "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit" - "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList" "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText" "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo" "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN" From baf20fbcab7938cb615e69b03fe8a8ca8dbb1788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2015 10:43:05 +0200 Subject: [PATCH 39/41] mesa: maintenance update 10.6.6 -> 10.6.7 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 44095856fd7..96dad654de8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "10.6.6"; + version = "10.6.7"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778"; + sha256 = "feb1f640b915dada88a7c793dfaff0ae23580f8903f87a6b76469253de0d28d8"; }; prePatch = "patchShebangs ."; From 8ab4c20998cb7eb64715f3d5ae7b05c9af7d9c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 13 Sep 2015 10:44:27 +0200 Subject: [PATCH 40/41] xorg.{libXi,libxcb}: maintenance update --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/extra.list | 2 +- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f9ea1fb4a29..b9bc2838f8f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -725,11 +725,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.4"; + name = "libXi-1.7.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2; - sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc"; + url = mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2; + sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -925,11 +925,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.11"; + name = "libxcb-1.11.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2; - sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3"; + url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2; + sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 8a445a69c69..80b5e14d8c3 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,5 +1,5 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 3ab0a599ec3..67e125528c9 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -70,7 +70,7 @@ mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 From a6f6c0eeeb45ad122022366724e396955f0f775b Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 12 Sep 2015 23:35:48 -0700 Subject: [PATCH 41/41] libxcb: add xinput support (close #9835) --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c1a8fec596f..ce743bffe72 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -72,7 +72,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; - configureFlags = "--enable-xkb"; + configureFlags = "--enable-xkb --enable-xinput"; outputs = [ "out" "doc" "man" ]; };