From 1708c369facc6809fb24abf01289145d7ad3b5c4 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 11 Sep 2016 12:17:28 +0200 Subject: [PATCH 01/67] texinfo: 6.1 -> 6.3 See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00004.html for release anouncement --- pkgs/development/tools/misc/texinfo/{6.1.nix => 6.3.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/tools/misc/texinfo/{6.1.nix => 6.3.nix} (94%) diff --git a/pkgs/development/tools/misc/texinfo/6.1.nix b/pkgs/development/tools/misc/texinfo/6.3.nix similarity index 94% rename from pkgs/development/tools/misc/texinfo/6.1.nix rename to pkgs/development/tools/misc/texinfo/6.3.nix index e3001ffba7b..b75878b8d33 100644 --- a/pkgs/development/tools/misc/texinfo/6.1.nix +++ b/pkgs/development/tools/misc/texinfo/6.3.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "texinfo-6.1"; + name = "texinfo-6.3"; src = fetchurl { url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"; + sha256 = "0fpr9kdjjl6nj2pc50k2zr7134hvqz8bi8pfqa7131a9lpzz6v14"; }; buildInputs = [ perl xz ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9da086a1565..2003e55d991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6784,7 +6784,7 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.1.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.3.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } From 3ba99f83a7acd8644880b62aea5e3b31e1f1b57a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 12 Sep 2016 02:28:26 +0200 Subject: [PATCH 02/67] glibc: enable stackprotection hardening Enables previously manually disabled stackprotector and stackguard randomization. From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511811: If glibc is built with the --enable-stackguard-randomization option, each application gets a random canary value (at runtime) from /dev/urandom. If --enable-stackguard-randomization is absent, applications get a static canary value of "0xff0a0000". This is very unfortunate, because the attacker may be able to bypass the stack protection mechanism, by placing those 4 bytes in the canary word, before the actual canary check is performed (for example in memcpy-based buffer overflows). --- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/glibc/default.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 15c455b7afb..4e03293fdf9 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--enable-obsolete-rpc" "--sysconfdir=/etc" - "libc_cv_ssp=no" + "--enable-stackguard-randomization" (if linuxHeaders != null then "--with-headers=${linuxHeaders}/include" else "--without-headers") diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1c116c8d987..d6c496819da 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -33,6 +33,9 @@ in makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") ''; + # The stackprotector and fortify hardening flags are autodetected by glibc + # and enabled by default if supported. Setting it for every gcc invocation + # does not work. hardeningDisable = [ "stackprotector" "fortify" ]; # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for From 7b9d3f860588c5157ec9cb2a325e9e16a2ab6e17 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 12 Sep 2016 01:46:17 -0400 Subject: [PATCH 03/67] stdenv-darwin: upgrade a few more things It's a long build and generally painful to split into smaller commits, so I apologize for lumping many changes into one commit but this is far easier. There are still several outdated parts of the darwin stdenv but these changes should bring us closer to the goal. Fixes #18461 --- .../compilers/llvm/3.8/clang/default.nix | 8 ++++++++ .../interpreters/python/cpython/2.7/default.nix | 10 +++++++++- .../darwin/apple-source-releases/default.nix | 14 ++------------ .../apple-source-releases/libiconv/default.nix | 10 ---------- pkgs/os-specific/darwin/cctools/port.nix | 6 +++--- pkgs/stdenv/darwin/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 30 insertions(+), 34 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 71420d4cdcc..cc6cfd64fd0 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -30,12 +30,20 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; + outputs = [ "out" "python" ]; + # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view,set-xcode-analyzer} $python/bin + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test ''; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5f15db26ebc..5c61b9777c8 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, self, callPackage, python27Packages +{ stdenv, fetchurl, fetchpatch, self, callPackage, python27Packages , bzip2, openssl, gettext , includeModules ? false @@ -44,6 +44,14 @@ let ./deterministic-build.patch ./properly-detect-curses.patch + + # FIXME: get rid of this after the next release, when the commit referenced here makes + # it in. We need it until then because it breaks compilation of programs that use + # locale with clang 3.8 and higher. + (fetchpatch { + url = "https://hg.python.org/cpython/raw-rev/e0ec3471cb09"; + sha256 = "1jdgb70jw942r4kmr01qll7mk1di8jx0qiabmp20jhnmha246ivq"; + }) ] ++ optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d7710abf291..b8a748e6f8d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -10,6 +10,7 @@ let dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; + libiconv = "44"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -204,7 +205,7 @@ let Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; libclosure = applePackage "libclosure" "osx-10.10.5" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; - libiconv = applePackage "libiconv" "osx-10.9.5" "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {}; + libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; Libnotify = applePackage "Libnotify" "osx-10.9.5" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; @@ -220,17 +221,6 @@ let Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; - # Pending work... we can't change the above packages in place because the bootstrap depends on them, so we detach the expressions - # here so we can work on them. - CF_new = applePackage "CF/new.nix" "osx-10.10.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil50vyyidxsyk1iyfzqsvln" {}; - Libc_new = applePackage "Libc/new.nix" "osx-10.10.5" "1jz5bx9l4q484vn08c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {}; - libdispatch_new = applePackage "libdispatch/new.nix" "osx-10.10.5" "1lc5033cmkwxy0r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; - libiconv_new = applePackage "libiconv/new.nix" "osx-10.10.5" "0sni1gx6i2h7r404hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {}; - Libnotify_new = applePackage "Libnotify/new.nix" "osx-10.10.5" "0sni1gx6i2h7r404hhwbxdir45cp039m4wi70izh4l0pfw7gywad" {}; - Libsystem_new = applePackage "Libsystem/new.nix" "osx-10.10.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim10w43x4lvz4qydpp5kg2rh" {}; - objc4_new = applePackage "objc4/new.nix" "osx-10.10.5" "0r0797ckmgv19if4i14dzyjh7i5klkm9jpacjif9v3rpycyyx1n3" {}; - xnu_new = applePackage "xnu/new.nix" "osx-10.11.2" "1ax280jblz7laqam8fcwrffrrz26am10p1va9mlg9mklvbqarhqh" {}; - libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; libsecurity_apple_file_dl = libsecPackage "libsecurity_apple_file_dl" "osx-10.7.5" "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 5b82835d3e6..bc514d617bd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -2,14 +2,4 @@ appleDerivation { preConfigure = "cd libiconv"; - - postInstall = '' - mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib - - ld -dylib -o $out/lib/libiconv.dylib \ - -reexport_library $out/lib/libiconv-nocharset.dylib \ - -reexport_library $out/lib/libcharset.dylib \ - -dylib_compatibility_version 7.0.0 - ''; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bc6492f243f..af713bf61dd 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -6,13 +6,13 @@ let baseParams = rec { name = "cctools-port-${version}"; - version = "877.5"; + version = "886"; src = fetchFromGitHub { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "7d405492b09fa27546caaa989b8493829365deab"; - sha256 = "0nj1q5bqdx5jm68dispybxc7wnkb6p8p2igpnap9q6qyv2r9p07w"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; }; buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++ diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 09d9ed23b3f..227ddfa8a69 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -6,14 +6,14 @@ # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/45ea46c1894f8fcc545ca9f367ba54c8c280b762/${file}"; inherit sha256 system executable; }; in { - sh = fetch { file = "sh"; sha256 = "1siix3wakzil31r2cydmh3v8a1nyq4605dwiabqc5lx73j4xzrzi"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "0zvqm977k11b5cl4ixxb5h0ds24g6z0f8m28z4pqxzpa353lqbla"; }; - mkdir = fetch { file = "mkdir"; sha256 = "13frk8lsfgzlb65p9l26cvxf06aag43yjk7vg9msn7ix3v8cmrg1"; }; - cpio = fetch { file = "cpio"; sha256 = "0ms5i9m1vdksj575sf1djwgm7zhnvfrrb44dxnfh9avr793rc2w4"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1lz1b0grl4642h6n635xvi6imf0yyy1zyzdr9ing5aphzz0z5iic"; executable = false; }; + sh = fetch { file = "sh"; sha256 = "1qpg16qbqqkmcr5an4d73p6q55izhlzmdd3nvid8gp7f3f9spbz7"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "1g67sh51fa2ws9wch5gznvrmmh27mks3dbnp6gvac43qxdnv6mpz"; }; + mkdir = fetch { file = "mkdir"; sha256 = "1lkp6y33lsrj9yif1cfrw5g021pffynrdscrz3ds19hslg55w4dw"; }; + cpio = fetch { file = "cpio"; sha256 = "115pgrl0pcq2h4yfqrmfvffl0dcabw4mgkc91aphd913wrzfmlz9"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1h5dr8vk7dvvbdkpszpd6zkx3799zccsflnw35wvmjc2fp0dyyd5"; executable = false; }; } }: @@ -128,7 +128,7 @@ in rec { ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/3.6/libc++/setup-hook.sh; + setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; }; libcxxabi = stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9262c8c144a..442bcb44556 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4933,7 +4933,7 @@ in llvm_35 = self.llvmPackages_35.llvm; llvm_34 = self.llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs self.llvmPackages_37; + llvmPackages = recurseIntoAttrs (if stdenv.isDarwin then self.llvmPackages_38 else self.llvmPackages_37); llvmPackagesSelf = self.llvmPackages_34.override { stdenv = libcxxStdenv; From 31e79c547811e7407510c28e7b3dd0437844ea25 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 12 Sep 2016 03:40:53 -0400 Subject: [PATCH 04/67] stdenv-darwin: upgrade a couple more constituents --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index b8a748e6f8d..f6e044310b0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -11,6 +11,8 @@ let xnu = "3248.60.10"; libpthread = "138.10.4"; libiconv = "44"; + Libnotify = "150.40.1"; + objc4 = "680"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -208,14 +210,14 @@ let libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; - Libnotify = applePackage "Libnotify" "osx-10.9.5" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; + Libnotify = applePackage "Libnotify" "osx-10.11.6" "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {}; libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; libresolv = applePackage "libresolv" "osx-10.10.5" "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libutil = applePackage "libutil" "osx-10.10.5" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; libunwind = applePackage "libunwind" "osx-10.10.5" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.10.5" "1h4jin7ya1ih7v0hksi7gfmbv767pv8wsyyv1qfy2xw36x8wnds7" {}; - objc4 = applePackage "objc4" "osx-10.9.5" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; + objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; ppp = applePackage "ppp" "osx-10.10.5" "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {}; removefile = applePackage "removefile" "osx-10.10.5" "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; From e6ea302c47c58c2ad525263305853b03739df34d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 12 Sep 2016 08:53:46 -0400 Subject: [PATCH 05/67] apple-source-releases: upgrade a bunch of stuff --- .../darwin/apple-source-releases/default.nix | 83 +++++++++---------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index f6e044310b0..e1681211afc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -13,37 +13,33 @@ let libiconv = "44"; Libnotify = "150.40.1"; objc4 = "680"; + eap8021x = "222.40.1"; + dyld = "360.22"; + architecture = "268"; + CommonCrypto = "60075.50.1"; + copyfile = "127"; + Csu = "85"; + ppp = "809.50.2"; + libclosure = "65"; + Libinfo = "477.50.4"; + removefile = "41"; + libresolv = "60"; + + # Their release page is a bit of a mess here, so I'm going to lie a bit and say this version + # is the right one, even though it isn't. The version I have here doesn't appear to be linked + # to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and + # neither of those versions are publicly available. + mDNSResponder = "625.41.2"; + + libutil = "43"; + libunwind = "35.3"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ }; "osx-10.10.5" = { adv_cmds = "158"; - architecture = "266"; - CF = "1153.18"; - CommonCrypto = "60061.30.1"; - copyfile = "118.1.2"; - Csu = "85"; - dyld = "353.2.3"; - eap8021x = "198.30.1"; - libauto = "186"; - Libc = "1044.40.1"; - libclosure = "65"; - libdispatch = "442.1.4"; - libiconv = "42"; - Libinfo = "459.40.1"; - Libnotify = "133.1.1"; - libpthread = "105.40.1"; - libresolv = "57"; - Libsystem = "1213"; - libunwind = "35.3"; - libutil = "38"; - mDNSResponder = "576.30.4"; - objc4 = "647"; - ppp = "786.40.2"; - removefile = "35"; Security = "57031.40.6"; - xnu = "2782.40.9"; IOAudioFamily = "203.3"; IOFireWireFamily = "458"; @@ -65,15 +61,11 @@ let CF = "855.17"; launchd = "842.92.1"; libauto = "185.5"; - Libc = "997.90.3"; + Libc = "997.90.3"; # We use this, but not from here libdispatch = "339.92.1"; - libiconv = "41"; - Libnotify = "121.20.1"; Libsystem = "1197.1.1"; - objc4 = "551.1"; Security = "55471.14.18"; security_dotmac_tp = "55107.1"; - xnu = "2422.115.4"; IOStorageFamily = "172"; }; @@ -181,21 +173,20 @@ let packages = { inherit (adv_cmds) ps locale; - architecture = applePackage "architecture" "osx-10.10.5" "0fc9s1f4mnzaixrmkkq9y8276g8i5grryh2dggi4h347i33kd097" {}; + architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; - CommonCrypto = applePackage "CommonCrypto" "osx-10.10.5" "0rm1r552i3mhyik2y3309dw90ap6vlhk583237jxfmdkip4c6mdr" {}; + CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; - copyfile = applePackage "copyfile" "osx-10.10.5" "1s90wv9jsi6ismdnc1my3rxaa83k3s5ialrs5xlrmyb7s0pgvz7j" {}; + copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; CoreOSMakefiles = applePackage "CoreOSMakefiles" "osx-10.5" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; - Csu = applePackage "Csu" "osx-10.10.5" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; - dtrace = applePackage "dtrace" "osx-10.10.5" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; - dtracen = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; - dyld = applePackage "dyld" "osx-10.10.5" "167f74ln8pmfimwn6kwh199ylvy3fw72fd15da94mf34ii0zar6k" {}; - eap8021x = applePackage "eap8021x" "osx-10.10.5" "1f37dpbcgrd1b14nrv2lpqrkap74myjbparz9masx92df6kcn7l2" {}; - IOKit = applePackage "IOKit" "osx-10.10.5" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; }; + Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; + dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; + dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; + eap8021x = applePackage "eap8021x" "osx-10.11.6" "15bbgjhi8l7hbib41gqcldzbf3hf6105jbwc745hp1gmrscw4zch" {}; + IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; Libc = applePackage "Libc" "osx-10.11.5" "1qv7r0dgz06jy9i5agbqzxgdibb0m8ylki6g5n5pary88lzrawfd" { @@ -205,21 +196,21 @@ let }; }; Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; - libclosure = applePackage "libclosure" "osx-10.10.5" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; + libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; - Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; + Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; Libnotify = applePackage "Libnotify" "osx-10.11.6" "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {}; libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; - libresolv = applePackage "libresolv" "osx-10.10.5" "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {}; + libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; - libutil = applePackage "libutil" "osx-10.10.5" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; - libunwind = applePackage "libunwind" "osx-10.10.5" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; - mDNSResponder = applePackage "mDNSResponder" "osx-10.10.5" "1h4jin7ya1ih7v0hksi7gfmbv767pv8wsyyv1qfy2xw36x8wnds7" {}; + libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk10" {}; + mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; - ppp = applePackage "ppp" "osx-10.10.5" "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {}; - removefile = applePackage "removefile" "osx-10.10.5" "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {}; + ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; + removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; From 8c4a70bcb105180e7c0fe175398595b36af273be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Sep 2016 21:28:26 +0200 Subject: [PATCH 06/67] gcc48: fixup build after texinfo bump (in parent) --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72cc6f3c6dd..87a97b00098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4563,6 +4563,7 @@ in libcCross = if crossSystem != null then libcCross else null; isl = isl_0_14; + texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump })); gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { From e0974c894817bd31185e02fd0e59db1c0658dfc7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 13 Sep 2016 22:04:31 +0200 Subject: [PATCH 07/67] db: fixes for darwin build with libc++-3.8 --- pkgs/development/libraries/db/clang-5.3.patch | 129 +++++++++++++++++- 1 file changed, 125 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 438fa7eedd7..635b9dc076a 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -1,6 +1,17 @@ ---- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 -+++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 -@@ -144,7 +144,7 @@ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 6a858f7..9f338dc 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ @@ -9,7 +20,7 @@ static inline int __atomic_inc(db_atomic_t *p) { int temp; -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html * which configure could be changed to use. */ @@ -18,3 +29,113 @@ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 16de695..d0dcc29 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 770bad8..e28cce0 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4952030..47645f8 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -302,7 +302,7 @@ no_prealloc: + } else + hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 09353b0..177353c 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 106b161..fc4de9d 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); From aa0fa193734a0bb9c1ee156317008d7409647bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Sep 2016 23:51:25 +0200 Subject: [PATCH 08/67] gtk2: move gtk-update-icon-cache to gtk2.out ... to be useful for regeneration when building nixos environments. Fixes #18536 (hopefully). --- nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +- pkgs/data/icons/tango-icon-theme/default.nix | 2 +- pkgs/development/libraries/gtk+/2.x.nix | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 634d2a39576..387046bd538 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -69,7 +69,7 @@ in services.xserver.updateDbusEnvironment = true; environment.systemPackages = - [ pkgs.gtk # To get GTK+'s themes. + [ pkgs.gtk.out # To get GTK+'s themes and gtk-update-icon-cache pkgs.hicolor_icon_theme pkgs.tango-icon-theme pkgs.shared_mime_info diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 55be87c9ab7..0004302ab97 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-png-creation"; - postInstall = '''${gtk.dev}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; + postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; meta = { description = "A basic set of icons"; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index df645f10961..91407e556c0 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk-update-icon-cache "$out" ''; passthru = { From 10dae237c6364576e926dc72fc559b94a2d30ad4 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Sep 2016 00:05:58 +0200 Subject: [PATCH 09/67] db: now builds on darwin with libc++-3.8 --- pkgs/development/libraries/db/clang-5.3.patch | 13 +++++++++++++ pkgs/development/libraries/db/db-5.3.nix | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 635b9dc076a..0a0993da13e 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -38,6 +38,19 @@ index 6a858f7..9f338dc 100644 #else #define atomic_inc(env, p) __atomic_inc(env, p) #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/src/dbinc/db.in b/src/dbinc/db.in +index 92ac822..f80428e 100644 +--- a/src/dbinc/db.in ++++ b/src/dbinc/db.in +@@ -2782,7 +2782,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c index 16de695..d0dcc29 100644 --- a/src/mp/mp_fget.c diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 98002c24461..91adfa24b58 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,9 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; branch = "5.3"; + # https://community.oracle.com/thread/3952592 + # this patch renames some sybols that conflict with libc++-3.8 + # symbols: atomic_compare_exchange, atomic_init, store + extraPatches = [ ./clang-5.3.patch ]; }) From 28a0da5edc23b8af5396f1725a05965a81ab3513 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Sep 2016 00:42:07 +0200 Subject: [PATCH 10/67] darwin.libunwind: fix incorrect sha256 --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index e1681211afc..2ebb8868a2e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -206,7 +206,7 @@ let libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; - libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk10" {}; + libunwind = applePackage "libunwind" "osx-10.11.6" "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; From ff945c5c83f27e087ccc0b035cd3e6605340bd61 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 14 Sep 2016 01:02:01 -0400 Subject: [PATCH 11/67] stdenv-darwin: downgrade default LLVM back to 3.7 The 3.8 upgrade was premature and appears to be breaking a load of stuff that I can't look into right now. Will take it back to 3.8 and test more thoroughly before pushing more broadly. I should learn to change fewer variables at a time :) --- pkgs/stdenv/darwin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 227ddfa8a69..b530b7578e8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -6,14 +6,14 @@ # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/45ea46c1894f8fcc545ca9f367ba54c8c280b762/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/62540508837664e9b366e36d1265502db4329a6e/${file}"; inherit sha256 system executable; }; in { sh = fetch { file = "sh"; sha256 = "1qpg16qbqqkmcr5an4d73p6q55izhlzmdd3nvid8gp7f3f9spbz7"; }; bzip2 = fetch { file = "bzip2"; sha256 = "1g67sh51fa2ws9wch5gznvrmmh27mks3dbnp6gvac43qxdnv6mpz"; }; mkdir = fetch { file = "mkdir"; sha256 = "1lkp6y33lsrj9yif1cfrw5g021pffynrdscrz3ds19hslg55w4dw"; }; cpio = fetch { file = "cpio"; sha256 = "115pgrl0pcq2h4yfqrmfvffl0dcabw4mgkc91aphd913wrzfmlz9"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1h5dr8vk7dvvbdkpszpd6zkx3799zccsflnw35wvmjc2fp0dyyd5"; executable = false; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1ak16xrj41l15ads5l2kfgbyrb1lczzhmi8nln5h0np8r3w9frw9"; executable = false; }; } }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87a97b00098..fa34bd2a4ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4934,7 +4934,7 @@ in llvm_35 = self.llvmPackages_35.llvm; llvm_34 = self.llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs (if stdenv.isDarwin then self.llvmPackages_38 else self.llvmPackages_37); + llvmPackages = recurseIntoAttrs self.llvmPackages_37; llvmPackagesSelf = self.llvmPackages_34.override { stdenv = libcxxStdenv; From 4ecd0e74348d25f9942b6eda32ddcd5926b5a379 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Sep 2016 08:25:51 +0200 Subject: [PATCH 12/67] curl: 7.50.1 -> 7.50.3, fix CVE-2016-7167 --- 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 58f72615e8e..958bea34e7d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.1"; + name = "curl-7.50.3"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; + sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 46790f360d55bb3940dba47809d0cc6ec917b24b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Sep 2016 10:02:55 +0200 Subject: [PATCH 13/67] perlPackages.WWWCurl: fix build due to curl 5.10.3 The define CURL_STRICTER is only set if CURL_NO_OLDIES is set, but that breaks compatibility with this package. Defining CURL_STRICTER is enough to fix the build. --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b04e1ea06a..e5a8b770fde 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14167,6 +14167,7 @@ let self = _self // overrides; _self = with self; { substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' substituteInPlace Makefile.PL --replace '_LASTENTRY\z' '_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z' ''; + NIX_CFLAGS_COMPILE = "-DCURL_STRICTER"; doCheck = false; # performs network access }; From 45cd1ea620398d7981c9d7c7b8e50d15d99830fa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 1 Sep 2016 09:50:30 -0500 Subject: [PATCH 14/67] gcc: --enable-bootstrap on Darwin This seems to be working now. ISL needs to be disable for it to build completely though. --- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 991d4fc883f..65b357d4c7a 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -170,7 +170,7 @@ let version = "4.6.4"; "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; in diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e4e38022a6b..41b29400dd8 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -198,7 +198,7 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; in diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 01755a74e1e..f758a1e172e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -202,7 +202,7 @@ let version = "4.9.4"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f5c69d24d63..0f8a0bbf794 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -202,7 +202,7 @@ let version = "5.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 129bde908fa..6a1616154cb 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -201,7 +201,7 @@ let version = "6.2.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02f5abcb5f4..35bd07a59d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4572,7 +4572,7 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; })); gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { @@ -4587,9 +4587,9 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_11; + isl = if !stdenv.isDarwin then isl_0_11 else null; - cloog = cloog_0_18_0; + cloog = if !stdenv.isDarwin then cloog_0_18_0 else null; })); gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 { @@ -4604,7 +4604,7 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; })); gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { @@ -4619,7 +4619,7 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; })); gfortran = if !stdenv.isDarwin then gfortran5 From f2e753a90c3f7a9e715216501b9b0f95e766701f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 5 Sep 2016 15:41:30 -0500 Subject: [PATCH 15/67] gcc: fix gmp, mpfr includes This should get gcc48, gcc5, and gcc6 working again. Also: use makeLibraryPath, and makeSearchPathOutput for LIBRARY_PATH and CPATH. This is a refactor but it also fixes an issue with zlib. --- .../development/compilers/gcc/4.5/default.nix | 38 ++++++++--------- .../development/compilers/gcc/4.8/default.nix | 42 +++++++++---------- .../development/compilers/gcc/4.9/default.nix | 36 ++++++++-------- pkgs/development/compilers/gcc/5/default.nix | 42 +++++++++---------- pkgs/development/compilers/gcc/6/default.nix | 42 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 6 files changed, 99 insertions(+), 102 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 5d05410a7fd..12e7e23e90b 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -332,28 +332,26 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && - hasAttr "propagatedBuildInputs" libcCross) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && + hasAttr "propagatedBuildInputs" libcCross) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 41b29400dd8..cf06fe9567e 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -332,8 +332,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -454,27 +456,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f758a1e172e..a746b7e12b3 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -463,27 +463,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0f8a0bbf794..6f8a32a7bfc 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -337,8 +337,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -458,27 +460,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 6a1616154cb..57172a2d9db 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -335,8 +335,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -456,27 +458,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPath "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35bd07a59d2..ad5f72d7d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4573,6 +4573,7 @@ in libcCross = if crossSystem != null then libcCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; + cloog = if !stdenv.isDarwin then cloog else null; })); gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { From cf004ae56ee8261c9e5070e83ee14fc21f8e58d6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 6 Sep 2016 13:54:13 -0500 Subject: [PATCH 16/67] gcc: add --with-native-system-header-dir for clang gcc needs to be able find system headers. Without this, gcc fails to build because /usr/include is not available. Note: stdenv.libc should be available for all stdenv's, I think. --- pkgs/development/compilers/gcc/4.8/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.9/default.nix | 4 ++-- pkgs/development/compilers/gcc/5/default.nix | 4 ++-- pkgs/development/compilers/gcc/6/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index cf06fe9567e..1b9e4bf666c 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -357,8 +357,8 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index a746b7e12b3..71edda0937f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -364,8 +364,8 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 6f8a32a7bfc..e84c677408c 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -362,8 +362,8 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 57172a2d9db..b33437ee868 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -360,8 +360,8 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} From f760e980f0b682c71baaa3362b920f2a101988a3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Sep 2016 00:15:30 -0500 Subject: [PATCH 17/67] gcc4.5: allow empty libc-ldflags --- pkgs/development/compilers/gcc/4.6/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index 6087bb30cfb..6a3d93820cf 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/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)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags || true) $(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 From c7e0fbcbc80c402ce53a9677b11a01d792b80c0d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Sep 2016 00:17:46 -0500 Subject: [PATCH 18/67] gcc4.6: remove from tree This isn't available from all-packages, so I think it's okay to remove. It's unclear how to keep this updated with the changes. --- pkgs/development/compilers/gcc/4.6/builder.sh | 262 --------- .../development/compilers/gcc/4.6/default.nix | 530 ------------------ .../compilers/gcc/4.6/ghdl-ortho-cflags.patch | 111 ---- .../compilers/gcc/4.6/hurd-sigrtmin.patch | 14 - .../compilers/gcc/4.6/no-sys-dirs.patch | 54 -- .../development/compilers/gcc/4.6/sources.nix | 27 - 6 files changed, 998 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/4.6/builder.sh delete mode 100644 pkgs/development/compilers/gcc/4.6/default.nix delete mode 100644 pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch delete mode 100644 pkgs/development/compilers/gcc/4.6/sources.nix diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh deleted file mode 100644 index 6a3d93820cf..00000000000 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ /dev/null @@ -1,262 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$staticCompiler" = "1"; then - EXTRA_LDFLAGS="-static" -else - EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" -fi - - -# GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_CC/nix-support/orig-libc; 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 || true) $(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 - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$libc_dev/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" - - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi - - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" - done - - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" - EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" - fi - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" - else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # 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_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done - fi - fi - - - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find - # the startfiles. - # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx - # for the startfiles. - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - - if test -z "$targetConfig"; then - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - fi - - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then - # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stagae - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=false \ - ) - else - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=true \ - ) - fi -fi - -if test -n "$targetConfig"; then - # The host strip will destroy some important details of the objects - dontStrip=1 -fi - - -preConfigure() { - if test -n "$newlibSrc"; then - tar xvf "$newlibSrc" -C .. - ln -s ../newlib-*/newlib newlib - # Patch to get armvt5el working: - sed -i -e 's/ arm)/ arm*)/' newlib/configure.host - fi - # Bug - they packaged zlib - if test -d "zlib"; then - # This breaks the build without-headers, which should build only - # the target libgcc as target libraries. - # See 'configure:5370' - rm -Rf zlib - fi - - if test -f "$NIX_CC/nix-support/orig-libc"; then - # Patch the configure script so it finds glibc headers. It's - # important for example in order not to get libssp built, - # because its functionality is in glibc already. - sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \ - gcc/configure - fi - - if test -n "$crossMingw" -a -n "$crossStageStatic"; then - mkdir -p ../mingw - # --with-build-sysroot expects that: - cp -R $libcCross/include ../mingw - configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." - fi - - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile -} - - -preInstall() { - # Make ‘lib64’ a symlink to ‘lib’. - if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p $out/lib - ln -s lib $out/lib64 - fi -} - - -postInstall() { - # Move runtime libraries to $lib. - mkdir -p $lib/lib - ln -s lib $lib/lib64 - moveToOutput "lib/lib*.so" "$lib" - moveToOutput "lib/lib*.so.*[0-9]" "$lib" - moveToOutput "lib/*.la" "$lib" - for i in $lib/lib/*.la; do - substituteInPlace $i --replace $out $lib - done - - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $out/libexec/gcc/*/*/*; do - if PREV_RPATH=`patchelf --print-rpath $i`; then - patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i - fi - done - - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux} - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Disable RANDMMAP on grsec, which causes segfaults when using - # precompiled headers. - # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 - paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} - - eval "$postInstallGhdl" -} - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix deleted file mode 100644 index 65b357d4c7a..00000000000 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ /dev/null @@ -1,530 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, langJava ? false -, langAda ? false -, langVhdl ? false -, langGo ? false -, profiledCompiler ? false -, staticCompiler ? false -, enableShared ? true -, texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which -, libelf # optional, for link-time optimizations (LTO) -, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. -, zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null -, gnatboot ? null -, enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins -, name ? "gcc" -, cross ? null -, binutilsCross ? null -, libcCross ? null -, crossStageStatic ? true -, gnat ? null -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true -, gnused ? null -}: - -assert langJava -> zip != null && unzip != null - && zlib != null && boehmgc != null - && perl != null; # for `--enable-java-home' -assert langAda -> gnatboot != null; -assert langVhdl -> gnat != null; - -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - -# Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; - -with stdenv.lib; -with builtins; - -let version = "4.6.4"; - - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = cross != null && cross.config == "i586-pc-gnu"; - - patches = [ ] - ++ optional (cross != null) ../libstdc++-target.patch - ++ optional noSysDirs ./no-sys-dirs.patch - # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its - # target libraries and tools. - ++ optional langAda ../gnat-cflags.patch - ++ optional langVhdl ./ghdl-ortho-cflags.patch - ++ optional langFortran ../gfortran-driving.patch - ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; - - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = http://www.antlr.org/download/antlr-3.1.3.jar; - sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; - }; - - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto - ]; - - javaAwtGtk = langJava && gtk2 != null; - - /* Platform flags */ - platformFlags = let - gccArch = stdenv.lib.attrByPath [ "platform" "gcc" "arch" ] null stdenv; - gccCpu = stdenv.lib.attrByPath [ "platform" "gcc" "cpu" ] null stdenv; - gccAbi = stdenv.lib.attrByPath [ "platform" "gcc" "abi" ] null stdenv; - gccFpu = stdenv.lib.attrByPath [ "platform" "gcc" "fpu" ] null stdenv; - gccFloat = stdenv.lib.attrByPath [ "platform" "gcc" "float" ] null stdenv; - withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; - withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; - withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; - withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; - withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; - in - (withArch + - withCpu + - withAbi + - withFpu + - withFloat); - - /* Cross-gcc settings */ - crossMingw = (cross != null && cross.libc == "msvcrt"); - crossConfigureFlags = let - gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; - gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; - gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross; - withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; - withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; - withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; - withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; - in - "--target=${cross.config}" + - withArch + - withCpu + - withAbi + - withFpu + - (if crossMingw && crossStageStatic then - " --with-headers=${libcCross}/include" + - " --with-gcc" + - " --with-gnu-as" + - " --with-gnu-ld" + - " --with-gnu-ld" + - " --disable-shared" + - " --disable-nls" + - " --disable-debug" + - " --enable-sjlj-exceptions" + - " --enable-threads=win32" + - " --disable-win32-registry" - else if crossStageStatic then - " --disable-libssp --disable-nls" + - " --without-headers" + - " --disable-threads " + - " --disable-libmudflap " + - " --disable-libgomp " + - " --disable-libquadmath" + - " --disable-shared" + - " --disable-decimal-float" # libdecnumber requires libc - else - " --with-headers=${libcCross}/include" + - " --enable-__cxa_atexit" + - " --enable-long-long" + - (if crossMingw then - " --enable-threads=win32" + - " --enable-sjlj-exceptions" + - " --enable-hash-synchronization" + - " --disable-libssp" + - " --disable-nls" + - " --with-dwarf2" + - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - " --disable-shared" + - # To keep ABI compatibility with upstream mingw-w64 - " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - " --disable-libgomp" else "") + - " --enable-threads=posix" + - " --enable-nls" + - " --disable-decimal-float") # No final libdecnumber (it may work only in 386) - ); - stageNameAddon = if crossStageStatic then "-stage-static" else - "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; - -in - -# We need all these X libraries when building AWT with GTK+. -assert gtk2 != null -> (filter (x: x == null) xlibs) == []; - -stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; - - builder = ./builder.sh; - - srcs = (import ./sources.nix) { - inherit fetchurl optional version; - inherit langC langCC langFortran langJava langAda langGo; - }; - - outputs = [ "out" "lib" ]; - - setOutputFlags = false; - - inherit patches enableMultilib; - - hardeningDisable = [ "format" ]; - - libc_dev = stdenv.cc.libc_dev; - - postPatch = - if (stdenv.isGNU - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - i386_gnu_h = "gcc/config/i386/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${i386_gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - sed -i gcc/config/t-gnu \ - -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g' - '' - else if cross != null || stdenv.cc.libc != null then - # On NixOS, use the right path to the dynamic linker instead of - # `/lib/ld*.so'. - let - libc = if libcCross != null then libcCross else stdenv.cc.libc; - in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." - for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h - do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue - echo " fixing \`$header'..." - sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' - done - '' - else null; - - inherit noSysDirs staticCompiler langJava crossStageStatic - libcCross crossMingw; - - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); - - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) - ++ (optional (cloog != null) cloog) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) - ++ (optionals langAda [gnatboot]) - ++ (optionals langVhdl [gnat]) - - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) - ; - - configureFlagsArray = stdenv.lib.optionals - (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) - [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; - - configureFlags = " - ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if enablePlugin then "--enable-plugin" else ""} - ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloog != null then - "--with-cloog=${cloog} --enable-cloog-backend=isl" - else ""} - ${if langJava then - "--with-ecj-jar=${javaEcj} " + - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # . - "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " - else ""} - ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} - --with-mpc=${libmpc} - ${if libelf != null then "--with-libelf=${libelf}" else ""} - --disable-libstdcxx-pch - --without-included-gettext - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - } - ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} - ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} - "; - - targetConfig = if cross != null then cross.config else null; - - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; - - installTargets = - if stripped - then "install-strip" - else "install"; - - crossAttrs = { - patches = patches ++ [ ./hurd-sigrtmin.patch ]; - postPatch = ""; - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; - dontStrip = true; - configureFlags = '' - ${if enableMultilib then "" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} - ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} - ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} - --with-gmp=${gmp.crossDrv} - --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} - --disable-libstdcxx-pch - --without-included-gettext - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - } - ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} - --target=${stdenv.cross.config} - ''; - buildFlags = ""; - }; - - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; - CC = "gcc"; - - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. - # - # Likewise, the LTO code doesn't find zlib. - - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && - hasAttr "propagatedBuildInputs" libcCross) - libcCross.propagatedBuildInputs))); - - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); - - EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; - - EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; - - passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; isGNU = true; }; - - enableParallelBuilding = false; - - inherit (stdenv) is64bit; - - meta = { - homepage = http://gcc.gnu.org/; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = [ - stdenv.lib.maintainers.viric - ]; - - # Volunteers needed for the {Cyg,Dar}win ports of *PPL. - # gnatboot is not available out of linux platforms, so we disable the darwin build - # for the gnat (ada compiler). - platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - optionals (langAda == false) stdenv.lib.platforms.darwin; - }; -} - -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } - -// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } - -// optionalAttrs langVhdl rec { - name = "ghdl-0.29"; - - ghdlSrc = fetchurl { - url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2"; - sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva"; - }; - - # Ghdl has some timestamps checks, storing file timestamps in '.cf' files. - # As we will change the timestamps to 1970-01-01 00:00:01, we also set the - # content of that .cf to that value. This way ghdl does not complain on - # the installed object files from the basic libraries (ieee, ...) - postInstallGhdl = '' - pushd $out - find . -name "*.cf" -exec \ - sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \; - popd - ''; - - postUnpack = '' - tar xvf ${ghdlSrc} - mv ghdl-*/vhdl gcc*/gcc - rm -Rf ghdl-* - ''; - - meta = { - homepage = "http://ghdl.free.fr/"; - license = stdenv.lib.licenses.gpl2Plus; - description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - -}) diff --git a/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch deleted file mode 100644 index 901534591c8..00000000000 --- a/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index 8f481df..681ac59 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../ - AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ - -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ - -I$(AGCC_GCCSRC_DIR)/libcpp/include --AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) -+AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES) - - AGCC_LOCAL_OBJS=ortho-lang.o - -@@ -140,7 +140,7 @@ ghdl$(exeext): force - - # Ghdl libraries. - ghdllib: ghdl$(exeext) $(GCC_PASSES) force -- $(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib -+ $(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib - - # Build hooks: - -diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in -index d754c6c..07abc4a 100644 ---- a/gcc/vhdl/Makefile.in -+++ b/gcc/vhdl/Makefile.in -@@ -80,7 +80,8 @@ T_CPPFLAGS = - X_ADAFLAGS = - T_ADAFLAGS = - --ADAC = $(CC) -+# Never use the bootstrapped compiler, as it may not be built for ada -+ADAC = gcc - - ECHO = echo - CHMOD = chmod -diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c -index 84aeb92..8eddd42 100644 ---- a/gcc/vhdl/ortho-lang.c -+++ b/gcc/vhdl/ortho-lang.c -@@ -16,6 +16,7 @@ - #include "options.h" - #include "real.h" --#include "tree-gimple.h" -+#include "gimple.h" -+#include "tree.h" - #include "function.h" - #include "cgraph.h" - #include "target.h" -@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp) - - const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; - --/* Tree code classes. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, -- --const enum tree_code_class tree_code_type[] = { --#include "tree.def" -- 'x' --}; --#undef DEFTREECODE -- --/* Table indexed by tree code giving number of expression -- operands beyond the fixed part of the node structure. -- Not used for types or decls. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, -- --const unsigned char tree_code_length[] = { --#include "tree.def" -- 0 --}; --#undef DEFTREECODE -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME, --const char * const tree_code_name[] = { --#include "tree.def" -- "@@dummy" --}; --#undef DEFTREECODE - - union lang_tree_node - GTY((desc ("0"), -- chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)"))) -+ chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)"))) - { - union tree_node GTY ((tag ("0"))) generic; - }; -@@ -1162,7 +1135,7 @@ new_access_type (tree dtype) - res = make_node (POINTER_TYPE); - TREE_TYPE (res) = NULL_TREE; - /* Seems necessary. */ -- TYPE_MODE (res) = Pmode; -+ SET_TYPE_MODE (res, Pmode); - layout_type (res); - return res; - } -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index e201f64..f36fb97 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force - -cargs $(CFLAGS) $(GHDL_ADAFLAGS) - $(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \ - -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \ -- -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) -+ -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) - - # The driver for ghdl. - ghdl$(exeext): force diff --git a/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch b/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch deleted file mode 100644 index dc8236d2b99..00000000000 --- a/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch +++ /dev/null @@ -1,14 +0,0 @@ -GNU libc on GNU/Hurd doesn't define `__SIGRTMIN'. -From . - ---- a/libgcc/generic-morestack.c 2011-12-19 21:14:52.000000000 +0100 -+++ b/libgcc/generic-morestack.c 2011-12-19 21:15:35.000000000 +0100 -@@ -507,7 +507,7 @@ - sigemptyset (&__morestack_initial_sp.mask); - - sigfillset (&__morestack_fullmask); --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && defined(__SIGRTMIN) - /* In glibc, the first two real time signals are used by the NPTL - threading library. By taking them out of the set of signals, we - avoiding copying the signal mask in pthread_sigmask. More diff --git a/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch deleted file mode 100644 index 8128fa87da5..00000000000 --- a/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c ---- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 -+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 -@@ -41,6 +41,10 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+#undef SYSTEM_INCLUDE_DIR -+#undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c ---- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 -+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 -@@ -1478,10 +1478,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ ---- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 -+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 -@@ -378,7 +378,11 @@ - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. --NATIVE_SYSTEM_HEADER_DIR = /usr/include -+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -+# `fixinc' from fixing header files in /usr/include. However, -+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -+# it to some dummy directory. -+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -@@ -3277,7 +3281,7 @@ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix deleted file mode 100644 index ca50160def4..00000000000 --- a/pkgs/development/compilers/gcc/4.6/sources.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.4. */ -{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, - langGo }: - -assert version == "4.6.4"; -optional /* langC */ true (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62"; -}) ++ -optional langCC (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "4eaa347f9cd3ab7d5e14efbb9c5c03009229cd714b558fc55fa56e8996b74d42"; -}) ++ -optional langFortran (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c"; -}) ++ -optional langJava (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "4441d0c3cc04f2162f981c6b4bf29cdd9f6c16d294ce24c6bc4a05d8277abf28"; -}) ++ -optional langAda (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad"; -}) ++ -[] From 8610a344740776639f7161e5a47196418695d6fe Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Sep 2016 22:19:28 -0500 Subject: [PATCH 19/67] gcc: use special native system headers for darwin Darwin systems need to be able to find CoreFoundation headers as well as libc headers. Somehow, gcc doesn't accept any "framework" parameters that would normally be used to include CoreFoundation in this situation. HACK: Instead, this adds a derivation that combines the two. The result works but probably not a good long term solution. ALTERNATIVES: Maybe sending patches in to GCC to allow "native-system-framework" configure flag to get this found. --- .../development/compilers/gcc/4.8/default.nix | 5 ++++- .../development/compilers/gcc/4.9/default.nix | 5 ++++- pkgs/development/compilers/gcc/5/default.nix | 5 ++++- pkgs/development/compilers/gcc/6/default.nix | 5 ++++- .../darwin/usr-include/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/darwin/usr-include/default.nix diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 1b9e4bf666c..088e0683572 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -358,7 +359,9 @@ stdenv.mkDerivation ({ ) } ${if cross == null - then " --with-native-system-header-dir=${getDev stdenv.libc}/include" + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 71edda0937f..1db7dadb1e3 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -365,7 +366,9 @@ stdenv.mkDerivation ({ ) } ${if cross == null - then " --with-native-system-header-dir=${getDev stdenv.libc}/include" + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e84c677408c..c1db89d7c38 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -35,6 +35,7 @@ , gnused ? null , binutils ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -363,7 +364,9 @@ stdenv.mkDerivation ({ ) } ${if cross == null - then " --with-native-system-header-dir=${getDev stdenv.libc}/include" + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b33437ee868..530d835620a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -35,6 +35,7 @@ , gnused ? null , binutils ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -361,7 +362,9 @@ stdenv.mkDerivation ({ ) } ${if cross == null - then " --with-native-system-header-dir=${getDev stdenv.libc}/include" + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix new file mode 100644 index 00000000000..c5f7e3acce7 --- /dev/null +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -0,0 +1,21 @@ +{stdenv, darwin}: + +/* + * This is needed to build GCC on Darwin. + * + * These are the collection of headers that would normally be available under + * /usr/include in OS X machines with command line tools installed. They need + * to be in one folder for gcc to use them correctly. + */ + +stdenv.mkDerivation { + name = "darwin-usr-include"; + buildInputs = [ darwin.CF stdenv.libc ]; + buildCommand = '' + mkdir -p $out + cd $out + ln -sf ${stdenv.libc}/include/* . + mkdir CoreFoundation + ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad5f72d7d60..26ea7b3ca05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10958,6 +10958,8 @@ in libobjc = apple-source-releases.objc4; stubs = callPackages ../os-specific/darwin/stubs {}; + + usr-include = callPackage ../os-specific/darwin/macheaders.nix {}; }; devicemapper = lvm2; From 4a674282e525886cc2bb0b17d3df76f9c5694e18 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 16 Sep 2016 22:05:18 +0200 Subject: [PATCH 20/67] bash: 4.3 -> 4.4 --- pkgs/shells/bash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index c6868eedba6..b7c65b9e64b 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -4,11 +4,11 @@ assert interactive -> readline != null; assert stdenv.isDarwin -> binutils != null; let - version = "4.3"; + version = "4.4"; realName = "bash-${version}"; - shortName = "bash43"; + shortName = "bash44"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; - sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq"; inherit (stdenv.lib) optional optionalString; in From 3689be00d8eee155b9d63591da1515dde4d46c6f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 16 Sep 2016 22:06:55 +0200 Subject: [PATCH 21/67] Add bash-4.4-patches.nix --- pkgs/shells/bash/bash-4.4-patches.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 pkgs/shells/bash/bash-4.4-patches.nix diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix new file mode 100644 index 00000000000..b8019fb3350 --- /dev/null +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -0,0 +1,4 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +] From ca0e798e50f65564f0f765e52e5277e3fd279116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 21:56:48 +0200 Subject: [PATCH 22/67] mesa: 12.0.2 -> 12.0.3 > This is an emergency release addressing a number of regressions > across all devices using the i965 driver. --- 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 7231cf96302..4e464907c6b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "12.0.2"; + version = "12.0.3"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,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 = "d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb"; + sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; }; prePatch = "patchShebangs ."; From 5de2857a54b74907b4817203dc31f2deb12a9d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 16 Sep 2016 23:23:33 +0200 Subject: [PATCH 23/67] gcc*: use stdenv.cc.libc instead of stdenv.libc The latter doesn't exist on Linux. --- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 088e0683572..a0def65d531 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -361,7 +361,7 @@ stdenv.mkDerivation ({ ${if cross == null then if stdenv.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" - else " --with-native-system-header-dir=${getDev stdenv.libc}/include" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1db7dadb1e3..4b53bc35599 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -368,7 +368,7 @@ stdenv.mkDerivation ({ ${if cross == null then if stdenv.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" - else " --with-native-system-header-dir=${getDev stdenv.libc}/include" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index c1db89d7c38..3d75c0e76da 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -366,7 +366,7 @@ stdenv.mkDerivation ({ ${if cross == null then if stdenv.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" - else " --with-native-system-header-dir=${getDev stdenv.libc}/include" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 530d835620a..b6b6b32703d 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ ${if cross == null then if stdenv.isDarwin then " --with-native-system-header-dir=${darwin.usr-include}" - else " --with-native-system-header-dir=${getDev stdenv.libc}/include" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} From 02163da708fdae58e9769a169511949675f35d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2016 00:42:05 +0200 Subject: [PATCH 24/67] bash: fixup the patch-list paths --- pkgs/shells/bash/bash-4.3-patches.nix | 50 --------------------------- pkgs/shells/bash/default.nix | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/shells/bash/bash-4.3-patches.nix diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix deleted file mode 100644 index 83743938de3..00000000000 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc") -(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf") -(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0") -(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y") -(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s") -(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50") -(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi") -(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr") -(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0") -(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff") -(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw") -(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry") -(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z") -(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas") -(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k") -(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj") -(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj") -(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s") -(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7") -(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna") -(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1") -(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx") -(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls") -(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v") -(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y") -(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f") -(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy") -(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") -(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") -(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") -(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd") -(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8") -(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv") -(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi") -(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p") -(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc") -(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") -(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") -(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") -(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") -(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") -(patch "042" "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc") -(patch "043" "1031g97w8gamimb41jr9r2qm7mn10k5mr3sd3y12avml0p0a7a27") -(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k") -(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms") -(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k") -] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index b7c65b9e64b..be9f15dd1fa 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import ./bash-4.3-patches.nix patch) + import ./bash-4.4-patches.nix patch) ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { From bbadb1da2a852d1a1517c2ce21232dba49260d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2016 01:14:00 +0200 Subject: [PATCH 25/67] readline70: init at 7.0p0 Also switch bash-4.4 to it, as it's unable to link with older readline versions (only bashInteractive is affected). --- pkgs/development/libraries/readline/7.0.nix | 66 +++++++++++++++++++++ pkgs/shells/bash/default.nix | 9 ++- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/readline/7.0.nix diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix new file mode 100644 index 00000000000..9d1c1c57f8c --- /dev/null +++ b/pkgs/development/libraries/readline/7.0.nix @@ -0,0 +1,66 @@ +{ fetchurl, stdenv, ncurses }: + +stdenv.mkDerivation rec { + name = "readline-${version}"; + version = "7.0p0"; + + src = fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; + sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"; + }; + + outputs = [ "out" "dev" "doc" ]; + + propagatedBuildInputs = [ncurses]; + + patchFlags = "-p0"; + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ] + ; + /* + ++ + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline70-${nr}"; + inherit sha256; + }; + in + import ./readline-7.0-patches.nix patch); + */ + + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv ? cross; + bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; + + meta = with stdenv.lib; { + description = "Library for interactive line editing"; + + longDescription = '' + The GNU Readline library provides a set of functions for use by + applications that allow users to edit command lines as they are + typed in. Both Emacs and vi editing modes are available. The + Readline library includes additional functions to maintain a + list of previously-entered command lines, to recall and perhaps + reedit those lines, and perform csh-like history expansion on + previous commands. + + The history facilities are also placed into a separate library, + the History library, as part of the build process. The History + library may be used without Readline in applications which + desire its capabilities. + ''; + + homepage = http://savannah.gnu.org/projects/readline/; + + license = licenses.gpl3Plus; + + maintainers = [ ]; + + platforms = platforms.unix; + branch = "7.0"; + }; +} diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index be9f15dd1fa..a401628dabd 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }: +{ stdenv, fetchurl, readline70 ? null, interactive ? false, texinfo ? null +, binutils ? null, bison +}: -assert interactive -> readline != null; +assert interactive -> readline70 != null; assert stdenv.isDarwin -> binutils != null; let @@ -67,9 +69,10 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. nativeBuildInputs = [bison] ++ optional (texinfo != null) texinfo - ++ optional interactive readline ++ optional stdenv.isDarwin binutils; + buildInputs = optional interactive readline70; + # Bash randomly fails to build because of a recursive invocation to # build `version.h'. enableParallelBuilding = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a008a119e76..6d72df36dab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9358,6 +9358,8 @@ in readline63 = callPackage ../development/libraries/readline/6.3.nix { }; + readline70 = callPackage ../development/libraries/readline/7.0.nix { }; + readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { From 06839f5a40c4e25128a0a0d91dddaaa310b2e081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2016 02:19:14 +0200 Subject: [PATCH 26/67] fix some evaluation problems after 8610a34474 /cc #18327. --- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b6b6b32703d..acddc9081be 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -461,7 +461,7 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = makeSearchPath "dev" "include" ([] + CPATH = makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b82b701351c..02fd446256f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10964,7 +10964,7 @@ in stubs = callPackages ../os-specific/darwin/stubs {}; - usr-include = callPackage ../os-specific/darwin/macheaders.nix {}; + usr-include = callPackage ../os-specific/darwin/usr-include {}; }; devicemapper = lvm2; From 40a6918af379a8fa06661b5c229bff6101fb0784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2016 10:30:48 +0200 Subject: [PATCH 27/67] bash: bring back 4.3 for the non-interactive version ... until someone looks better at the outputs. The size has grown in 4.4, and it seems like installing binary plugins, headers, etc. --- pkgs/shells/bash/4.3.nix | 118 ++++++++++++++++++++++ pkgs/shells/bash/{default.nix => 4.4.nix} | 0 pkgs/shells/bash/bash-4.3-patches.nix | 50 +++++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 pkgs/shells/bash/4.3.nix rename pkgs/shells/bash/{default.nix => 4.4.nix} (100%) create mode 100644 pkgs/shells/bash/bash-4.3-patches.nix diff --git a/pkgs/shells/bash/4.3.nix b/pkgs/shells/bash/4.3.nix new file mode 100644 index 00000000000..c6868eedba6 --- /dev/null +++ b/pkgs/shells/bash/4.3.nix @@ -0,0 +1,118 @@ +{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }: + +assert interactive -> readline != null; +assert stdenv.isDarwin -> binutils != null; + +let + version = "4.3"; + realName = "bash-${version}"; + shortName = "bash43"; + baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; + sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; + + inherit (stdenv.lib) optional optionalString; +in + +stdenv.mkDerivation rec { + name = "${realName}-p${toString (builtins.length patches)}"; + + src = fetchurl { + url = "mirror://gnu/bash/${realName}.tar.gz"; + inherit sha256; + }; + + hardeningDisable = [ "format" ]; + + outputs = [ "out" "doc" "info" ]; + + # the man pages are small and useful enough + outputMan = if interactive then "out" else null; + + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + + patchFlags = "-p0"; + + patches = + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}"; + inherit sha256; + }; + in + import ./bash-4.3-patches.nix patch) + ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; + + crossAttrs = { + configureFlags = baseConfigureFlags + + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + + optionalString stdenv.isCygwin '' + --without-libintl-prefix --without-libiconv-prefix + --with-installed-readline + bash_cv_dev_stdin=present + bash_cv_dev_fd=standard + bash_cv_termcap_lib=libncurses + ''; + }; + + configureFlags = baseConfigureFlags; + + # Note: Bison is needed because the patches above modify parse.y. + nativeBuildInputs = [bison] + ++ optional (texinfo != null) texinfo + ++ optional interactive readline + ++ optional stdenv.isDarwin binutils; + + # Bash randomly fails to build because of a recursive invocation to + # build `version.h'. + enableParallelBuilding = false; + + postInstall = '' + ln -s bash "$out/bin/sh" + ''; + + postFixup = if interactive + then '' + substituteInPlace "$out/bin/bashbug" \ + --replace '${stdenv.shell}' "$out/bin/bash" + '' + # most space is taken by locale data + else '' + rm -r "$out/share" "$out/bin/bashbug" + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/bash/; + description = + "GNU Bourne-Again Shell, the de facto standard shell on Linux" + + (if interactive then " (for interactive use)" else ""); + + longDescription = '' + Bash is the shell, or command language interpreter, that will + appear in the GNU operating system. Bash is an sh-compatible + shell that incorporates useful features from the Korn shell + (ksh) and C shell (csh). It is intended to conform to the IEEE + POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers + functional improvements over sh for both programming and + interactive use. In addition, most sh scripts can be run by + Bash without modification. + ''; + + license = licenses.gpl3Plus; + + platforms = platforms.all; + + maintainers = [ maintainers.peti ]; + }; + + passthru = { + shellPath = "/bin/bash"; + }; +} diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/4.4.nix similarity index 100% rename from pkgs/shells/bash/default.nix rename to pkgs/shells/bash/4.4.nix diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix new file mode 100644 index 00000000000..83743938de3 --- /dev/null +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -0,0 +1,50 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc") +(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf") +(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0") +(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y") +(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s") +(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50") +(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi") +(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr") +(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0") +(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff") +(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw") +(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry") +(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z") +(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas") +(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k") +(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj") +(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj") +(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s") +(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7") +(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna") +(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1") +(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx") +(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls") +(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v") +(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y") +(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f") +(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy") +(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") +(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") +(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") +(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd") +(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8") +(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv") +(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi") +(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p") +(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc") +(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") +(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") +(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") +(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") +(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") +(patch "042" "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc") +(patch "043" "1031g97w8gamimb41jr9r2qm7mn10k5mr3sd3y12avml0p0a7a27") +(patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k") +(patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms") +(patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k") +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02fd446256f..2832f964609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4314,12 +4314,12 @@ in ### SHELLS - bash = lowPrio (callPackage ../shells/bash { + bash = lowPrio (callPackage ../shells/bash/4.3.nix { texinfo = null; interactive = stdenv.isCygwin; # patch for cygwin requires readline support }); - bashInteractive = appendToName "interactive" (callPackage ../shells/bash { + bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix { interactive = true; }); From f37566d3962d2ef1f2a518d8e5d794e0bea6d8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2016 10:51:32 +0200 Subject: [PATCH 28/67] bash 4.4: split headers into .dev --- pkgs/shells/bash/4.4.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index a401628dabd..406ca4d08fd 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - outputs = [ "out" "doc" "info" ]; + outputs = [ "out" "dev" "doc" "info" ]; # the man pages are small and useful enough outputMan = if interactive then "out" else null; @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { postInstall = '' ln -s bash "$out/bin/sh" + moveToOutput lib/bash/Makefile.inc "$dev" ''; postFixup = if interactive From d9cdbcc34ef342c13170e8f53d4416ffdd6f057f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 18 Sep 2016 14:08:59 +0200 Subject: [PATCH 29/67] libcaca: Enable support for png/jpeg/gif Fixes #18683 --- pkgs/development/libraries/libcaca/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index ee76b79ced8..5ff3157272e 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib }: +{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; - - propagatedBuildInputs = [ ncurses zlib ]; + propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2832f964609..3984f2f0cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7943,7 +7943,9 @@ in libburn = callPackage ../development/libraries/libburn { }; - libcaca = callPackage ../development/libraries/libcaca { }; + libcaca = callPackage ../development/libraries/libcaca { + inherit (xlibs) libX11; + }; libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { gtk = pkgs.gtk3; From 2b66563cde4f4275b04cd152d8fd798e6d64fa60 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Sep 2016 13:01:30 +0200 Subject: [PATCH 30/67] Python: make versions/prefixes more similar --- .../interpreters/python/cpython/2.6/default.nix | 10 +++++++--- .../interpreters/python/cpython/2.7/default.nix | 10 +++++++--- .../interpreters/python/cpython/3.3/default.nix | 11 +++++++---- .../interpreters/python/cpython/3.4/default.nix | 14 ++++++++------ .../interpreters/python/cpython/3.5/default.nix | 14 ++++++++------ .../interpreters/python/cpython/3.6/default.nix | 14 ++++++++------ .../interpreters/python/pypy/2.7/default.nix | 8 +++++--- 7 files changed, 50 insertions(+), 31 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 5311be697af..2d81773aeb0 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -8,10 +8,14 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.9"; + minorVersion = "9"; + minorVersionSuffix = ""; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya"; }; @@ -94,12 +98,12 @@ let ''; passthru = rec { + inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy26 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; - libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5c61b9777c8..77c6a3f06ce 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -22,10 +22,14 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.12"; + minorVersion = "12"; + minorVersionSuffix = ""; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp"; }; @@ -164,12 +168,12 @@ let ''; passthru = rec { + inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy27 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; - libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index cb48186a69e..0981604f66e 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -21,8 +21,11 @@ with stdenv.lib; let majorVersion = "3.3"; + minorVersion = "6"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.6"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -37,7 +40,7 @@ stdenv.mkDerivation { inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; }; @@ -74,14 +77,14 @@ stdenv.mkDerivation { ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python3.3m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 2e7d3a03141..70d80b9bb8d 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -23,9 +23,11 @@ with stdenv.lib; let majorVersion = "3.4"; + minorVersion = "5"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.5"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib @@ -45,14 +47,14 @@ let in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; sha256 = "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f"; }; @@ -98,14 +100,14 @@ stdenv.mkDerivation { ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python3.4m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 69d3df32a32..8cb7ac9d078 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -22,9 +22,11 @@ with stdenv.lib; let majorVersion = "3.5"; + minorVersion = "2"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.2"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib @@ -42,14 +44,14 @@ let ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0h6a5fr7ram2s483lh0pnmc4ncijb8llnpfdxdcl5dxr01hza400"; }; @@ -106,14 +108,14 @@ stdenv.mkDerivation { ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = false; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python${majorVersion}m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 3a6635cd8b6..7361a6b7cdd 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -24,9 +24,11 @@ with stdenv.lib; let majorVersion = "3.6"; + minorVersion = "0"; + minorVersionSuffix = "a3"; pythonVersion = majorVersion; - version = "${majorVersion}.0a3"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ glibc @@ -46,14 +48,14 @@ let ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "08c3598bwihibwca9lwxq923sjq9shvgv3wxv4vkga2n6hf63l1c"; }; @@ -101,14 +103,14 @@ stdenv.mkDerivation { ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python${majorVersion}m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index c0bd10a0d43..0d9d619e48a 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -5,9 +5,11 @@ assert zlibSupport -> zlib != null; let - - majorVersion = "5.4.1"; - version = "${majorVersion}"; + majorVersion = "5.4"; + minorVersion = "1"; + minorVersionSuffix = ""; + pythonVersion = "2.7"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { From 63ec0068a747d11570acc1a81d984eebe5259fc1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Sep 2016 13:16:26 +0200 Subject: [PATCH 31/67] Python on Nix is not manylinux1 compatible Fixes https://github.com/NixOS/nixpkgs/issues/18484 --- pkgs/development/interpreters/python/cpython/2.6/default.nix | 3 +++ pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 +++ pkgs/development/interpreters/python/cpython/3.3/default.nix | 3 +++ pkgs/development/interpreters/python/cpython/3.4/default.nix | 3 +++ pkgs/development/interpreters/python/cpython/3.5/default.nix | 3 +++ pkgs/development/interpreters/python/cpython/3.6/default.nix | 3 +++ pkgs/development/interpreters/python/pypy/2.7/default.nix | 3 +++ 7 files changed, 21 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 2d81773aeb0..64f2b80d09f 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -94,6 +94,9 @@ let paxmark E $out/bin/python${majorVersion} + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 77c6a3f06ce..4c28e977b49 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -162,6 +162,9 @@ let paxmark E $out/bin/python${majorVersion} + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ${optionalString includeModules "$out/bin/python ./setup.py build_ext"} rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index 0981604f66e..3be1209b636 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -74,6 +74,9 @@ stdenv.mkDerivation { touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 70d80b9bb8d..78f5972e10f 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -97,6 +97,9 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 8cb7ac9d078..84488e7e05c 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -94,6 +94,9 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; postFixup = '' diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 7361a6b7cdd..ef330a05f95 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -100,6 +100,9 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 0d9d619e48a..7e11ac89b16 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -115,6 +115,9 @@ let # verify cffi modules $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { From 8c30f3d962e201f77a17c0168102b3af81eb67bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Sep 2016 13:35:49 +0200 Subject: [PATCH 32/67] python3.6: 3.6.0a3 -> 3.6.0b1 /Lib/plat* has been removed in this release. http://bugs.python.org/issue28027 --- .../development/interpreters/python/cpython/3.6/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index ef330a05f95..3f25640afea 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -25,7 +25,7 @@ with stdenv.lib; let majorVersion = "3.6"; minorVersion = "0"; - minorVersionSuffix = "a3"; + minorVersionSuffix = "b1"; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -56,7 +56,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "08c3598bwihibwca9lwxq923sjq9shvgv3wxv4vkga2n6hf63l1c"; + sha256 = "0hjdlwkjanjagz4qggbfgal8ggmas26mx2jlgjx1z2mzi950jfx8"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -75,8 +75,6 @@ stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.6 ''} - substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include - configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" From ad8f31df7f2e85edeb22809ada0949f9f72a7bfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Sep 2016 16:42:30 +0200 Subject: [PATCH 33/67] gcc_multi: Move $out/lib64/* to $lib/lib64 This prevents VirtualBox from having a copy of gcc in its closure. --- pkgs/development/compilers/gcc/builder.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 0371630f3f6..de3e9ba3ef5 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -218,6 +218,15 @@ postInstall() { substituteInPlace "$i" --replace "$out" "$lib" done + if [ -n "$enableMultilib" ]; then + moveToOutput "lib64/lib*.so*" "$lib" + moveToOutput "lib64/lib*.la" "$lib" + + for i in "$lib"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "$lib" + done + fi + # Remove `fixincl' to prevent a retained dependency on the # previous gcc. rm -rf $out/libexec/gcc/*/*/install-tools @@ -227,19 +236,19 @@ postInstall() { rm -rf $out/bin/gccbug if type "patchelf"; then - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out + for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done + done - # For some reason the libs retain RPATH to $out - for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do + # For some reason the libs retain RPATH to $out + for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done + done fi # Get rid of some "fixed" header files From 594c47e5eb8a1589008a372d9b40e0bab2121c56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Sep 2016 17:39:11 +0200 Subject: [PATCH 34/67] Don't nuke section 3 manpages by default They now go to devman, devdoc, or $outputMan, in that order. This is to prevent cases such as the man-pages package quietly losing its section 3 pages. --- doc/multiple-output.xml | 31 +++++++++++++------ .../setup-hooks/multiple-outputs.sh | 4 ++- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 0bbb9ef8be3..c4e92c7e79a 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -45,34 +45,48 @@ File type groups The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. + $outputDev is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default. - + + + $outputBin is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. - + + $outputLib is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default. - + + $outputDoc is for user documentation, typically residing in share/doc/. It goes to doc or out by default. - + + $outputDocdev - is for developer documentation. Currently we count gtk-doc and man3 pages in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. - + is for developer documentation. Currently we count gtk-doc in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + + $outputMan is for man pages (except for section 3). They go to man or doc or $outputBin by default. - + + + + $outputDevman + is for section 3 man pages. They go to devman or $outputMan by default. + + $outputInfo is for info pages. They go to info or doc or $outputMan by default. - + + @@ -88,4 +102,3 @@ - diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 189c98cdfa7..2e853ac4078 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -16,6 +16,7 @@ _assignFirst() { echo "Error: _assignFirst found no valid variant!" return 1 # none found } + # Same as _assignFirst, but only if "$1" = "" _overrideFirst() { if [ -z "${!1}" ]; then @@ -40,6 +41,7 @@ _overrideFirst outputDoc "doc" "out" _overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "doc" "$outputBin" +_overrideFirst outputDevman "devman" "devdoc" "$outputMan" _overrideFirst outputInfo "info" "doc" "$outputMan" @@ -140,7 +142,7 @@ _multioutDocs() { # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" - moveToOutput share/man/man3 "${!outputDocdev}" + moveToOutput share/man/man3 "${!outputDevman}" } # Move development-only stuff to the desired outputs. From 5f8a330d40008ec6457f96a07cdebe95deb1bdaf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Sep 2016 16:51:51 +0200 Subject: [PATCH 35/67] outputDocdev -> outputDevdoc For consistency with the devdoc output. --- doc/multiple-output.xml | 2 +- pkgs/build-support/setup-hooks/multiple-outputs.sh | 4 ++-- pkgs/data/documentation/std-man-pages/default.nix | 2 +- pkgs/data/documentation/stdman/default.nix | 2 +- pkgs/development/libraries/udns/default.nix | 2 +- pkgs/development/tools/documentation/gtk-doc/default.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index c4e92c7e79a..b7a363c750e 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -68,7 +68,7 @@ - $outputDocdev + $outputDevdoc is for developer documentation. Currently we count gtk-doc in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 2e853ac4078..ae491e8a7ef 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -38,7 +38,7 @@ _overrideFirst outputInclude "$outputDev" _overrideFirst outputLib "lib" "out" _overrideFirst outputDoc "doc" "out" -_overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers +_overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "doc" "$outputBin" _overrideFirst outputDevman "devman" "devdoc" "$outputMan" @@ -138,7 +138,7 @@ _multioutDocs() { moveToOutput share/info "${!outputInfo}" moveToOutput share/doc "${!outputDoc}" - moveToOutput share/gtk-doc "${!outputDocdev}" + moveToOutput share/gtk-doc "${!outputDevdoc}" # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index ce38dd9c61a..04683ceddb3 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; - outputDocdev = "out"; + outputDevdoc = "out"; installPhase = '' mkdir -p $out/share/man diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 249e5b6841b..cc6f871cded 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; }; - outputDocdev = "out"; + outputDevdoc = "out"; preConfigure = " patchShebangs ./configure diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 9d781b301a0..9c899eb21ba 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; # keep man3 - outputDocdev = "out"; + outputDevdoc = "out"; meta = with stdenv.lib; { homepage = http://www.corpit.ru/mjt/udns.html; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b080be846cd..b46b0be748a 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; - outputDocdev = "out"; + outputDevdoc = "out"; # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" From 7871ca4024d24eaac35030dd642a69b76bfaf302 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:32:28 +0200 Subject: [PATCH 36/67] gtk+3: 3.20.9 -> 3.22.0 --- pkgs/development/libraries/gtk+/3.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1ac006b2161..c4b5c56c341 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,8 +12,8 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - ver_maj = "3.20"; - ver_min = "9"; + ver_maj = "3.22"; + ver_min = "0"; 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 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; + sha256 = "0d21qx0j7awm69jlfx7z7vqddbqarylqifl2bfbfrv779dcbpl48"; }; outputs = [ "out" "dev" ]; From 868eb8301916d123179fd7b0768daa4b2749c288 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:30:20 +0200 Subject: [PATCH 37/67] glib: 2.48.2 -> 2.50.0 glib now uses libmount per default -> depend on utillinux. To avoid circular dependency (glib, utillinux, systemd, glib) use the minimal version --- pkgs/development/libraries/glib/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c678309e90a..c47a02ef5e4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, python , libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf +# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) +, utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) , coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false @@ -8,6 +10,7 @@ with stdenv.lib; assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; +assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: # * Add gio-module-fam @@ -39,8 +42,8 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.48"; - ver_min = "2"; + ver_maj = "2.50"; + ver_min = "0"; in stdenv.mkDerivation rec { @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"; + sha256 = "830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ libelf setupHook pcre ] + ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; From 2ca5adbfe830f0efd6c8201f90bd6029c36d65e5 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:28:43 +0200 Subject: [PATCH 38/67] gobjectIntrospection: 1.48.0 -> 1.50.0 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 57c42ee21ef..7154db626aa 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,7 +7,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.48"; + ver_maj = "1.50"; ver_min = "0"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs"; + sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5"; }; outputs = [ "out" "dev" ]; From feec6856362d14e9d16d619722cc85bb27250b80 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 23 Sep 2016 21:42:08 -0400 Subject: [PATCH 39/67] flex: 2.6.0 -> 2.6.1 --- pkgs/development/tools/parsing/flex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 64d5f2f551b..7ee2e27e60a 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, m4 }: stdenv.mkDerivation rec { - name = "flex-2.6.0"; + name = "flex-2.6.1"; src = fetchurl { - url = "mirror://sourceforge/flex/${name}.tar.bz2"; - sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"; + url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"; + sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw"; }; buildInputs = [ bison ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://flex.sourceforge.net/; + homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; platforms = stdenv.lib.platforms.unix; }; From c8dba2581cb449eb6d87968df0edd7f9b62d12eb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 24 Sep 2016 04:16:20 +0200 Subject: [PATCH 40/67] nghttp2: 1.10.0 -> 1.14.1 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 2eff4b3b5a4..a761106d9b1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.10.0"; + version = "1.14.1"; # 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 = "1m95j3lhxp6k16aa2m03rsky13nmj8ky1kk96cwl88vbsrliz4mh"; + sha256 = "0d7sk3pfkajhkmcqa7zx4rjg1pkwqraxxs7bxbwbm67r8wwqw87j"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin From 54db6a46c7a4eff43476e54ac339585abf24a888 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 24 Sep 2016 09:02:25 -0400 Subject: [PATCH 41/67] nettle: 3.1.1 -> 3.2 --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 6d5e36d726c..152c592f591 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.1.1"; + version = "3.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z"; + sha256 = "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa"; }; }) From 6321a1b67c869b70520ab9479c86b198c439bca9 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 1 Sep 2016 23:52:34 -0400 Subject: [PATCH 42/67] nmap: pin to Python 2, make Python optional Python 3 is not supported, so use python2Packages. Python is only required for the `ndiff` and `zenmap` binaries, not the main `nmap` binary, so disable Python by default to reduce the default closure size, and add a `withPython` arg to re-enable it. Note that Zenmap is the graphical program, so passing `graphicalSupport = true` will also automatically enable Python support. --- pkgs/tools/security/nmap/default.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 3bc5d415834..ff32ba6fa25 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -2,14 +2,21 @@ , graphicalSupport ? false , libX11 ? null , gtk2 ? null -, pythonPackages +, withPython ? false # required for the `ndiff` binary +, python2Packages ? null , makeWrapper ? null }: +assert withPython -> python2Packages != null; + with stdenv.lib; let - inherit (pythonPackages) python pygtk pygobject2 pycairo pysqlite; + + # Zenmap (the graphical program) also requires Python, + # so automatically enable pythonSupport if graphicalSupport is requested. + pythonSupport = withPython || graphicalSupport; + in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -21,15 +28,19 @@ in stdenv.mkDerivation rec { patches = ./zenmap.patch; - configureFlags = optionalString (!graphicalSupport) "--without-zenmap"; + configureFlags = [] + ++ optional (!pythonSupport) "--without-ndiff" + ++ optional (!graphicalSupport) "--without-zenmap" + ; - postInstall = '' + postInstall = optionalString pythonSupport '' wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject2})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 ''; - buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] + buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] + ++ optionals pythonSupport [ makeWrapper python ] ++ optionals graphicalSupport [ libX11 gtk2 pygtk pysqlite pygobject2 pycairo ]; From 0f9ece792966e720bf08419e0041e6d7236a8a83 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 2 Sep 2016 00:36:44 -0400 Subject: [PATCH 43/67] libevent: remove Python dependency Python is only used for one test, which is optional and is skipped if Python is not detected. Additionally, Python 2 is required (Python 3 does not work), so remove the dependency to reduce the closure size for a Python 3 as default Python future. Additionally, update the meta.homepage and src to point at GitHub, which is the libevent project home since 2015-10-07. --- .../libraries/libevent/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index f273a511aaf..364ff28f9a6 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,36 +1,34 @@ -{ stdenv, fetchurl, autoreconfHook, openssl, python, findutils }: +{ stdenv, fetchurl, autoreconfHook, openssl, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { name = "libevent-${version}"; src = fetchurl { - url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz"; + url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; }; - postPatch = "patchShebangs event_rpcgen.py"; outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils; meta = with stdenv.lib; { description = "Event notification library"; + longDescription = '' + The libevent API provides a mechanism to execute a callback function + when a specific event occurs on a file descriptor or after a timeout + has been reached. Furthermore, libevent also support callbacks due + to signals or regular timeouts. - longDescription = - '' The libevent API provides a mechanism to execute a callback function - when a specific event occurs on a file descriptor or after a timeout - has been reached. Furthermore, libevent also support callbacks due - to signals or regular timeouts. - - libevent is meant to replace the event loop found in event driven - network servers. An application just needs to call event_dispatch() - and then add or remove events dynamically without having to change - the event loop. - ''; - + libevent is meant to replace the event loop found in event driven + network servers. An application just needs to call event_dispatch() + and then add or remove events dynamically without having to change + the event loop. + ''; + homepage = http://libevent.org/; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; From 278d3050ae85e959e4c6485b5ad43bbba96eb829 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 22 Sep 2016 13:57:34 -0400 Subject: [PATCH 44/67] nmap: use python infra's .withPackages --- pkgs/tools/security/nmap/default.nix | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index ff32ba6fa25..847faa2479e 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false -, libX11 ? null , gtk2 ? null +, libX11 ? null , withPython ? false # required for the `ndiff` binary -, python2Packages ? null -, makeWrapper ? null +, python2 ? null }: -assert withPython -> python2Packages != null; +assert withPython -> python2 != null; with stdenv.lib; @@ -17,6 +16,10 @@ let # so automatically enable pythonSupport if graphicalSupport is requested. pythonSupport = withPython || graphicalSupport; + pythonEnv = python2.withPackages(ps: with ps; [] + ++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ] + ); + in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -33,17 +36,10 @@ in stdenv.mkDerivation rec { ++ optional (!graphicalSupport) "--without-zenmap" ; - postInstall = optionalString pythonSupport '' - wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" - '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 - ''; - - buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] - ++ optionals pythonSupport [ makeWrapper python ] - ++ optionals graphicalSupport [ - libX11 gtk2 pygtk pysqlite pygobject2 pycairo - ]; + buildInputs = [ libpcap pkgconfig openssl ] + ++ optional pythonSupport pythonEnv + ++ optionals graphicalSupport [ gtk2 libX11 ] + ; meta = { description = "A free and open source utility for network discovery and security auditing"; From bb349421c13786397d6910cdf2b89778344a9256 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 1 Sep 2016 22:51:46 -0400 Subject: [PATCH 45/67] rr: pin Python to Python 2 rr requires Python>=2.7, but does not support Python 3. --- pkgs/development/tools/analysis/rr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 8cd38a152ec..7606705edd8 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps, gdb }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ]; + buildInputs = [ cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" From d2965a7d85f7ce3f5ce265ca8dc3b73feaae226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Sep 2016 18:32:45 +0200 Subject: [PATCH 46/67] llvm-3.9: move shared libLLVM to a separate output Fixes #18840: too large closure of mesa_drivers. Tested atop 16.09: - clang compiles a hello-world app; - mesa seems to link OK; - ispc builds. Size comparison: - 80 MB of full llvm-3.7 on 16.03; - 200 MB of full llvm-3.9 on 16.09 before this patch; - 50 MB of libLLVM after this commit. --- .../compilers/llvm/3.9/llvm-outputs.patch | 26 +++++++++++++++++++ pkgs/development/compilers/llvm/3.9/llvm.nix | 21 ++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/llvm/3.9/llvm-outputs.patch diff --git a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch b/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 41d655015e4..22dea611c79 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -30,16 +30,24 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; + outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; + buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; propagatedBuildInputs = [ ncurses zlib ]; + postPatch = "" # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + stdenv.lib.optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch ''; # hacky fix: created binaries need to be run before installation @@ -59,7 +67,7 @@ in stdenv.mkDerivation rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; @@ -70,7 +78,14 @@ in stdenv.mkDerivation rec { paxmark m bin/{lli,llvm-rtdyld} ''; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + postInstall = "" + + stdenv.lib.optionalString (enableSharedLibraries) '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM.so" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib ''; From 6244be2d0a07778b51eb4ff41f5ecefc187b54a8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 24 Sep 2016 19:27:50 +0200 Subject: [PATCH 47/67] pcre: 8.38 -> 8.39 (security) Fixes: - CVE-2014-9769 - CVE-2015-2327 - CVE-2015-2328 - CVE-2015-8382 - CVE-2016-3191 cc #18856 --- .../libraries/pcre/CVE-2016-1283.patch | 18 ------------------ pkgs/development/libraries/pcre/default.nix | 8 ++------ 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/pcre/CVE-2016-1283.patch diff --git a/pkgs/development/libraries/pcre/CVE-2016-1283.patch b/pkgs/development/libraries/pcre/CVE-2016-1283.patch deleted file mode 100644 index 2c2dad29e92..00000000000 --- a/pkgs/development/libraries/pcre/CVE-2016-1283.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: pcre_compile.c -=================================================================== ---- a/pcre_compile.c (revision 1635) -+++ b/pcre_compile.c (revision 1636) -@@ -7311,7 +7311,12 @@ - so far in order to get the number. If the name is not found, leave - the value of recno as 0 for a forward reference. */ - -- else -+ /* This patch (removing "else") fixes a problem when a reference is -+ to multiple identically named nested groups from within the nest. -+ Once again, it is not the "proper" fix, and it results in an -+ over-allocation of memory. */ -+ -+ /* else */ - { - ng = cd->named_groups; - for (i = 0; i < cd->names_found; i++, ng++) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7e2bec80c3c..d3499f3e15c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.38"; + version = "8.39"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -17,13 +17,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r"; + sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q"; }; - patches = [ - ./CVE-2016-1283.patch - ]; - outputs = [ "bin" "dev" "out" "doc" "man" ]; configureFlags = [ From 3e1afeaa5b83559698fb6fa3a45947f3e14da534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2016 11:12:05 +0200 Subject: [PATCH 48/67] libsepol: temporary fixup after flex security update /cc #18909. --- pkgs/os-specific/linux/libsepol/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index ecbb2a0ec46..3021ce20b46 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; + # Temporary work-around for problems after flex security update: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835542 + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; preBuild = '' makeFlagsArray+=("PREFIX=$out") From dafd585f9df3f8f65dd01ad08a9812746d266d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Sep 2016 15:40:37 +0200 Subject: [PATCH 49/67] libxslt: 1.1.28 -> 1.1.29 --- pkgs/development/libraries/libxslt/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index f1b69447fac..b97a1799661 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }: stdenv.mkDerivation rec { - name = "libxslt-1.1.28"; + name = "libxslt-1.1.29"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"; + sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch @@ -14,14 +14,7 @@ stdenv.mkDerivation rec { name = "mingw.patch"; url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; - }) - ++ [ - (fetchpatch { - name = "CVE-2015-7995.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=7ca19df892ca22"; - sha256 = "1xzg0q94dzbih9nvqp7g9ihz0a3qb0w23l1158m360z9smbi8zbd"; - }) - ]; + }); outputs = [ "bin" "dev" "out" "doc" ]; From 06d8dd3ed406dab462b6c9d0afc56060e06c3f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2016 17:11:46 +0200 Subject: [PATCH 50/67] libxslt: drop patch already included in release I didn't test building on MinGW, but this commit can't make it worse. --- pkgs/development/libraries/libxslt/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index b97a1799661..2afbfc2fe99 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -8,13 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch - ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") - (fetchpatch { - name = "mingw.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; - sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; - }); + patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; outputs = [ "bin" "dev" "out" "doc" ]; From 0cb16a6955ff6ef447a81caab02a8389b2d19dd4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 15:28:11 +0200 Subject: [PATCH 51/67] Add stdenvNoCC This is a standard environment that doesn't contain a C/C++ compiler. This is mostly to prevent trivial builders like runCommand and substituteAll from pulling in gcc for simple configuration changes on NixOS. --- nixos/modules/system/activation/top-level.nix | 2 +- nixos/modules/system/etc/etc.nix | 2 +- pkgs/build-support/substitute/substitute-all.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 2d1b0ffb54c..0c08375da64 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -98,7 +98,7 @@ let # `switch-to-configuration' that activates the configuration and # makes it bootable. baseSystem = showWarnings ( - if [] == failed then pkgs.stdenv.mkDerivation { + if [] == failed then pkgs.stdenvNoCC.mkDerivation { name = let hn = config.networking.hostName; nn = if (hn != "") then hn else "unnamed"; in "nixos-system-${nn}-${config.system.nixosLabel}"; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 163f4f4106e..af1969d82e7 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,7 +8,7 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.stdenv.mkDerivation { + etc = pkgs.stdenvNoCC.mkDerivation { name = "etc"; builder = ./make-etc.sh; diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 1022b25c4c9..7fd46f95f99 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -1,9 +1,9 @@ -{ stdenv }: +{ stdenvNoCC }: args: # see the substituteAll in the nixpkgs documentation for usage and constaints -stdenv.mkDerivation ({ +stdenvNoCC.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); builder = ./substitute-all.sh; inherit (args) src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dc6aa218ce..d1625a6d121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -74,6 +74,8 @@ in else stdenv); + stdenvNoCC = stdenv.override { cc = null; }; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..; From 97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2016 16:36:16 +0200 Subject: [PATCH 52/67] runCommand: Use stdenvNoCC This ensures that most "trivial" derivations used to build NixOS configurations no longer depend on GCC. For commands that do invoke gcc, there is runCommandCC. --- nixos/modules/system/boot/stage-1.nix | 2 +- nixos/tests/boot-stage1.nix | 2 +- pkgs/build-support/trivial-builders.nix | 20 ++++++++++++++------ pkgs/top-level/default.nix | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8d02cd81e0e..61def24efd8 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -34,7 +34,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommand "extra-utils" + extraUtils = pkgs.runCommandCC "extra-utils" { buildInputs = [pkgs.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index ccd8394a1f0..e9087edb5d5 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ... }: { boot.initrd.kernelModules = [ "kcanary" ]; boot.initrd.extraUtilsCommands = let - compile = name: source: pkgs.runCommand name { inherit source; } '' + compile = name: source: pkgs.runCommandCC name { inherit source; } '' mkdir -p "$out/bin" echo "$source" | gcc -Wall -o "$out/bin/$name" -xc - ''; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 398426bf9a4..d6f390ddfb1 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, lndir }: +{ lib, stdenv, stdenvNoCC, lndir }: + +let + + runCommand' = stdenv: name: env: buildCommand: + stdenv.mkDerivation ({ + inherit name buildCommand; + passAsFile = [ "buildCommand" ]; + } // env); + +in rec { # Run the shell command `buildCommand' to produce a store path named # `name'. The attributes in `env' are added to the environment # prior to running the command. - runCommand = name: env: buildCommand: - stdenv.mkDerivation ({ - inherit name buildCommand; - passAsFile = [ "buildCommand" ]; - } // env); + runCommand = runCommandNoCC; + runCommandNoCC = runCommand' stdenvNoCC; + runCommandCC = runCommand' stdenv; # Create a single file. diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 87813571d9a..2eb7fb34b4d 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -82,7 +82,7 @@ let trivialBuilders = self: super: (import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv; inherit (self.xorg) lndir; + inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }); stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs; From 66727f891946bec14a00ebb196e512cb51162cb5 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 11:24:23 +0200 Subject: [PATCH 53/67] gtk+3: 3.22.0 -> 3.22.1 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index c4b5c56c341..7b58f4cad42 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 = "0"; + ver_min = "1"; 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 = "0d21qx0j7awm69jlfx7z7vqddbqarylqifl2bfbfrv779dcbpl48"; + sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"; }; outputs = [ "out" "dev" ]; From c850aa04169a925c2a391d71a5d029d28a571956 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 01:58:27 +0200 Subject: [PATCH 54/67] glib-networking: 2.46.1 -> 2.50.0 --- pkgs/development/libraries/glib-networking/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 5c7b3123cb6..422b7f4c58c 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,15 +2,15 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.46"; - ver_min = "1"; + ver_maj = "2.50"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"; + sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs From 4e595a3dfb4e9895a691a59fb081ebc64d42b27c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:16:35 +0200 Subject: [PATCH 55/67] glibmm: 2.48.1 -> 2.50.0 --- pkgs/development/libraries/glibmm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index ba26a9a5851..0b966c65f38 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.48"; - ver_min = "1"; + ver_maj = "2.50"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw"; + sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"; }; outputs = [ "out" "dev" ]; From c04e46c87d379f1d735c8b8c7135f67c442dbf62 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sat, 1 Oct 2016 10:27:05 -0400 Subject: [PATCH 56/67] llvm3.9: Remove -DCMAKE_BUILD_TYPE=Release flags Since commit 183d05a in 2012, this is the default. --- pkgs/development/compilers/llvm/3.9/clang/default.nix | 1 - pkgs/development/compilers/llvm/3.9/libc++/default.nix | 3 +-- pkgs/development/compilers/llvm/3.9/lldb.nix | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e75da0e9717..6eadb91141d 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 97cf65ad209..3b7caaa24bf 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index bb92a6eed6c..0acef48f57b 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" ]; From ba00ba65eb45db72b35afc3dae619f62cec608a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Oct 2016 23:13:24 +0200 Subject: [PATCH 57/67] util-linux: workaround CVE-2016-2779 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2779 --- pkgs/os-specific/linux/util-linux/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index b777042d601..c11056dff42 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: +{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: stdenv.mkDerivation rec { name = "util-linux-${version}"; @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ]; + # CVE-2016-2779 + (fetchpatch { + url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch; + sha256 = "0parn2zq21lh22r2ixmhqchm4jx2mwj84i9h92225hr4240xxndx"; + })]; outputs = [ "bin" "dev" "out" "man" ]; @@ -50,9 +54,11 @@ stdenv.mkDerivation rec { makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; - nativeBuildInputs = [ pkgconfig ]; + # autoreconfHook is required for CVE-2016-2779 + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + # libseccomp is required for CVE-2016-2779 buildInputs = - [ zlib pam ] + [ zlib pam libseccomp ] ++ lib.optional (ncurses != null) ncurses ++ lib.optional (systemd != null) systemd ++ lib.optional (perl != null) perl; From 2ad13953a45a54816b73632277dcdbeda063827e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 3 Oct 2016 18:31:54 +0200 Subject: [PATCH 58/67] help2man: fix hash --- pkgs/development/tools/misc/help2man/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6839335245f..8bf3db59147 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2"; + sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; From b7c358167eca499fb0fa70782657d5703f3c0af4 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 22 Sep 2016 16:00:40 +0200 Subject: [PATCH 59/67] libusb: 1.0.19 -> 1.0.20 --- pkgs/development/libraries/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 3f5d1b91723..947a10c0e47 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: stdenv.mkDerivation rec { - name = "libusb-1.0.19"; + name = "libusb-1.0.20"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; + sha256 = "1zzp6hc7r7m3gl6zjbmzn92zkih4664cckaf49l1g5hapa8721fb"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure From 1525568c74f80ce4486bd29f3bbc63b784e897b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Oct 2016 23:04:39 +0200 Subject: [PATCH 60/67] util-linux: fixup patch hash from grandparent merge And name the file, too. --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index c11056dff42..f8461113903 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch - # CVE-2016-2779 (fetchpatch { + name = "CVE-2016-2779.diff"; url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch; - sha256 = "0parn2zq21lh22r2ixmhqchm4jx2mwj84i9h92225hr4240xxndx"; + sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60"; })]; outputs = [ "bin" "dev" "out" "man" ]; From ebe90e3e2dc07fe0675593efe558e96b2b55ceb3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 4 Oct 2016 10:08:05 -0500 Subject: [PATCH 61/67] kde5.frameworks: 5.24 -> 5.26 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/kglobalaccel.nix | 14 +- .../kde-frameworks/kservice/default.nix | 5 +- .../libraries/kde-frameworks/solid.nix | 9 +- .../libraries/kde-frameworks/srcs.nix | 578 +++++++++--------- 5 files changed, 303 insertions(+), 305 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 4a01d1d8314..2ccc172c074 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.26/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 8ac0adafbd1..bbb480c3165 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,11 +1,7 @@ -{ kdeFramework, lib -, ecm -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, qtx11extras +{ + kdeFramework, lib, ecm, + kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, + qtx11extras }: kdeFramework { @@ -13,6 +9,6 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras + kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 12e617a7d9a..ca840fc8b71 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,12 +1,13 @@ { - kdeFramework, lib, copyPathsToStore, ecm, + kdeFramework, lib, copyPathsToStore, + bison, ecm, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - propagatedNativeBuildInputs = [ ecm ]; + propagatedNativeBuildInputs = [ bison ecm flex ]; nativeBuildInputs = [ kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index aad6e5eb601..de10a734558 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,11 +1,12 @@ -{ kdeFramework, lib -, ecm -, qtdeclarative +{ + kdeFramework, lib, + bison, ecm, flex, + qtdeclarative }: kdeFramework { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ bison ecm flex ]; propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 5c48ece1e99..ec1602d5aa2 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,581 +1,581 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { attica = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/attica-5.24.0.tar.xz"; - sha256 = "0d368gmds7m7k5pnn625wqsij38cvxk1gkm4zv24phnk9f67v7cw"; - name = "attica-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/attica-5.26.0.tar.xz"; + sha256 = "1z7718vzknp25lzx4kh0k7xw7jgx5q8afwhfcdqhfrbydbch5ilc"; + name = "attica-5.26.0.tar.xz"; }; }; baloo = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/baloo-5.24.0.tar.xz"; - sha256 = "1ayfdg6j9lvas17ryjdv4a0kaj6vw3bxfy2x9nadl0gkc9pak4nh"; - name = "baloo-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/baloo-5.26.0.tar.xz"; + sha256 = "0cgk2fmm1hivzjajih3f09x901cncl2rxxp4qq7wz6g7d2s59pfy"; + name = "baloo-5.26.0.tar.xz"; }; }; bluez-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/bluez-qt-5.24.0.tar.xz"; - sha256 = "0gy0m7lcwwklf021l5i3v7j0cl7qz7cgvzrwpj87ix3kyw5xs80z"; - name = "bluez-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/bluez-qt-5.26.0.tar.xz"; + sha256 = "0n235jsx6vw4v13y3hkbiz5fh4453avgvrwd1zzs4yc5mkz5w837"; + name = "bluez-qt-5.26.0.tar.xz"; }; }; breeze-icons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/breeze-icons-5.24.0.tar.xz"; - sha256 = "1dh7bijx99sdb3vn6394wmm5cq0fvvmz8h17sx4hakmbga849cx2"; - name = "breeze-icons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/breeze-icons-5.26.0.tar.xz"; + sha256 = "1kbbiid89inb7dpn0z612gb7v4p2msbvp9g5varb7wvyld1dgh59"; + name = "breeze-icons-5.26.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/extra-cmake-modules-5.24.0.tar.xz"; - sha256 = "01m12ml529pwr2sal951r5z6yb1rwbpid1y4k14nlk3xqgmdakwa"; - name = "extra-cmake-modules-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/extra-cmake-modules-5.26.0.tar.xz"; + sha256 = "1v3riz49r7pwvnj1ls6wnw0c4g69iky9yck2m4hgr9641k0rqlnd"; + name = "extra-cmake-modules-5.26.0.tar.xz"; }; }; frameworkintegration = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/frameworkintegration-5.24.0.tar.xz"; - sha256 = "0brqgq05m06d98qqvyh30727f5z7hlzxgqysfhfvqzcf3x7f6yzj"; - name = "frameworkintegration-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/frameworkintegration-5.26.0.tar.xz"; + sha256 = "0lqnwgsd6ads17qzdbd75azpk1h5ky3924ygzhbam1llnvcvfk9p"; + name = "frameworkintegration-5.26.0.tar.xz"; }; }; kactivities = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kactivities-5.24.0.tar.xz"; - sha256 = "0s8g43zk6h35bq1am1nnhj0qvmhd6kz42gs8l7ybga0367jghzhf"; - name = "kactivities-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kactivities-5.26.0.tar.xz"; + sha256 = "0cnciipmflnn1dxz69iqc2xy6g27sw4yr17yq3hp0r6kkycmpf71"; + name = "kactivities-5.26.0.tar.xz"; }; }; kactivities-stats = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kactivities-stats-5.24.0.tar.xz"; - sha256 = "1z3xvpifxbd05b2xaxxyiypcpid7jgjb1qpwiyjj1gnfp4rjmzpc"; - name = "kactivities-stats-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kactivities-stats-5.26.0.tar.xz"; + sha256 = "0vpbsg6jswaw3ax4ypp6ak823iymh9jqdf7ssn9kqljynnjhnfv8"; + name = "kactivities-stats-5.26.0.tar.xz"; }; }; kapidox = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kapidox-5.24.0.tar.xz"; - sha256 = "19a7alvn71nxflsyi7y3hghx1iw04qqc77qy54mcxcpkiyvpsggf"; - name = "kapidox-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kapidox-5.26.0.tar.xz"; + sha256 = "1snz4szrgbdzy03jc0sax9r7b1jynj2npil1ngpr40xchs70vnb8"; + name = "kapidox-5.26.0.tar.xz"; }; }; karchive = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/karchive-5.24.0.tar.xz"; - sha256 = "1n5nfhrfvqnrdjgjjy7arqik4fya5bp3dvxa16mlhqr19azkavzq"; - name = "karchive-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/karchive-5.26.0.tar.xz"; + sha256 = "1sysk9zznnahrdjfxxp3aaw6qy9c5l7agh1nbhnk0j5xm31js25g"; + name = "karchive-5.26.0.tar.xz"; }; }; kauth = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kauth-5.24.0.tar.xz"; - sha256 = "14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49"; - name = "kauth-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kauth-5.26.0.tar.xz"; + sha256 = "08k1x943z7a044ihv79lm1c0vas5x9wc9wr4qirhllkrxd87nsc1"; + name = "kauth-5.26.0.tar.xz"; }; }; kbookmarks = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kbookmarks-5.24.0.tar.xz"; - sha256 = "10d8dnhvbrwp0dbmz93cqfdff6ir8iy3yiwaf9ihj6ma124qlyjn"; - name = "kbookmarks-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kbookmarks-5.26.0.tar.xz"; + sha256 = "0phhf5xv11iyf5vi8x6xwx7rqlxc27451bwmm2sr0c65bnnkj57j"; + name = "kbookmarks-5.26.0.tar.xz"; }; }; kcmutils = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcmutils-5.24.0.tar.xz"; - sha256 = "0aws1c76s6wbp0xpr6qv6cfwq8dw82v00pkf9gy84sbxknwjnizk"; - name = "kcmutils-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcmutils-5.26.0.tar.xz"; + sha256 = "1pymbf50idnrz8vyy9lm9535h6s7ssd3p70fdg8dicx7lx6s5grd"; + name = "kcmutils-5.26.0.tar.xz"; }; }; kcodecs = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcodecs-5.24.0.tar.xz"; - sha256 = "1qpzjh3qc2zz80j2bmlinipbispms14k9bmqw8v61zhi6in9z14c"; - name = "kcodecs-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcodecs-5.26.0.tar.xz"; + sha256 = "18xzxi5y47rn3wlxz3m98ix7sd20vmxnqsm3lksgakk08qcv47wk"; + name = "kcodecs-5.26.0.tar.xz"; }; }; kcompletion = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcompletion-5.24.0.tar.xz"; - sha256 = "1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv"; - name = "kcompletion-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcompletion-5.26.0.tar.xz"; + sha256 = "1f3h6qrpqsdds5zf99qkzxan2lh1y83d67pdswqvbfvwhr3bnl7s"; + name = "kcompletion-5.26.0.tar.xz"; }; }; kconfig = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kconfig-5.24.0.tar.xz"; - sha256 = "1dc2i6icyigw1j6qxgdza6j2g8afh390qmxsa2a54mwl84fkfmxv"; - name = "kconfig-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kconfig-5.26.0.tar.xz"; + sha256 = "0rsym5196agxzxzfxzywvsqlgvarnvw91zx04xvlsy70fnj70c4d"; + name = "kconfig-5.26.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kconfigwidgets-5.24.0.tar.xz"; - sha256 = "0v25r50gh5i984lzlv0rradghglcfqf0gsfmnkn23h87b86fm9l2"; - name = "kconfigwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kconfigwidgets-5.26.0.tar.xz"; + sha256 = "08jr6rhh8fi85827bqxh8v4pavq63i2kzwbvqcfpvrrncj5aj4ci"; + name = "kconfigwidgets-5.26.0.tar.xz"; }; }; kcoreaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcoreaddons-5.24.0.tar.xz"; - sha256 = "06sx7by3nvaridnavj5p0bxv4nh47n708jlacfw8ydaikmd9i03h"; - name = "kcoreaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcoreaddons-5.26.0.tar.xz"; + sha256 = "10krqzrmbzzkj0xg5rxgs6i4ngg57ydqn3fkmpyz0x6g4yl3raqz"; + name = "kcoreaddons-5.26.0.tar.xz"; }; }; kcrash = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcrash-5.24.0.tar.xz"; - sha256 = "1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w"; - name = "kcrash-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcrash-5.26.0.tar.xz"; + sha256 = "0x60rw2zy37s38fpa8agggl9mm4kgvdabbcgr673p7b6k6vj46j8"; + name = "kcrash-5.26.0.tar.xz"; }; }; kdbusaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdbusaddons-5.24.0.tar.xz"; - sha256 = "183nxqrhz4qk4qfp1w4an0scp2dvfqcaqbpg4cgbgk0z590q0pkk"; - name = "kdbusaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdbusaddons-5.26.0.tar.xz"; + sha256 = "0wl5lpqqcckn003kqfz1wapi40wkn4xjk878zwykg3lplxfdlsqw"; + name = "kdbusaddons-5.26.0.tar.xz"; }; }; kdeclarative = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdeclarative-5.24.0.tar.xz"; - sha256 = "00ik9q1r6y6g5rkdq96yczgrxmcg85x00lipyljvc3x6xw6bixbz"; - name = "kdeclarative-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdeclarative-5.26.0.tar.xz"; + sha256 = "0hmj0aj559i9flsw72zzwb2s95ajnzqh11rrs6wmcraywd4xywk8"; + name = "kdeclarative-5.26.0.tar.xz"; }; }; kded = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kded-5.24.0.tar.xz"; - sha256 = "0ngpxdxb596myn5r4kjxahx195bwklq33yvgjvcbxi2clg2wccaj"; - name = "kded-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kded-5.26.0.tar.xz"; + sha256 = "0rk8jh0bg6wqfpjcg0g1i2frmhprc8pmnj6bwdifx119kh894n0l"; + name = "kded-5.26.0.tar.xz"; }; }; kdelibs4support = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kdelibs4support-5.24.0.tar.xz"; - sha256 = "12sis63mq6i372bhx64x8y0pw6czrv64hdhjscx27cx65a4ir451"; - name = "kdelibs4support-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kdelibs4support-5.26.0.tar.xz"; + sha256 = "0jc05qzpcn72rvfyink7x56hvc7g21dcmgkfdx9w84brvqjnscz8"; + name = "kdelibs4support-5.26.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdesignerplugin-5.24.0.tar.xz"; - sha256 = "0i0s8pwwhwh5hyyvkv0cnj0yyv0g5bnm5xw18knv2yagiy4bvb2j"; - name = "kdesignerplugin-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdesignerplugin-5.26.0.tar.xz"; + sha256 = "10c8d83zl8qlg785rxn4d5ps18p0zplf5l00jnq8ikpa4ijnyn2j"; + name = "kdesignerplugin-5.26.0.tar.xz"; }; }; kdesu = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdesu-5.24.0.tar.xz"; - sha256 = "1ivcnhgvq75xvl0w9g7m45qzallz42ijaq0n1ap09lpdfmjbnrxk"; - name = "kdesu-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdesu-5.26.0.tar.xz"; + sha256 = "0kxqrzbhjahp0cx3n828q2gh1bdxsp7gmhahbhfzasknkvp1nqqs"; + name = "kdesu-5.26.0.tar.xz"; }; }; kdewebkit = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdewebkit-5.24.0.tar.xz"; - sha256 = "1xq36zv7vnllhqbisl6kcna8z6qzlvy29a47g0hbzgl8rc93qskf"; - name = "kdewebkit-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdewebkit-5.26.0.tar.xz"; + sha256 = "1z66jm8zpmksbdk7yzvcps712wd8d85r0dxw8zj3vw0z5yd68cmm"; + name = "kdewebkit-5.26.0.tar.xz"; }; }; kdnssd = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdnssd-5.24.0.tar.xz"; - sha256 = "01b650g031apxc3vd2m91g2fxqk9l8ap67z6rafniphfwy8i0d5m"; - name = "kdnssd-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdnssd-5.26.0.tar.xz"; + sha256 = "0jamzv7wxp50awjzk1vwhmj8pldnm6hjxx5zvsjfif26va30w0q3"; + name = "kdnssd-5.26.0.tar.xz"; }; }; kdoctools = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdoctools-5.24.0.tar.xz"; - sha256 = "1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri"; - name = "kdoctools-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdoctools-5.26.0.tar.xz"; + sha256 = "1306ag1waw0cxkvwbb0n9gb9yc9nw6zzjssjrn19z366yp1z9ja8"; + name = "kdoctools-5.26.0.tar.xz"; }; }; kemoticons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kemoticons-5.24.0.tar.xz"; - sha256 = "0gmc52k5jb553jvzxwsq79v5y87kgav8i5qqv4bqc9yl7p866zhn"; - name = "kemoticons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kemoticons-5.26.0.tar.xz"; + sha256 = "09qpw3vr4l80hp4j6v73nsncmsrsxww2hab9c24i3167ygsvca5s"; + name = "kemoticons-5.26.0.tar.xz"; }; }; kfilemetadata = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kfilemetadata-5.24.0.tar.xz"; - sha256 = "02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy"; - name = "kfilemetadata-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kfilemetadata-5.26.0.tar.xz"; + sha256 = "1y80llazn66f7vndyzspz7w0n1g2xhi8g13qwakws278wsi04p1l"; + name = "kfilemetadata-5.26.0.tar.xz"; }; }; kglobalaccel = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kglobalaccel-5.24.0.tar.xz"; - sha256 = "123v0ld1q88hbm3d0mqgq6lcivfkqh7pbz4hb4n76ab5v43qc15c"; - name = "kglobalaccel-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kglobalaccel-5.26.0.tar.xz"; + sha256 = "0a1q9pif4n8fmp9kw8sbiaia2znc657fm1mi9gyvp5amphjjkzdd"; + name = "kglobalaccel-5.26.0.tar.xz"; }; }; kguiaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kguiaddons-5.24.0.tar.xz"; - sha256 = "0ig96ah20ybg5rwpswj9va2klvkh2q4amwxmgy3z4niwfsm2g3ic"; - name = "kguiaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kguiaddons-5.26.0.tar.xz"; + sha256 = "0gaaxkzjpdqk8534dpbn6dxb83nckh1g7w62nssv4a2jwfkyrmgp"; + name = "kguiaddons-5.26.0.tar.xz"; }; }; khtml = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/khtml-5.24.0.tar.xz"; - sha256 = "0f19m8ycaa41p61i0j43gafn364abral8dbiqhr0qcj33nsa4134"; - name = "khtml-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/khtml-5.26.0.tar.xz"; + sha256 = "1h1dacbwix1j9r0hgnpxhgjfbffh545852n2yn8kl25bf2ppx3m8"; + name = "khtml-5.26.0.tar.xz"; }; }; ki18n = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ki18n-5.24.0.tar.xz"; - sha256 = "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv"; - name = "ki18n-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ki18n-5.26.0.tar.xz"; + sha256 = "1f5xr2zskmi9x0xp6drg4mx41hs3ssyskpkd5x01b6s51av0i247"; + name = "ki18n-5.26.0.tar.xz"; }; }; kiconthemes = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kiconthemes-5.24.0.tar.xz"; - sha256 = "1k5zig2n6wzfyv6pc8dpas2862mxjyxxza00m31myrfw5i1a1h6m"; - name = "kiconthemes-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kiconthemes-5.26.0.tar.xz"; + sha256 = "0zccfdwy12zssbca4szwypykzvz3yiqwi69sz1ndpiwsvvp575b7"; + name = "kiconthemes-5.26.0.tar.xz"; }; }; kidletime = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kidletime-5.24.0.tar.xz"; - sha256 = "09jsj0pj27h93nr8v46savs6b93h8frydinfr7wlijkvpsl02jb4"; - name = "kidletime-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kidletime-5.26.0.tar.xz"; + sha256 = "13wpfkr3jsj3p16c67jfiy60pi0j1b85wrkc9bqx91wl8a22xy02"; + name = "kidletime-5.26.0.tar.xz"; }; }; kimageformats = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kimageformats-5.24.0.tar.xz"; - sha256 = "12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc"; - name = "kimageformats-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kimageformats-5.26.0.tar.xz"; + sha256 = "13ibvrfjxm799sis1cilyaqc6cnb9wr464z605skn7qd2gqz7xfx"; + name = "kimageformats-5.26.0.tar.xz"; }; }; kinit = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kinit-5.24.0.tar.xz"; - sha256 = "1i7l6gid5hrrfglw1c461gpjg51dwz7cl4lx7ll8vz2ha8mz4d3n"; - name = "kinit-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kinit-5.26.0.tar.xz"; + sha256 = "031wjnniqmvix70da4x019r21zcv99xa4njzk0nccfihpn6i2nx9"; + name = "kinit-5.26.0.tar.xz"; }; }; kio = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kio-5.24.0.tar.xz"; - sha256 = "0zncj9yf8zaylazlwvirylpk9vki3j889b1x2s0aav54vvj7vdi5"; - name = "kio-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kio-5.26.0.tar.xz"; + sha256 = "1kvn570gcpzvm4fc8jygvf3w5jbgsjm4sr2bysbvw4zk983ldma0"; + name = "kio-5.26.0.tar.xz"; }; }; kitemmodels = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kitemmodels-5.24.0.tar.xz"; - sha256 = "1s1p4nw1pqdzbdwvjnka17p9avf00wadr437p4f96md1lvh3sh69"; - name = "kitemmodels-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kitemmodels-5.26.0.tar.xz"; + sha256 = "1qizknavlgnhc5dqrq5ins6k4s43s815v7inzwhs4qrgv175qcjv"; + name = "kitemmodels-5.26.0.tar.xz"; }; }; kitemviews = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kitemviews-5.24.0.tar.xz"; - sha256 = "0y3fx9hk1x27arrmwfzq783a44cs7p8dpmhxrwzh0di4mwa8jafw"; - name = "kitemviews-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kitemviews-5.26.0.tar.xz"; + sha256 = "1z4j1h0bykb3544iy48halb9mrjmkrd40x2c09qsm2r1kc7n3312"; + name = "kitemviews-5.26.0.tar.xz"; }; }; kjobwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kjobwidgets-5.24.0.tar.xz"; - sha256 = "1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc"; - name = "kjobwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kjobwidgets-5.26.0.tar.xz"; + sha256 = "0l2h7ghnrs3w8md5yajnbfl6na5ldg17sh9ifvhcwg6n9s57mibb"; + name = "kjobwidgets-5.26.0.tar.xz"; }; }; kjs = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kjs-5.24.0.tar.xz"; - sha256 = "1qd5sdfrdg7id0g5mwf3ijwlfvh3g36kwnckw6kwns1nf4q6gwlz"; - name = "kjs-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kjs-5.26.0.tar.xz"; + sha256 = "1f8mhhzq5k3ifpa1b0yspy886j9b82isz0vw16zl611fr564jln2"; + name = "kjs-5.26.0.tar.xz"; }; }; kjsembed = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kjsembed-5.24.0.tar.xz"; - sha256 = "1nx8ch8mzd1jyx8pd46364ij0bsbsclbipbgr6jm9aak3n13b0nw"; - name = "kjsembed-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kjsembed-5.26.0.tar.xz"; + sha256 = "030wrrxsdfkyalydi39s85hm0rgfx7647c4a4c1cck2v67k8iq3d"; + name = "kjsembed-5.26.0.tar.xz"; }; }; kmediaplayer = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kmediaplayer-5.24.0.tar.xz"; - sha256 = "147xrffkvkyv3h8ighc1vlwksysfrqc0g55k8zrd72l6r0kjjh0p"; - name = "kmediaplayer-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kmediaplayer-5.26.0.tar.xz"; + sha256 = "0zq9xx6g0lfdyxrkrjqyrq6hnygpd7n0grrm6a75hdmyh3lklrvv"; + name = "kmediaplayer-5.26.0.tar.xz"; }; }; knewstuff = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knewstuff-5.24.0.tar.xz"; - sha256 = "0xdv3wh3100vzsx8p2zihy1dvh0wzfmrjkjq71v8igwz5d291zsj"; - name = "knewstuff-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knewstuff-5.26.0.tar.xz"; + sha256 = "0jd80wmdz241ddk4wdqwrb655r5lzxbxbp0mjyljgi1mwlrhkry4"; + name = "knewstuff-5.26.0.tar.xz"; }; }; knotifications = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knotifications-5.24.0.tar.xz"; - sha256 = "0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa"; - name = "knotifications-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knotifications-5.26.0.tar.xz"; + sha256 = "01fvbi4dlqhia5iqj0iddbvkzjafw698pmh2ii9ynb071sqyb2pq"; + name = "knotifications-5.26.0.tar.xz"; }; }; knotifyconfig = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knotifyconfig-5.24.0.tar.xz"; - sha256 = "1dij841fnqia4p44x2wnpdvl8cn3nkj833y0fah50fmipjc8r70b"; - name = "knotifyconfig-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knotifyconfig-5.26.0.tar.xz"; + sha256 = "14ri2zkzc1b3wqvfb3v6rv0ri5srm7zjk06v9j5bwz778vdh436z"; + name = "knotifyconfig-5.26.0.tar.xz"; }; }; kpackage = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpackage-5.24.0.tar.xz"; - sha256 = "03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri"; - name = "kpackage-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpackage-5.26.0.tar.xz"; + sha256 = "1laq92gi67gn6gjz9nw51idq0wwyfwy6syfch0mssw3nbv7araqg"; + name = "kpackage-5.26.0.tar.xz"; }; }; kparts = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kparts-5.24.0.tar.xz"; - sha256 = "0z7qr93aq02i7g7cxgypx2rzlnsvbsx9cjblb0ijmad1nb8w3mix"; - name = "kparts-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kparts-5.26.0.tar.xz"; + sha256 = "1ni17k02152axvkx666lx77zwpbsfahknrhgy8y8sy2dbn47jvya"; + name = "kparts-5.26.0.tar.xz"; }; }; kpeople = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpeople-5.24.0.tar.xz"; - sha256 = "0iknzkj23y927xh24kw5sjxyirhy6pkmfcmmgwzd78rba8a54qp2"; - name = "kpeople-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpeople-5.26.0.tar.xz"; + sha256 = "1zx9mvy1j2ynbj7gg4hnvxrjr5akmrh0l82xh73l4b12l0b775ap"; + name = "kpeople-5.26.0.tar.xz"; }; }; kplotting = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kplotting-5.24.0.tar.xz"; - sha256 = "0gpypq9kh4b5s6dc7py3m117k3nbxczsfkxgxd9zxvr35kig7ya2"; - name = "kplotting-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kplotting-5.26.0.tar.xz"; + sha256 = "1f695bb5n46mn362wwvwf636xjy87s63w5ac97lm1c9ndiins394"; + name = "kplotting-5.26.0.tar.xz"; }; }; kpty = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpty-5.24.0.tar.xz"; - sha256 = "1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs"; - name = "kpty-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpty-5.26.0.tar.xz"; + sha256 = "1f1z4z73l4xb5vymg5hsqxcgv7jm81jnjgwn0v85alfcx94dax3m"; + name = "kpty-5.26.0.tar.xz"; }; }; kross = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kross-5.24.0.tar.xz"; - sha256 = "0f29dpmfcj173vqnmrbpvdmfmzzbfsds1lbl546qfx9a5acdpf2p"; - name = "kross-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kross-5.26.0.tar.xz"; + sha256 = "05ilcgq74l5m3jjr047zwz7ij60yw5xxp5cpd12892mi054ijb31"; + name = "kross-5.26.0.tar.xz"; }; }; krunner = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/krunner-5.24.0.tar.xz"; - sha256 = "0ff87ijjd47jxf6zw2ggqgngnbyx1rj59wdfgy5wbi3acws6bafl"; - name = "krunner-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/krunner-5.26.0.tar.xz"; + sha256 = "050qq146g9wj51615m22l9jjxmgh3gsah3v7iflbdda5nrnzhz3v"; + name = "krunner-5.26.0.tar.xz"; }; }; kservice = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kservice-5.24.0.tar.xz"; - sha256 = "0w0nsg64d6xhgijr2vh0j5p544qi0q55jpqa9v9mv956zrrdssdk"; - name = "kservice-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kservice-5.26.0.tar.xz"; + sha256 = "103hjnwh4zwpf8vz3si27jb34j6dm0ff445nc9xafnl1nkwisvgr"; + name = "kservice-5.26.0.tar.xz"; }; }; ktexteditor = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ktexteditor-5.24.0.tar.xz"; - sha256 = "1ykj1kvm7k1vxb1w235d5hp2swwdqjyp2y4c3pxbvkn999h9x5q5"; - name = "ktexteditor-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ktexteditor-5.26.0.tar.xz"; + sha256 = "0q84vbdkhg1sjhyrcv9y8cdv5qx09f1pz5wiw7dzdw06q9xgi3v4"; + name = "ktexteditor-5.26.0.tar.xz"; }; }; ktextwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ktextwidgets-5.24.0.tar.xz"; - sha256 = "1q10xav2gkii6s3m31c9xvxf1988l7k2lpib6pyhgsidflmwjm02"; - name = "ktextwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ktextwidgets-5.26.0.tar.xz"; + sha256 = "0qafnlzkdqbp1par1s6mish46arbqwbl4xclvql168dlwxgd6b42"; + name = "ktextwidgets-5.26.0.tar.xz"; }; }; kunitconversion = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kunitconversion-5.24.0.tar.xz"; - sha256 = "03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8"; - name = "kunitconversion-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kunitconversion-5.26.0.tar.xz"; + sha256 = "08nd2i76l4mvgav69qcsq0rwc0r9rkmqy0d4d3b4bc9957yfhk4i"; + name = "kunitconversion-5.26.0.tar.xz"; }; }; kwallet = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwallet-5.24.0.tar.xz"; - sha256 = "0zad5h4vsvcl2xv3vxsjwh42b71xbp6x6rj8cvmw8szr2rzz9gsx"; - name = "kwallet-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwallet-5.26.0.tar.xz"; + sha256 = "0a3l079zry8bmwkd2lx0cvmkj8p3pvrvpffikca6z4qdw4mnnxjs"; + name = "kwallet-5.26.0.tar.xz"; }; }; kwayland = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwayland-5.24.0.tar.xz"; - sha256 = "1h5anbqrxcl1s8kx1l53vcsfr8ifamcjqd47dk8a7lwr1ga6myq2"; - name = "kwayland-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwayland-5.26.0.tar.xz"; + sha256 = "1ca2f0k1qsra3c014c3lrn2qxsdq1whk5lqrxqc9dqbpvpyjy939"; + name = "kwayland-5.26.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwidgetsaddons-5.24.0.tar.xz"; - sha256 = "1kppx0ppfhnb6q6sijs2dffyar86wkkx8miqavsjsgw1l2wiymcx"; - name = "kwidgetsaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwidgetsaddons-5.26.0.tar.xz"; + sha256 = "1jam478939cibyhnwg6n3fwyqg8lx1njjbqmlqq4cmp9j62100cn"; + name = "kwidgetsaddons-5.26.0.tar.xz"; }; }; kwindowsystem = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwindowsystem-5.24.0.tar.xz"; - sha256 = "0w5ym8msl80v3q65253pdpj9f1fmb658rnndlbkrgpmm1rv1n6dz"; - name = "kwindowsystem-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwindowsystem-5.26.0.tar.xz"; + sha256 = "1jmacixr2il5wpw7wzaqswslvmxam3qf7mih271qzbx6k6ngdyk3"; + name = "kwindowsystem-5.26.0.tar.xz"; }; }; kxmlgui = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kxmlgui-5.24.0.tar.xz"; - sha256 = "1qhixldhhcbklmrpjh67440h1rrzqy70h57hw6ialjdsr3pl6ihp"; - name = "kxmlgui-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kxmlgui-5.26.0.tar.xz"; + sha256 = "18w41iyfg2iphav2g7qikg4ccv2cr0wl5a6r9h460f45vq9aph4z"; + name = "kxmlgui-5.26.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kxmlrpcclient-5.24.0.tar.xz"; - sha256 = "06ap6ipzqimz1rfrcr7z8zc7idy7sg4a97dws7h52i34ms7jqnc8"; - name = "kxmlrpcclient-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kxmlrpcclient-5.26.0.tar.xz"; + sha256 = "001rvsmxi1mnbrs1kplsb8vx1wfpjp9g4kwm7714w3yh6vmr9j7p"; + name = "kxmlrpcclient-5.26.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/modemmanager-qt-5.24.0.tar.xz"; - sha256 = "0khz5bf84xxa8aqpzwb6x839xx6dbiadwqhyj7cvgha65fh2xinh"; - name = "modemmanager-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/modemmanager-qt-5.26.0.tar.xz"; + sha256 = "1x4h334fcyqnclc9sxff73b79fsgg7a0r98c9palr787qvaafjv2"; + name = "modemmanager-qt-5.26.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/networkmanager-qt-5.24.0.tar.xz"; - sha256 = "11wy0ds0hqbba900ggkcxjfqc9n65xlzc3h1zv9433nn5d75v6fy"; - name = "networkmanager-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/networkmanager-qt-5.26.0.tar.xz"; + sha256 = "0yqhchkava6jsyl0gpa62x4856qszdiglwjxsba9dgl5lasfyrg0"; + name = "networkmanager-qt-5.26.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/oxygen-icons5-5.24.0.tar.xz"; - sha256 = "1c7spjbzk04725vv0ly7vmyvwa96mfa5ki2pm146ld4888a896wm"; - name = "oxygen-icons5-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/oxygen-icons5-5.26.0.tar.xz"; + sha256 = "0lwwl26xiya7fr5ga5kf45zvj40lm10jpd7p523v2dm0xmqbkf8n"; + name = "oxygen-icons5-5.26.0.tar.xz"; }; }; plasma-framework = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/plasma-framework-5.24.0.tar.xz"; - sha256 = "0981vm00541dzihlr1fsax05biwp2ddpwjrmvnfysx5jagdc65cb"; - name = "plasma-framework-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz"; + sha256 = "0mjmzca0n51vwy9gxxanxfi2dvvzzdpwfjw0zdwmjm69znc870ja"; + name = "plasma-framework-5.26.0.tar.xz"; }; }; solid = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/solid-5.24.0.tar.xz"; - sha256 = "00wvsxcnvhdx7ijzpcz5wny2ypkxr1drdpr4yvawgpwa678l1107"; - name = "solid-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/solid-5.26.0.tar.xz"; + sha256 = "1dlln9dqyf7md32s6a7pd23dbs6jrvv59ylldxcxgkyjyyb2g0j3"; + name = "solid-5.26.0.tar.xz"; }; }; sonnet = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/sonnet-5.24.0.tar.xz"; - sha256 = "152xz7fb1iwhb5w1n4xqvc648iaxi0inrl4kavxcsir61das1xyl"; - name = "sonnet-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/sonnet-5.26.0.tar.xz"; + sha256 = "0akvlrbbk0nbyh12rmcjch122xqa3926gz3l31bvhqgm50b683z2"; + name = "sonnet-5.26.0.tar.xz"; }; }; threadweaver = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/threadweaver-5.24.0.tar.xz"; - sha256 = "02g60zr9cc4bg1p90giich4n0qvqaiakz0y94qrnyj9f7fg0yksl"; - name = "threadweaver-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/threadweaver-5.26.0.tar.xz"; + sha256 = "1bzlw3m1f207967pjmzlx1k0v38fwjvga9jg88iqh43zb60ks03a"; + name = "threadweaver-5.26.0.tar.xz"; }; }; } From fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 4 Oct 2016 10:09:31 -0500 Subject: [PATCH 62/67] qt5.qtbase: ruby is no longer a dependency --- pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 +++--- pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 6 +++--- pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index d36a7ef8273..138faf86506 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -205,7 +205,7 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ bison flex gperf ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib @@ -256,7 +256,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 2f414efc314..25e94c44ad2 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -180,7 +180,7 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ bison flex gperf ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib @@ -213,7 +213,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index a31452e6d9b..81d0e446f2a 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python ruby ]; + [ bison flex gperf lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; @@ -216,7 +216,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects From 379c511126f9cb1a03f77c7d4503ecb5e69592db Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 4 Oct 2016 21:31:47 -0500 Subject: [PATCH 63/67] kde5.plasma: 5.7.5 -> 5.8.0 --- pkgs/desktops/kde-5/plasma/default.nix | 4 +- pkgs/desktops/kde-5/plasma/fetch.sh | 2 +- pkgs/desktops/kde-5/plasma/plasma-pa.nix | 15 +- .../kde-5/plasma/plasma-workspace/default.nix | 12 +- pkgs/desktops/kde-5/plasma/srcs.nix | 328 +++++++++--------- 5 files changed, 182 insertions(+), 179 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 2e090255e59..bb123fcdab4 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -78,7 +78,9 @@ let plasma-desktop = callPackage ./plasma-desktop {}; plasma-integration = callPackage ./plasma-integration.nix {}; plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa.nix {}; + plasma-pa = callPackage ./plasma-pa.nix { + inherit (pkgs.gnome3) gconf; + }; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 6b691171079..62504f7b5d9 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.5/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix index b0ad9ac69ff..7bf97d745fe 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-pa.nix @@ -1,16 +1,17 @@ -{ plasmaPackage, ecm, glib, kdoctools, kconfigwidgets -, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio -, plasma-framework +{ + plasmaPackage, + ecm, + gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, + ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework }: plasmaPackage { name = "plasma-pa"; nativeBuildInputs = [ - ecm - kdoctools + ecm kdoctools ]; propagatedBuildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel - ki18n plasma-framework + gconf glib kconfigwidgets kcoreaddons kdeclarative + kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework ]; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix index 09bba4a709f..1e38c0c74dd 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix @@ -5,10 +5,10 @@ baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, - knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland, - kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon, - plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid, isocodes, - libdbusmenu, libSM, libXcursor, pam, wayland + knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, + kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, + phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript, + qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland }: plasmaPackage { @@ -20,8 +20,8 @@ plasmaPackage { kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon - plasma-framework qtquickcontrols qtscript qtx11extras solid - isocodes libdbusmenu libSM libXcursor pam wayland + plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras + solid isocodes libdbusmenu libSM libXcursor pam wayland ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 40ac7615ac7..1a9b04ce9a6 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/bluedevil-5.7.5.tar.xz"; - sha256 = "1kvdaf1dkzafc3kkgwj0jzdkd897jfdqpp9spk9ywg7pd3ds072x"; - name = "bluedevil-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/bluedevil-5.8.0.tar.xz"; + sha256 = "1rpabb4ccjrzql3r3w88jx847cqqg31nppzvaacdvz9g4c648652"; + name = "bluedevil-5.8.0.tar.xz"; }; }; breeze = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/breeze-5.7.5.tar.xz"; - sha256 = "0amxc3g4bb3mg5fai8ssjfvpxd86kx9zz45qpxpgp4jb5g6n03w2"; - name = "breeze-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/breeze-5.8.0.tar.xz"; + sha256 = "0g45vq6pczy0dmim0h8nzi3amhyps03a8y5ajyv4i77drk5ccc0n"; + name = "breeze-5.8.0.tar.xz"; }; }; breeze-grub = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/breeze-grub-5.7.5.tar.xz"; - sha256 = "03wgxxgpgkcx5jrm13h3sc1f5b8zwa2jqzvmc1fpb3y0m4qaajvy"; - name = "breeze-grub-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/breeze-grub-5.8.0.tar.xz"; + sha256 = "1zja3m6hnmmax8p1lh0ygapp3inbydxr98rabcrb8yzkasz95xsf"; + name = "breeze-grub-5.8.0.tar.xz"; }; }; breeze-gtk = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/breeze-gtk-5.7.5.tar.xz"; - sha256 = "0vg60b999z9pli5ng8jnb6svy80jv9c2sn63b7a6xj59xajclzxc"; - name = "breeze-gtk-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/breeze-gtk-5.8.0.tar.xz"; + sha256 = "1lzhaw8rml5cpd965zdj9n1xw9w965rl0yq1xwbsyad7qln864n3"; + name = "breeze-gtk-5.8.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/breeze-plymouth-5.7.5.tar.xz"; - sha256 = "08bxsfljpaz3qpy7p6zxs1bfnssjs951kh3v0qb5wwa4zpm04zpd"; - name = "breeze-plymouth-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/breeze-plymouth-5.8.0.tar.xz"; + sha256 = "0p0dg97f94n59918jg4hr8z0hfsv46s1iz0gcgwy6v3s7jhl0cy8"; + name = "breeze-plymouth-5.8.0.tar.xz"; }; }; discover = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/discover-5.7.5.tar.xz"; - sha256 = "1i3qmyxl4rs3849hsgda85x6lckbl4ycal3dl3s6k1mx9fk6hm6c"; - name = "discover-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/discover-5.8.0.tar.xz"; + sha256 = "0wxa5w9rys5w4mr81cr7z0n721lp1hyl9ab006drszbdsqb512kb"; + name = "discover-5.8.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kactivitymanagerd-5.7.5.tar.xz"; - sha256 = "1ly57792c27vvia62gmnc3xrpav9ysfzql8xrapw09vdvyp0yc6r"; - name = "kactivitymanagerd-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kactivitymanagerd-5.8.0.tar.xz"; + sha256 = "1hjfyw5r6fzl8q07rlnzca59lh9229w30hb7v3m3nz9fi0jksxwy"; + name = "kactivitymanagerd-5.8.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kde-cli-tools-5.7.5.tar.xz"; - sha256 = "0jmav5mkn3qvv8a52kpfyn0065g4wnqiw2r7gw9fh0qh4wckd85s"; - name = "kde-cli-tools-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kde-cli-tools-5.8.0.tar.xz"; + sha256 = "19i8wycgsk7yqv7scmwnnd0cridnvg6v8p5jj5x98bc9z1g2jqc5"; + name = "kde-cli-tools-5.8.0.tar.xz"; }; }; kdecoration = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kdecoration-5.7.5.tar.xz"; - sha256 = "091h6aivk58k66cpry6h3i4w3vsmpl0d3i9r9zz679j0mz5vghxf"; - name = "kdecoration-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kdecoration-5.8.0.tar.xz"; + sha256 = "0gab3lpg5p156628wy04svbyj81jwpq133bbycrc97k281m2nppr"; + name = "kdecoration-5.8.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kde-gtk-config-5.7.5.tar.xz"; - sha256 = "1r82js7b2js97v803qky6cybb1239c0628m4a11am81191d0a0rn"; - name = "kde-gtk-config-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kde-gtk-config-5.8.0.tar.xz"; + sha256 = "1b3ncnil4yhwnms53gl7nds3ggjhq6zi0j5hdik829wmplxrh8ac"; + name = "kde-gtk-config-5.8.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kdeplasma-addons-5.7.5.tar.xz"; - sha256 = "04qnbharl3z74d8jwrvky02mrzcy9h92827a8qcx6xis9kfvlrh0"; - name = "kdeplasma-addons-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kdeplasma-addons-5.8.0.tar.xz"; + sha256 = "0sf7f3by07g3w7jf13z7yspqjf14dj7z5p0g8lvks3xsikf74vkc"; + name = "kdeplasma-addons-5.8.0.tar.xz"; }; }; kgamma5 = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kgamma5-5.7.5.tar.xz"; - sha256 = "1x2vn26f6krb9zxkyj7kxj4wlmjqjslvqncvmwbsi4lxpnsrsxsk"; - name = "kgamma5-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kgamma5-5.8.0.tar.xz"; + sha256 = "146jd594byzi2gxvr1iy85p34y8yw04qi5ja9bcpcfzz7m7jwa41"; + name = "kgamma5-5.8.0.tar.xz"; }; }; khotkeys = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/khotkeys-5.7.5.tar.xz"; - sha256 = "0c54zkib69dg31llipbkabd40hs16p0ff4h6mpw3x3iqj2nmxjpg"; - name = "khotkeys-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/khotkeys-5.8.0.tar.xz"; + sha256 = "06sc7s8dim4c55l5m8algxpw3g75lx3mdx9p46pxv5gppg3zlgg1"; + name = "khotkeys-5.8.0.tar.xz"; }; }; kinfocenter = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kinfocenter-5.7.5.tar.xz"; - sha256 = "0f2j25jvqjw4qy7xaqz1l0sba9vsjp6x6f32ykblnb1kbmbzbkgr"; - name = "kinfocenter-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kinfocenter-5.8.0.tar.xz"; + sha256 = "02jrs9c7k8fsz0mvmsj5ammvwm4rxj8835zi0sh427h8l8vs5n6z"; + name = "kinfocenter-5.8.0.tar.xz"; }; }; kmenuedit = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kmenuedit-5.7.5.tar.xz"; - sha256 = "1midyip0vb9zs4xcyzih5vlj49klkmby3w9ylb2mq4bvp9h62bx1"; - name = "kmenuedit-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kmenuedit-5.8.0.tar.xz"; + sha256 = "0ih4qmijnfvs5dp9m8pbr93d3mxvw9bhninfv7m3h0ngkxqwxwfn"; + name = "kmenuedit-5.8.0.tar.xz"; }; }; kscreen = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kscreen-5.7.5.tar.xz"; - sha256 = "1hjnbqgng19k5bxfx9m5kbm6hx6rn0hr7ya00i8nj8qvb4l8q7cd"; - name = "kscreen-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kscreen-5.8.0.tar.xz"; + sha256 = "19p1rfqir59hd8ww8x78m6kgky7n82w0s0gw15404p6wk25nvyzx"; + name = "kscreen-5.8.0.tar.xz"; }; }; kscreenlocker = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kscreenlocker-5.7.5.tar.xz"; - sha256 = "1q8dpfsprrd8ryindi8xpssc8sn2j7fiwzx6awmgxa3ibz0y7zv5"; - name = "kscreenlocker-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kscreenlocker-5.8.0.tar.xz"; + sha256 = "1hr0cqi2zhrq3crs4j9zh10nr7xmnw1bp9nvm1v1psrrg5wilxzw"; + name = "kscreenlocker-5.8.0.tar.xz"; }; }; ksshaskpass = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/ksshaskpass-5.7.5.tar.xz"; - sha256 = "0f89s06phnzwn4k4y51haqcw8i5bp6rh1ns0qpyps03vpalqhwln"; - name = "ksshaskpass-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/ksshaskpass-5.8.0.tar.xz"; + sha256 = "1lklixan8c80yj02rgazr70x20zfh8lrjmimwismdrmvxpadn7sb"; + name = "ksshaskpass-5.8.0.tar.xz"; }; }; ksysguard = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/ksysguard-5.7.5.tar.xz"; - sha256 = "0b9y98043craw4afzs63lw7xgi0fbylyr6iv24zxxyig50n8frs7"; - name = "ksysguard-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/ksysguard-5.8.0.tar.xz"; + sha256 = "1cq6gxwpihfip7wxjlja7ha0pknsn8x8rkpcq3lb28pap88g54fz"; + name = "ksysguard-5.8.0.tar.xz"; }; }; kwallet-pam = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kwallet-pam-5.7.5.tar.xz"; - sha256 = "1ljxfp8w20329c67y0hkk9ar4mff0x3329lq2rlj9sdsxrhbn6sa"; - name = "kwallet-pam-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kwallet-pam-5.8.0.tar.xz"; + sha256 = "10rqfqavawnp6hdqfpv3zwnaw1g8f5zakfirm3aym5w2lllrdydh"; + name = "kwallet-pam-5.8.0.tar.xz"; }; }; kwayland-integration = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kwayland-integration-5.7.5.tar.xz"; - sha256 = "1da8qq67nn2bilarxn9g76hys723jrv8p0vazq7dnis786adk1yl"; - name = "kwayland-integration-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kwayland-integration-5.8.0.tar.xz"; + sha256 = "0pypjbvg2v4f4gsr9pq3w6y5mnlrcd3sjh1wwnad6shcrwkpy8vq"; + name = "kwayland-integration-5.8.0.tar.xz"; }; }; kwin = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kwin-5.7.5.tar.xz"; - sha256 = "1mi6j7lqdarzih8ib4lxxc9wk4yx0898cl9s6j4rqs8rzz9rh7mb"; - name = "kwin-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kwin-5.8.0.tar.xz"; + sha256 = "17lr1ffwmyndqglhk9c3hi2r4kyr86696p15ir33rplzjnki15qc"; + name = "kwin-5.8.0.tar.xz"; }; }; kwrited = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/kwrited-5.7.5.tar.xz"; - sha256 = "0kqjgqq92sd92897sk7a28mzvyjzbismx816llyld6f1lm7saqrs"; - name = "kwrited-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/kwrited-5.8.0.tar.xz"; + sha256 = "10iffb1agqrsy214zpf2ax6ak5ahb6c5p8ik0ar52iwmgxrxkicf"; + name = "kwrited-5.8.0.tar.xz"; }; }; libkscreen = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/libkscreen-5.7.5.tar.xz"; - sha256 = "0z4wk0g7qwr9jq8larpv2y7j7cfklarimjnwdi7hjvgvkjb98671"; - name = "libkscreen-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/libkscreen-5.8.0.tar.xz"; + sha256 = "0bzqdcfibw1zw7nmgsqg9sn9pgcsp5yx53dd4phin741iqafwqm9"; + name = "libkscreen-5.8.0.tar.xz"; }; }; libksysguard = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/libksysguard-5.7.5.tar.xz"; - sha256 = "0iys51c72lg5v503cpns3vqw915mh43p21185v461qmp63pf9145"; - name = "libksysguard-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/libksysguard-5.8.0.tar.xz"; + sha256 = "0h6m2dj8dml98rgq1va8xpyndwq7bj0q0z97644cpiw0sv00cg66"; + name = "libksysguard-5.8.0.tar.xz"; }; }; milou = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/milou-5.7.5.tar.xz"; - sha256 = "0wnz2rj27rk272zk12gj3231lljqiq9z9ymkvfza14pqikx2vyq5"; - name = "milou-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/milou-5.8.0.tar.xz"; + sha256 = "0ahjc28zmdnp4h86929m2719fwbldcj772axbkbz6riljdbhaw4v"; + name = "milou-5.8.0.tar.xz"; }; }; oxygen = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/oxygen-5.7.5.tar.xz"; - sha256 = "0y6s50w27q94zk9kdf6jy4zicr593ks63dygpjhj0iwll3wqnw39"; - name = "oxygen-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/oxygen-5.8.0.tar.xz"; + sha256 = "1snvc7j8bz1f12yx21s2i6lcspwv7apwrrjm90pxyk4mk7lhgmm0"; + name = "oxygen-5.8.0.tar.xz"; }; }; plasma-desktop = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-desktop-5.7.5.tar.xz"; - sha256 = "04x6sr6mh0bkzwbq9kvvr94ffijnzymbdsxzm8r3739grk5hbg3y"; - name = "plasma-desktop-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-desktop-5.8.0.tar.xz"; + sha256 = "1isbgbm12prffkb0bhx1mkr45dng3il0x5mhhm54cnkgn4g6nclb"; + name = "plasma-desktop-5.8.0.tar.xz"; }; }; plasma-integration = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-integration-5.7.5.tar.xz"; - sha256 = "05nfycbzj27q4jcc9qw2d42nxdib73fr7v5ai4agmlrj733bs6nl"; - name = "plasma-integration-5.7.5.tar.xz"; - }; - }; - plasma-mediacenter = { - version = "5.7.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-mediacenter-5.7.5.tar.xz"; - sha256 = "1gv3m1cragvgj6mf1n3zvpjddqxjn8jmqdm657iw87p5qgdzf3fx"; - name = "plasma-mediacenter-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-integration-5.8.0.tar.xz"; + sha256 = "1k776ybz8wd37c283fgnnrvpl573bgwicvgjbfns1127bzybqgy7"; + name = "plasma-integration-5.8.0.tar.xz"; }; }; plasma-nm = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-nm-5.7.5.tar.xz"; - sha256 = "1vpd3bvlvzw1xjs2sxsn4bllc5igxz4102zjnrxhj0r7jrn2ax7b"; - name = "plasma-nm-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-nm-5.8.0.tar.xz"; + sha256 = "1hvzq96xw6f6j637fhaml4n8xv7gp3cif86h9gmxnbqczdfx617r"; + name = "plasma-nm-5.8.0.tar.xz"; }; }; plasma-pa = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-pa-5.7.5.tar.xz"; - sha256 = "09wagng7v33kxlyq8vd498fahcixs00dq22g46243xrf363rsa6i"; - name = "plasma-pa-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-pa-5.8.0.tar.xz"; + sha256 = "0jgsadzdrlyrq8hagqi5m1mr7hmsmjz33vg508a3b7390mwfw8ah"; + name = "plasma-pa-5.8.0.tar.xz"; }; }; plasma-sdk = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-sdk-5.7.5.tar.xz"; - sha256 = "07x1dywdm5x93bm7c6ipm0jqrwlphq45vgp878sd67mwj6gdc2s2"; - name = "plasma-sdk-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-sdk-5.8.0.tar.xz"; + sha256 = "1ncp858cq5nad5n16r1wfk2fg2m30mlaw3hs343rbw81139386m5"; + name = "plasma-sdk-5.8.0.tar.xz"; + }; + }; + plasma-tests = { + version = "5.8.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.8.0/plasma-tests-5.8.0.tar.xz"; + sha256 = "1xacmw8mv3yymz8xj1r37sphrds8y2hsjixali28i7n0njqbx400"; + name = "plasma-tests-5.8.0.tar.xz"; }; }; plasma-workspace = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-workspace-5.7.5.tar.xz"; - sha256 = "1xdr7skwb8jbkc6nzyb7r4ima23qaiyin3qkcf0xa4n20krrlv8i"; - name = "plasma-workspace-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-workspace-5.8.0.tar.xz"; + sha256 = "06dklafkszn0rfm980mixr5kh4p40ybk63my3ayn6y7fd4n1anrn"; + name = "plasma-workspace-5.8.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/plasma-workspace-wallpapers-5.7.5.tar.xz"; - sha256 = "1z64vnm05n8wh17g509ndhmvi1ivbjmdnlxy5jn69ayfipz49bpi"; - name = "plasma-workspace-wallpapers-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/plasma-workspace-wallpapers-5.8.0.tar.xz"; + sha256 = "1nf7ggwpakn14ash0ymmi05ld2wns6bk189845f89cy763ssx52g"; + name = "plasma-workspace-wallpapers-5.8.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.5"; + version = "1-5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/polkit-kde-agent-1-5.7.5.tar.xz"; - sha256 = "1mham7i0wwskjdaybn5rqsib4k77gjwb61yzf7vibbfv6njra8af"; - name = "polkit-kde-agent-1-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/polkit-kde-agent-1-5.8.0.tar.xz"; + sha256 = "0x5sdgbq9jj2z4wdgx6v47d9004srqfvnl0bvmzml53mzyrh07kx"; + name = "polkit-kde-agent-1-5.8.0.tar.xz"; }; }; powerdevil = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/powerdevil-5.7.5.tar.xz"; - sha256 = "1j9fiyqxgccpxxssgj9mjr8wr9sklqq0k1nijzimbc1vg7ghxyak"; - name = "powerdevil-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/powerdevil-5.8.0.tar.xz"; + sha256 = "03l1c1x6a0xhvh4xswv2lwpk7kjl86i5mc3afsx8zp8h59wfg1w1"; + name = "powerdevil-5.8.0.tar.xz"; }; }; sddm-kcm = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/sddm-kcm-5.7.5.tar.xz"; - sha256 = "1s8jkip5fn2ljll0xsj4sy46bz9ggp1qx4q0fwriqagfr0pvphs1"; - name = "sddm-kcm-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/sddm-kcm-5.8.0.tar.xz"; + sha256 = "0in5s7h860vn12w8i55bzxw5hv6bnhp3zapbbf1jpgvwixhx8bkf"; + name = "sddm-kcm-5.8.0.tar.xz"; }; }; systemsettings = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/systemsettings-5.7.5.tar.xz"; - sha256 = "16r0ajzj9g1k1g7ypmxzknwqw38xki98jq9yvycawkf0jpg3h2cn"; - name = "systemsettings-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/systemsettings-5.8.0.tar.xz"; + sha256 = "0kf671hpj42ps27clsc90fj2ndiv3q45y76fc09wv4say351kz1c"; + name = "systemsettings-5.8.0.tar.xz"; }; }; user-manager = { - version = "5.7.5"; + version = "5.8.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.5/user-manager-5.7.5.tar.xz"; - sha256 = "1zrcy8vj59xa0b57liqm48lvkmw9g9w0l4kzkg9li37hf6z3hk6s"; - name = "user-manager-5.7.5.tar.xz"; + url = "${mirror}/stable/plasma/5.8.0/user-manager-5.8.0.tar.xz"; + sha256 = "0zyg8i9igya3j80pz6lj3wav894z0f1j34aysixm5lc7pakghkg6"; + name = "user-manager-5.8.0.tar.xz"; }; }; } From 07d12fbef1c59bcd9077de9d2606e7fa811bd93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Oct 2016 19:04:03 +0200 Subject: [PATCH 64/67] fontforge: get rid of output hash depending on git ... to avoid git changes being mass rebuilds. Thanks to Mic92 for the solution idea. See discussion under: https://github.com/NixOS/nixpkgs/pull/19248 --- pkgs/tools/misc/fontforge/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ba1154ab72d..2cccee0a4e3 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, lib -, autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withGTK ? false, gtk2 , withPython ? true @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { })]; patchFlags = "-p0"; - # FIXME: git isn't really used, but configuration fails without it buildInputs = [ - git autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] @@ -38,7 +37,9 @@ stdenv.mkDerivation rec { ++ lib.optional withGTK "--enable-gtk2-use" ++ lib.optional (!withGTK) "--without-x"; + # work-around: git isn't really used, but configuration fails without it preConfigure = '' + export GIT="$(type -P true)" cp -r "${gnulib}" ./gnulib chmod +w -R ./gnulib ./bootstrap --skip-git --gnulib-srcdir=./gnulib From 5e066e2bcb115f9aafc83ce38540190932e8cc0a Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:17:00 +0200 Subject: [PATCH 65/67] libsigcxx 2.8.0 -> 2.10.0 --- pkgs/development/libraries/libsigcxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index e062e2db5c2..4a309a87f2e 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: let - ver_maj = "2.8"; # odd major numbers are unstable + ver_maj = "2.10"; # odd major numbers are unstable ver_min = "0"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; - sha256 = "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp"; + sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; }; patches = [(fetchpatch { url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" From 7defda8356cc6444be2d40ff085dfee421a51a97 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 5 Oct 2016 19:18:36 -0500 Subject: [PATCH 66/67] gtkmm: fix build error by patching missing operator --- pkgs/development/libraries/gtkmm/2.x.nix | 2 ++ .../gtkmm/gtkmm-2.24.4-missing-operator.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index b87b60c59da..422fdebd9c8 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; }; + patches = [ ./gtkmm-2.24.4-missing-operator.patch ]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch b/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch new file mode 100644 index 00000000000..c1e8cf59dde --- /dev/null +++ b/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch @@ -0,0 +1,11 @@ +--- gtkmm-2.24.4/gtk/gtkmm/menushell.cc.orig 2016-08-26 21:55:08.858311055 +0000 ++++ gtkmm-2.24.4/gtk/gtkmm/menushell.cc 2016-08-26 21:55:33.206310578 +0000 +@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(Menu + { + const Glib::RefPtr item = element.get_child(); + +- g_return_val_if_fail(item != 0, position); ++ g_return_val_if_fail(!!item, position); + g_return_val_if_fail(gparent() != 0, position); + + int pos = -1; \ No newline at end of file From 16dafb018e09363bfae3949a8261c18ee7880781 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 5 Oct 2016 19:19:25 -0500 Subject: [PATCH 67/67] qt55.kdeFrameworks: mark broken KDE Frameworks 5.26 requires Qt 5.6. Qt 5.6 is a designated LTS release; only proprietary packages should use older versions. --- pkgs/development/libraries/kde-frameworks/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 0b12e42db86..cb48738dc10 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -40,6 +40,7 @@ let let inherit (args) name; inherit (srcs."${name}") src version; + qtVersion = (builtins.parseDrvName self.qtbase.name).version; in kdeDerivation (args // { name = "${name}-${version}"; inherit src; @@ -50,6 +51,7 @@ let ]; platforms = lib.platforms.linux; homepage = "http://www.kde.org"; + broken = builtins.compareVersions qtVersion "5.6.0" < 0; } // (args.meta or {}); });