From d72a0e711a7ee10c8fbcfa2e8684e6acd6bb8510 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Mar 2018 12:48:19 -0600 Subject: [PATCH 01/51] nghttp2: 1.24.0 -> 1.31.0 --- 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 d534cd59bd8..703e4d08bd3 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.24.0"; + version = "1.31.0"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "18ys6p39yvm9wjjzhhlw35c9m8f5gf4dk9jbshibj19q4js1pnv9"; + sha256 = "0d7ivd7agsrbpz8745d0c0hxjzx9pdj602p1bpnrsd7p393ydrln"; }; outputs = [ "bin" "out" "dev" "lib" ]; From 19445fa145d17929ff09447b7670401d071c3da6 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Fri, 4 May 2018 10:33:42 -0700 Subject: [PATCH 02/51] nixos/powerManagement: add "med_power_with_dipm" scsiLinkPolicy --- .../tasks/scsi-link-power-management.nix | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 484c0a0186d..69599bda6d3 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -2,7 +2,20 @@ with lib; -let cfg = config.powerManagement.scsiLinkPolicy; in +let + + cfg = config.powerManagement.scsiLinkPolicy; + + kernel = config.boot.kernelPackages.kernel; + + allowedValues = [ + "min_power" + "max_performance" + "medium_power" + "med_power_with_dipm" + ]; + +in { ###### interface @@ -11,10 +24,13 @@ let cfg = config.powerManagement.scsiLinkPolicy; in powerManagement.scsiLinkPolicy = mkOption { default = null; - type = types.nullOr (types.enum [ "min_power" "max_performance" "medium_power" ]); + type = types.nullOr (types.enum allowedValues); description = '' SCSI link power management policy. The kernel default is "max_performance". + + "med_power_with_dipm" is supported by kernel versions + 4.15 and newer. ''; }; @@ -24,6 +40,12 @@ let cfg = config.powerManagement.scsiLinkPolicy; in ###### implementation config = mkIf (cfg != null) { + + assertions = singleton { + assertion = (cfg == "med_power_with_dipm") -> versionAtLeast kernel.version "4.15"; + message = "med_power_with_dipm is not supported for kernels older than 4.15"; + }; + services.udev.extraRules = '' SUBSYSTEM=="scsi_host", ACTION=="add", KERNEL=="host*", ATTR{link_power_management_policy}="${cfg}" ''; From e9868c39e38c72509da58e5952a1fec18c5e1293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Tue, 15 May 2018 22:53:42 +0200 Subject: [PATCH 03/51] nixopsUnstable: 1.6pre2276_9203440 -> 1.6.1pre2622_f10999a --- pkgs/tools/package-management/nixops/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 8eaf20dc772..88493d33dd1 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -5,9 +5,9 @@ # Then copy the URL to the tarball. callPackage ./generic.nix (rec { - version = "1.6pre2276_9203440"; + version = "1.6.1pre2622_f10999a"; src = fetchurl { - url = "https://hydra.nixos.org/build/64518294/download/2/nixops-${version}.tar.bz2"; - sha256 = "1cl0869nl67fr5xk0jl9cvqbmma7d4vz5xbg56jpl7casrr3i51x"; + url = "https://hydra.nixos.org/build/73716350/download/2/nixops-${version}.tar.bz2"; + sha256 = "08886b6vxhjc3cp0ikxp920zap7wp6r92763fp785rvxrmb00rbd"; }; }) From 9668a66948cf16dde38629e0f48770058f791f0b Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 27 Apr 2018 15:26:08 +0200 Subject: [PATCH 04/51] gams: init at 25.02 --- maintainers/maintainer-list.nix | 5 ++++ pkgs/tools/misc/gams/default.nix | 50 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/tools/misc/gams/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30597373fc5..789bd457bd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -135,6 +135,11 @@ github = "roosemberth"; name = "Roosembert (Roosemberth) Palacios"; }; + Scriptkiddi = { + email = "nixos@scriptkiddi.de"; + github = "scriptkiddi"; + name = "Fritz Otlinghaus"; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix new file mode 100644 index 00000000000..613fdc0f455 --- /dev/null +++ b/pkgs/tools/misc/gams/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}: + +assert licenseFile != null; + +stdenv.mkDerivation rec { + version = "25.0.2"; + name = "gams-${version}"; + src = fetchurl { + url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe"; + sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; + }; + unpackCmd = "unzip $src"; + buildInputs = [ unzip file ]; + dontBuild = true; + + installPhase = '' + mkdir -p "$out/bin" "$out/share/gams" + cp -a * "$out/share/gams" + + cp ${licenseFile} $out/share/gamslice.txt + '' + stdenv.lib.optionalString (optgamsFile != null) '' + cp ${optgamsFile} $out/share/optgams.def + ln -s $out/share/gams/optgams.def $out/bin/optgams.def + ''; + + postFixup = '' + for f in $out/share/gams/*; do + if [[ -x $f ]] && [[ -f $f ]] && [[ ! $f =~ .*\.so$ ]]; then + if patchelf \ + --set-rpath "$out/share/gams" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $f; then + ln -s $f $out/bin/$(basename $f) + fi + fi + done + ''; + + meta = with stdenv.lib;{ + description = "General Algebraic Modeling System"; + longDescription = '' + The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. + GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems. + ''; + homepage = https://www.gams.com/; + license = licenses.unfree; + maintainers = [ maintainers.Scriptkiddi ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4a88cbe5b2..2a9835211c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -637,6 +637,11 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; + gams = callPackage ../tools/misc/gams { + licenseFile = config.gams.licenseFile or null; + optgamsFile = config.gams.optgamsFile or null; + }; + git-fire = callPackage ../tools/misc/git-fire { }; gitless = callPackage ../applications/version-management/gitless/default.nix { }; From 1d2eeec16c8d5b7fc3c4a365776a767dd080c599 Mon Sep 17 00:00:00 2001 From: dbohdan Date: Fri, 18 May 2018 17:10:00 +0300 Subject: [PATCH 05/51] s2png: init at 0.7.2 --- pkgs/tools/graphics/s2png/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/graphics/s2png/default.nix diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix new file mode 100644 index 00000000000..fd538eec573 --- /dev/null +++ b/pkgs/tools/graphics/s2png/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: + +stdenv.mkDerivation rec { + name = "s2png-${version}"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "dbohdan"; + repo = "s2png"; + rev = "v${version}"; + sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; + }; + + buildInputs = [ diffutils gd pkgconfig ]; + installFlags = [ "prefix=" "DESTDIR=$(out)" ]; + + meta = { + homepage = https://github.com/dbohdan/s2png/; + description = "Store any data in PNG images"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.dbohdan ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64cdad2282b..8b427206cfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1385,6 +1385,8 @@ with pkgs; parallel-rust = callPackage ../tools/misc/parallel-rust { }; + s2png = callPackage ../tools/graphics/s2png { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; From 893ba5d1b8442cca66f8109834261ac687c41938 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 12 May 2018 12:22:14 +0200 Subject: [PATCH 06/51] ldc: wrap ldc2 binary with C compiler because it's needed for linking --- pkgs/development/compilers/ldc/default.nix | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 1fd839180c5..48301a8f287 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash -, callPackage +, callPackage, makeWrapper, targetPackages , bootstrapVersion ? false , version ? "1.8.0" , ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4" @@ -124,7 +124,7 @@ let --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\"" ''; - nativeBuildInputs = [ cmake llvm bootstrapLdc python lit gdb unzip ] + nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ] ++ stdenv.lib.optional (bootstrapVersion) [ libconfig @@ -135,7 +135,7 @@ let ]); - buildInputs = [ curl tzdata stdenv.cc ]; + buildInputs = [ curl tzdata ]; preConfigure = '' cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" @@ -158,14 +158,20 @@ let doCheck = true; checkPhase = '' - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - # Run LIT testsuite. - ctest -V -R "lit-tests" - # Run DMD testsuite. - DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + # Run LIT testsuite. + ctest -V -R "lit-tests" + # Run DMD testsuite. + DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" ''; + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + meta = with stdenv.lib; { description = "The LLVM-based D compiler"; homepage = https://github.com/ldc-developers/ldc; From e762dca831078a71b18b8c79fefe630dd6e1e949 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 14 Apr 2018 12:56:34 +0200 Subject: [PATCH 07/51] dmd,dtools,dub: 2.079.0 -> 2.079.1 --- pkgs/development/compilers/dmd/default.nix | 21 ++++++++++++------- .../tools/build-managers/dub/default.nix | 5 +++-- pkgs/development/tools/dtools/default.nix | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6522b12b131..b391b6eb845 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, overrideCC, gcc5 , makeWrapper, unzip, which , curl, tzdata, gdb, darwin -, callPackage +, callPackage, targetPackages , bootstrapVersion ? false -, version ? "2.079.0" -, dmdSha256 ? "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y" -, druntimeSha256 ? "183pqygj5w4105czs5kswyjn9mrcybx3wmkynz3in0m3ylzzjmvl" -, phobosSha256 ? "0y9i86ggmf41ww2xk2bsrlsv9b1blj5dbyan6q6r6xp8dmgrd79w" +, version ? "2.079.1" +, dmdSha256 ? "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj" +, druntimeSha256 ? "18r8gwvb54ar80j5155wx0qbqq4w56hqmbf6wap20xwijg2rw90g" +, phobosSha256 ? "1x5v1ln51nr8x2vyki864160bakdyq0acmvbfv7jcipaj2w3m9bb" }: let @@ -143,6 +143,9 @@ let + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) '' substituteInPlace ${dmdPath}/root/port.c \ --replace "#include " "#include " + + substituteInPlace ${dmdPath}/root/port.c \ + --replace "#include " "#include " '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -198,6 +201,8 @@ let extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; + dontStrip = true; + installPhase = '' cd dmd mkdir $out @@ -222,13 +227,13 @@ let cp -r etc $out/include/d2 wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" cd $out/bin tee dmd.conf << EOF [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC + DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC EOF ''; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 28894850bbd..52e29acc9d8 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.8.0"; + version = "1.8.1"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "0788d375sc6xdak9x6xclkkz243lb7di68yxfvl4v0n178mi22bk"; + sha256 = "16r7x4jsfv5fjssvs6mwj8ymr6fjpvbkjhpr4f4368sjr5iyfad6"; }; postUnpack = '' @@ -75,6 +75,7 @@ let # file under ../etc relative to the dub location. cp ${dubBuild}/bin/dub bin/ export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ export DC=${dmd.out}/bin/dmd export HOME=$TMP ./test/run-unittest.sh diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index d5f691b0cac..bc29fe2cbcf 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.079.0"; + version = "2.079.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y"; + sha256 = "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj"; name = "dmd"; }) (fetchFromGitHub { From 8c3503d6f6dd6972f4d8566a14532f0dcb446851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 20 May 2018 10:52:03 +0100 Subject: [PATCH 08/51] nixos/ids: information when to use static uids/gids --- nixos/modules/misc/ids.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cc7d8684982..bb97c707bf6 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -1,6 +1,14 @@ # This module defines the global list of uids and gids. We keep a # central list to prevent id collisions. +# IMPORTANT! +# We only add static uids and gids for services where it is not feasible +# to change uids/gids on service start, in example a service with a lot of +# files. Please also check if the service is applicable for systemd's +# DynamicUser option and does not need a uid/gid allocation at all. +# Systemd can also change ownership of service directories using the +# RuntimeDirectory/StateDirectory options. + { config, pkgs, lib, ... }: { From c919d62faae7ac186326bd761927f01c1099b9b4 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 20 May 2018 18:13:59 +0200 Subject: [PATCH 09/51] terraform_0_11: 0.11.6 -> 0.11.7 This is a small fix for hashicorp/terraform#17793. There is no need to rebuild the providers. --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5879c0e8397..38b7e485259 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.6"; - sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; + version = "0.11.7"; + sha256 = "0q5gl8yn1f8fas1v68lz081k88gbmlk7f2xqlwqmh01qpqjxd42q"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 27777ed2759623f77e6b3c2ff300e453ef6c70b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 May 2018 11:27:40 -0700 Subject: [PATCH 10/51] python27Packages.udiskie: 1.7.3 -> 1.7.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/udiskie/versions. These checks were done: - built on NixOS - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-info passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-mount passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-umount passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-wrapped-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-info-wrapped-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-info-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-mount-wrapped-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-mount-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-umount-wrapped-wrapped passed the binary check. - /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-umount-wrapped passed the binary check. - 12 of 12 passed binary check by having a zero exit code. - 12 of 12 passed binary check by having the new version present in output. - found 1.7.4 with grep in /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4 - directory tree listing: https://gist.github.com/b8c058b519fdc73cbd6a8b7062bb7dea - du listing: https://gist.github.com/befb311e40dbd18617e2b11abb41bf1e --- pkgs/applications/misc/udiskie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index ea79e29ff02..8c6dfe24772 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1yv1faq81n3vspf3jprcs5v21l2fchy3m3pc7lk8jb0xqlnh60x4"; + sha256 = "0r3m8y6ppkl8p1lhr89sfk9v2la1zn0rbmr6hy860j7b22yvnkrn"; }; buildInputs = [ From 50cc81b83de52d60c983dcd577260c48c2351bf8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 May 2018 16:53:03 -0500 Subject: [PATCH 11/51] 1password: Fix darwin build --- pkgs/applications/misc/1password/default.nix | 49 +++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index b0b6111b334..4cf46fb408b 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -3,32 +3,45 @@ stdenv.mkDerivation rec { name = "1password-${version}"; version = "0.4"; - src = if stdenv.system == "i686-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; - stripRoot = false; - } else fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; - stripRoot = false; - }; + src = + if stdenv.system == "i686-linux" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + stripRoot = false; + } + else if stdenv.system == "x86_64-linux" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + stripRoot = false; + } + else if stdenv.system == "x86_64-darwin" then + fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4/op_darwin_amd64_v${version}.zip"; + sha256 = "0yzr9m91k3lhl8am3dfzh4ql2zxsa66nw43h17ny61wraiz315cr"; + stripRoot = false; + } + else throw "Architecture not supported"; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - install -D op $out/share/1password/op - - # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 - makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ - --argv0 op \ - --add-flags $out/share/1password/op + install -D op $out/bin/op + ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/op ''; meta = with stdenv.lib; { description = "1Password command-line tool"; - homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; + homepage = [ + "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/" + "https://app-updates.agilebits.com/product_history/CLI" + ]; maintainers = with maintainers; [ joelburget ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } From 6abc2bf40631655526ca71ec40d430cae27a47bb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 May 2018 17:00:18 -0500 Subject: [PATCH 12/51] 1password: 0.4 -> 0.4.1 --- pkgs/applications/misc/1password/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4cf46fb408b..60391eee692 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "1password-${version}"; - version = "0.4"; + version = "0.4.1"; src = if stdenv.system == "i686-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip"; + sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip"; + sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4/op_darwin_amd64_v${version}.zip"; - sha256 = "0yzr9m91k3lhl8am3dfzh4ql2zxsa66nw43h17ny61wraiz315cr"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip"; + sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb"; stripRoot = false; } else throw "Architecture not supported"; From 17e0e67930e794e72330b9ce86f6e3a034b1f31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 21 May 2018 13:42:51 +0200 Subject: [PATCH 13/51] nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment We use environment.profiles to add both the PATH and XDG_DATA_DIRS. --- nixos/modules/services/desktops/flatpak.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 024dc65629a..cfca1893bd8 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -40,12 +40,12 @@ in { systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; - environment.variables = { - PATH = [ - "$HOME/.local/share/flatpak/exports/bin" - "/var/lib/flatpak/exports/bin" - ]; + environment.profiles = [ + "$HOME/.local/share/flatpak/exports" + "/var/lib/flatpak/exports" + ]; + environment.variables = { XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals; }; }; From 98f89e5f5c68ae0469fb825e90f69dbc3bd960e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 09:21:47 -0700 Subject: [PATCH 14/51] calamares: 3.1.12 -> 3.2.0 (#40870) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/calamares/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/zj062x5cqa9q77mddh01r14ia5ydfy4r-calamares-3.2.0/bin/calamares had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 3.2.0 with grep in /nix/store/zj062x5cqa9q77mddh01r14ia5ydfy4r-calamares-3.2.0 - directory tree listing: https://gist.github.com/10cd4415ded3afaf27cce14adc67e5e7 - du listing: https://gist.github.com/003ee89d5edc0dd858081d1bfefec1a4 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index f66cc60c926..5dba7744d7b 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.1.12"; + version = "3.2.0"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6"; + sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64"; }; buildInputs = [ From b77277fcdcd93f2188a1faa7ddd9ebe72484e2e5 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Tue, 22 May 2018 12:38:05 -0400 Subject: [PATCH 15/51] helmfile: init at 0.16.0 (#40814) --- .../networking/cluster/helmfile/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helmfile/default.nix diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix new file mode 100644 index 00000000000..b1dcfb809b5 --- /dev/null +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.16.0"; in + +buildGoPackage { + name = "helmfile-${version}"; + + src = fetchFromGitHub { + owner = "roboll"; + repo = "helmfile"; + rev = "v${version}"; + sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d"; + }; + + goPackagePath = "github.com/roboll/helmfile"; + + meta = { + description = "Deploy Kubernetes Helm charts"; + homepage = https://github.com/roboll/helmfile; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdd26b5ee67..6899d907937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20829,6 +20829,8 @@ with pkgs; helm = callPackage ../applications/audio/helm { }; + helmfile = callPackage ../applications/networking/cluster/helmfile { }; + heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; hplip = callPackage ../misc/drivers/hplip { }; From 11b343534578626d1354af507fcfb3572e3aaabe Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Tue, 22 May 2018 12:42:41 -0400 Subject: [PATCH 16/51] perlPackages.ParsePlainConfig: init at 3.05 (#40624) --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8956f980668..6f4b0649a12 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12060,6 +12060,20 @@ let self = _self // overrides; _self = with self; { }; }; + ParsePlainConfig = buildPerlPackage rec { + name = "Parse-PlainConfig-3.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/${name}.tar.gz"; + sha256 = "6b78a8552398b0d2d7063505c93b3cfed0432c5b2cf6e00b8e51febf411c1efa"; + }; + propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; + meta = { + description = "Parser/Generator of human-readable conf files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + ParsePMFile = buildPerlPackage rec { name = "Parse-PMFile-0.41"; src = fetchurl { From 3dd635042023fb3dfbd88cdf1a915deb42ccac6f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 22 May 2018 13:25:09 -0400 Subject: [PATCH 17/51] doc: use "with stdenv.lib" in meta --- doc/meta.xml | 8 ++++---- pkgs/applications/misc/hello/default.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index ad16e7683f5..ab6befd4381 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -8,16 +8,16 @@ and so on. For instance, the GNU Hello package has a meta declaration like this: -meta = { +meta = with stdenv.lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8a31c591b29..c94f78317f4 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; } From 571a1e19e929d72bad5e99f3992728e4a16ca17b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 May 2018 19:26:32 +0200 Subject: [PATCH 18/51] coqPackages.iris: init at 3.1.0 (#40909) --- pkgs/development/coq-modules/iris/default.nix | 30 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/coq-modules/iris/default.nix diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix new file mode 100644 index 00000000000..134ea45493d --- /dev/null +++ b/pkgs/development/coq-modules/iris/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, coq, ssreflect, stdpp }: + +stdenv.mkDerivation rec { + version = "3.1.0"; + name = "coq${coq.coq-version}-iris-${version}"; + src = fetchzip { + url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz"; + sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ ssreflect stdpp ]; + + enableParallelBuilding = true; + + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + + meta = { + homepage = "https://gitlab.mpi-sws.org/FP/iris-coq"; + description = "The Coq development of the Iris Project"; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; + +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 519d1cb9ed4..2bc5671e987 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -29,6 +29,7 @@ let heq = callPackage ../development/coq-modules/heq {}; HoTT = callPackage ../development/coq-modules/HoTT {}; interval = callPackage ../development/coq-modules/interval {}; + iris = callPackage ../development/coq-modules/iris {}; math-classes = callPackage ../development/coq-modules/math-classes { }; mathcomp = callPackage ../development/coq-modules/mathcomp { }; metalib = callPackage ../development/coq-modules/metalib { }; From b7c73603745216a64bebdad627cfe4b4df364fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 May 2018 19:47:57 +0200 Subject: [PATCH 19/51] postfix: 3.3.0 -> 3.3.1 (#40912) Release notes: http://www.postfix.org/announcements/postfix-3.3.1.html --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index a5168ebd4df..41dfebab790 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr"; + sha256 = "0fvymsklp32njsv0ngc1f45j01kcy61r5in99g5palibwkd19xal"; }; nativeBuildInputs = [ makeWrapper ]; From 65c327325086fc6ffce0c72af3d09b1474b0a41f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 22 May 2018 14:17:32 -0400 Subject: [PATCH 20/51] form: init at 4.2.0 (#40693) --- .../science/math/form/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/science/math/form/default.nix diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix new file mode 100644 index 00000000000..88f2367e334 --- /dev/null +++ b/pkgs/applications/science/math/form/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, gmp, zlib }: + +stdenv.mkDerivation rec { + version = "4.2.0"; + name = "form-${version}"; + + # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub + src = fetchurl { + url = "https://github.com/vermaseren/form/releases/download/v4.2.0/form-4.2.0.tar.gz"; + sha256 = "19528aphn4hvm151lyyhd7wz0bp2s3rla8jv6s7d8jwfp5ljzysm"; + }; + + buildInputs = [ gmp zlib ]; + + meta = with stdenv.lib; { + description = "The FORM project for symbolic manipulation of very big expressions"; + homepage = https://www.nikhef.nl/~form/; + license = licenses.gpl3; + maintainers = [ maintainers.veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6899d907937..bd8cb340425 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20461,6 +20461,8 @@ with pkgs; texinfo = texinfo4; }; + form = callPackage ../applications/science/math/form { }; + fricas = callPackage ../applications/science/math/fricas { }; gap = callPackage ../applications/science/math/gap { }; From d5e785d96719921d321fb2a28ad71d56abf3f624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 22 May 2018 19:44:19 +0100 Subject: [PATCH 21/51] tmux: 2.6 -> 2.7 changelog: https://raw.githubusercontent.com/tmux/tmux/2.7/CHANGES --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 61370ff890b..fcec511b7ef 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.6"; + version = "2.7"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww"; + sha256 = "1yr4l8ckd67c3id4vrbpha91xxpdfpw0cpbr3v81lam0m7k4rgba"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 042790832e7b998886fc46804b716bb8bbbfea90 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 May 2018 20:55:57 +0200 Subject: [PATCH 22/51] coqPackages.tlc: 20171206 -> 20180316 (#40927) --- pkgs/development/coq-modules/tlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 4748a0dd238..5a236f59129 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coq }: stdenv.mkDerivation rec { - version = "20171206"; + version = "20180316"; name = "coq${coq.coq-version}-tlc-${version}"; src = fetchurl { url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; - sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf"; + sha256 = "0y8h0x9dfn9dm60j1jkxr9i8lbfqd3ff626wrc9v49qxhi50szqq"; }; buildInputs = [ coq ]; From 180eff1c4a9ed5e2b29ff8a3341836d27c493d1f Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 22 May 2018 22:01:26 +0200 Subject: [PATCH 23/51] thefuck: 3.26 -> 3.27 --- pkgs/tools/misc/thefuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 7befd344a4d..1ccfc528e8f 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.26"; + version = "3.27"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz"; + sha256 = "1lsg0g9lnpj2nidggm16b7jm4xzhg0dgy81crfzny62hah1zk0pj"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; From 71da438f21f1e07dd0523bfeb7d81d6aa3a4f14e Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Tue, 22 May 2018 22:04:50 +0200 Subject: [PATCH 24/51] cargo-tree: init at 0.18.0 (#40924) --- .../package-management/cargo-tree/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/package-management/cargo-tree/default.nix diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix new file mode 100644 index 00000000000..a9c1a1a33b3 --- /dev/null +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: +rustPlatform.buildRustPackage rec { + name = "cargo-tree-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "sfackler"; + repo = "cargo-tree"; + rev = "v${version}"; + + sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + }; + + cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ jD91mZM2 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd8cb340425..a3199c5c297 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6916,6 +6916,7 @@ with pkgs; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { }; + cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; From 0928b2a033b596a05ecaa02d339b82f95e408799 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:48:35 +0300 Subject: [PATCH 25/51] nodejs: update to nodejs-8_x --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3199c5c297..670729bb7e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3438,7 +3438,7 @@ with pkgs; nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodejs = hiPrio nodejs-6_x; + nodejs = hiPrio nodejs-8_x; nodejs-slim = nodejs-slim-6_x; From b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 May 2018 16:04:56 -0500 Subject: [PATCH 26/51] bloaty: 2017-10-05 -> 2018-05-22 * add zlib dep (cmake tries to find it, provide it JIC) * no need to populate with path to c++filt, handled internally now * continue to copy ourselves, new install target isn't ready yet --- pkgs/development/tools/bloaty/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 0dbe1aa78c5..9b18bcb2561 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,26 +1,22 @@ -{ stdenv, binutils, cmake, fetchFromGitHub }: +{ stdenv, binutils, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2017-10-05"; + version = "2018-05-22"; name = "bloaty-${version}"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "e47b21b01ceecf001e1965e9da249d48d86a1749"; - sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm"; + rev = "054788b091ccfd43b05b9817062139145096d440"; + sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; + buildInputs = [ zlib ]; - preConfigure = '' - substituteInPlace src/bloaty.cc \ - --replace "c++filt" \ - "${binutils.bintools}/bin/c++filt" - ''; + enableParallelBuilding = true; doCheck = true; From b9bdd7d4a3ecf73065feedc79d5d7e00c1b52b3c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 22 May 2018 22:09:33 +0000 Subject: [PATCH 27/51] pythonPackages.asyncssh: init at 1.13.0 (#40527) --- .../python-modules/asyncssh/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/asyncssh/default.nix diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix new file mode 100644 index 00000000000..d5ab50dc904 --- /dev/null +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, cryptography +, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl }: + +buildPythonPackage rec { + pname = "asyncssh"; + version = "1.13.0"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n75z4dvhzymd4n610dpwlq7wl8cyz1gxx9m7iq92pzhss5vgpfd"; + }; + + propagatedBuildInputs = [ + bcrypt + cryptography + gssapi + libnacl + libsodium + nettle + pyopenssl + ]; + + # Disables windows specific test (specifically the GSSAPI wrapper for Windows) + postPatch = '' + rm ./tests/sspi_stub.py + ''; + + meta = with stdenv.lib; { + description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; + homepage = https://pypi.python.org/pypi/asyncssh; + license = licenses.epl10; + maintainers = with maintainers; [ worldofpeace ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42f5f6c1711..00daeacf7ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -547,6 +547,8 @@ in { asyncio = callPackage ../development/python-modules/asyncio {}; + asyncssh = callPackage ../development/python-modules/asyncssh { }; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; From d8b96d57300769569ee9a61edd46cf482a2e05de Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 May 2018 17:25:17 -0500 Subject: [PATCH 28/51] nghttp2: 1.31.0 -> 1.32.0 1.31.1 has security fix for CVE-2018-1000168: https://nghttp2.org/blog/2018/04/12/nghttp2-v1-31-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 703e4d08bd3..68bffd4032d 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "0d7ivd7agsrbpz8745d0c0hxjzx9pdj602p1bpnrsd7p393ydrln"; + sha256 = "0jlndbp4bnyvdg8b59pznrzz0bvwb9nmag7zgcflg51lm1pq2q06"; }; outputs = [ "bin" "out" "dev" "lib" ]; From 437ee38c18b44b87020443f97fe2b6e8ff7e54d5 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 23 May 2018 01:28:15 +0300 Subject: [PATCH 29/51] pythonPackages.udiskie: replace alias with abort --- pkgs/top-level/python-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00daeacf7ed..fb6ab5f386d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16352,8 +16352,7 @@ EOF }; }; - # For backwards compatibility. Please use nixpkgs.udiskie instead. - udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; }); + udiskie = abort "pythonPackages.udiskie has been replaced by udiskie"; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { From d4890642b40b297f654c4cf9adfad742aa507a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 May 2018 00:36:41 +0200 Subject: [PATCH 30/51] Revert "pythonPackages.udiskie: replace alias with abort" This reverts commit 437ee38c18b44b87020443f97fe2b6e8ff7e54d5. --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb6ab5f386d..00daeacf7ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16352,7 +16352,8 @@ EOF }; }; - udiskie = abort "pythonPackages.udiskie has been replaced by udiskie"; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; }); # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { From 9e5c5d95a83f7c990552de32a4d77a167f4d30f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 May 2018 00:52:17 +0200 Subject: [PATCH 31/51] pythonPackages.udiskie: replace alias by throw closes #40941 --- pkgs/applications/misc/udiskie/default.nix | 1 - pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 8c6dfe24772..f3dc92605f3 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -5,7 +5,6 @@ , docopt , pygobject3 , pyyaml -, ... }: buildPythonApplication rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00daeacf7ed..b695372fe96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16352,8 +16352,8 @@ EOF }; }; - # For backwards compatibility. Please use nixpkgs.udiskie instead. - udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; }); + # added 2018-05-23, can be removed once 18.09 is branched off + udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { From dfd12da9d0818a9fad96000b0e6f9fca36ca496a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 18:56:33 -0700 Subject: [PATCH 32/51] simplescreenrecorder: 0.3.10 -> 0.3.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/simplescreenrecorder/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11/bin/simplescreenrecorder had a zero exit code or showed the expected version - /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11/bin/ssr-glinject passed the binary check. - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 0.3.11 with grep in /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11 - directory tree listing: https://gist.github.com/37e7c1c2b6ea1075aec16c5886d64421 - du listing: https://gist.github.com/e083fc723fa4e92eac89902a7ae3fd56 --- pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index d1f6f8b6ad1..b456d8ee9a6 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.10"; + version = "0.3.11"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g"; + sha256 = "0l6irdadqpajvv0dj3ngs1231n559l0y1pykhs2h7526qm4w7xal"; }; cmakeFlags = [ "-DWITH_QT5=TRUE" ]; From bbbd9e251b61084e19ed43b94372aec5d7feb64c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 19:41:41 -0700 Subject: [PATCH 33/51] qsynth: 0.5.0 -> 0.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qsynth/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/v9m2gbw7l68qb4m5milqc8d2wfrafx97-qsynth-0.5.1/bin/qsynth had a zero exit code or showed the expected version - 0 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 0.5.1 with grep in /nix/store/v9m2gbw7l68qb4m5milqc8d2wfrafx97-qsynth-0.5.1 - directory tree listing: https://gist.github.com/f7434d80382444c8ae9ba52dd07e27a7 - du listing: https://gist.github.com/1c209e5c3a841d8d8e1d3257c2dad992 --- pkgs/applications/audio/qsynth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 71f41f87009..f98547ed46f 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584"; + sha256 = "0kpk1rnhbifbvm4xvw8i0d4ksk78pf505qvg08k89kqkg32494ap"; }; # cmake is looking for qsynth.desktop.in and fails if it doesn't find it - # seems like a bug and can presumable go in the next version after 0.5.0 + # seems like a bug and can presumable go in the next version after 0.5.1 postPatch = '' mv src/qsynth.desktop src/qsynth.desktop.in ''; From 5c76ea68b84bf8d97ec15e5d8d717143d7ec183f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 19:44:57 -0700 Subject: [PATCH 34/51] redshift: 1.11 -> 1.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/redshift/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift-gtk had a zero exit code or showed the expected version - /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift passed the binary check. - /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-wrapped passed the binary check. - Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/..redshift-gtk-wrapped-wrapped had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-gtk-wrapped had a zero exit code or showed the expected version - 2 of 5 passed binary check by having a zero exit code. - 2 of 5 passed binary check by having the new version present in output. - found 1.12 with grep in /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12 - directory tree listing: https://gist.github.com/c74af938c0883f174e37490cc75bdd47 - du listing: https://gist.github.com/e9328410b87b5cff576fd12cc6120fb6 --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index dc31da671e9..dcc8300550f 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "redshift-${version}"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "jonls"; repo = "redshift"; rev = "v${version}"; - sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj"; + sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6"; }; patches = [ From 62f0d64640868591873054a257129d89446b123a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 21:06:52 -0700 Subject: [PATCH 35/51] pg_repack: 1.4.2 -> 1.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pg_repack/versions. These checks were done: - built on NixOS - /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3/bin/pg_repack passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 1 of 1 passed binary check by having the new version present in output. - found 1.4.3 with grep in /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3 - directory tree listing: https://gist.github.com/98848a9a560aa1d4de3e164197944d32 - du listing: https://gist.github.com/cfef5141050a394c88b04b839ec17fdf --- pkgs/servers/sql/postgresql/pg_repack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 50c9c68bb5f..1b7cd08b082 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_repack-${version}"; - version = "1.4.2"; + version = "1.4.3"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q"; + sha256 = "1mmd22nfaxjwnbl3i95f3ivmjvfqwdflgaczlg3129dbpwg265xr"; }; installPhase = '' From 07d73c4ab065ad0a06551b39cc6d1c7a874a6913 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 May 2018 18:06:02 -0400 Subject: [PATCH 36/51] clangSelf, clangWrapSelf, llvmPackagesSelf: Remove this unused thing It's old old LLVM built with new LLVM. How useless. --- pkgs/development/compilers/ispc/default.nix | 2 +- pkgs/top-level/all-packages.nix | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 62fa578cef6..0fe9c8d3765 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 670729bb7e6..6c0d48780d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6056,18 +6056,6 @@ with pkgs; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; - clangSelf = clangWrapSelf llvmPackagesSelf.clang; - - clangWrapSelf = build: ccWrapperFun { - cc = build; - isClang = true; - inherit stdenvNoCC; - inherit (targetPackages.stdenv.cc) bintools libc; - extraPackages = [ libcxx libcxxabi ]; - nativeTools = false; - nativeLibc = false; - }; - #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; @@ -6704,10 +6692,6 @@ with pkgs; llvmPackages = recurseIntoAttrs llvmPackages_5; - llvmPackagesSelf = llvmPackages_34.override { - stdenv = libcxxStdenv; - }; - llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ isl = isl_0_12; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { From 25e866a7fe36045470e27a9b320703a35266d889 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 May 2018 19:21:35 -0400 Subject: [PATCH 37/51] treewide: Less {cc,bintools}-wrapper eta expansion Also makes the LLVM ones more correct --- .../compilers/llvm/3.7/default.nix | 10 ++--- .../compilers/llvm/3.8/default.nix | 10 ++--- .../compilers/llvm/3.9/default.nix | 10 ++--- pkgs/development/compilers/llvm/4/default.nix | 10 ++--- pkgs/development/compilers/llvm/5/default.nix | 10 ++--- pkgs/development/compilers/llvm/6/default.nix | 10 ++--- pkgs/top-level/all-packages.nix | 44 ++++++++++--------- 7 files changed, 41 insertions(+), 63 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 5cac04c044d..3003a773cc6 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl -, overrideCC, wrapCC, ccWrapperFun, darwin +, overrideCC, wrapCCWith, darwin }: let @@ -27,17 +27,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 9e37f93dbdd..6cb2c5676d0 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -26,17 +26,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index a675bcceb1c..7d2ecd1a156 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -26,17 +26,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 562f9e3457d..c92a1d84c0c 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin }: @@ -40,17 +40,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 13e1d2308f8..63fb9831651 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin }: @@ -40,17 +40,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index cfa9e9e15fc..61fee1542e7 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin }: @@ -40,17 +40,13 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c0d48780d3..c6d02b487f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6996,42 +6996,46 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = { name ? "", cc, bintools, libc, extraBuildCommands ? "" }: - ccWrapperFun rec { + wrapCCWith = + { cc + , # This should be the only bintools runtime dep with this sort of logic. The + # Others should instead delegate to the next stage's choice with + # `targetPackages.stdenv.cc.bintools`. This one is different just to + # provide the default choice, avoiding infinite recursion. + bintools ? if targetPlatform.isDarwin then darwin.binutils else binutils + , libc ? bintools.libc + , ... + } @ extraArgs: + callPackage ../build-support/cc-wrapper (let self = { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - noLibc = !nativeLibc && (libc == null); + noLibc = !self.nativeLibc && (self.libc == null); isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit name cc bintools libc extraBuildCommands; - }; - - ccWrapperFun = callPackage ../build-support/cc-wrapper; - bintoolsWrapperFun = callPackage ../build-support/bintools-wrapper; + inherit cc bintools libc; + } // extraArgs; in self); wrapCC = cc: wrapCCWith { - name = lib.optionalString (targetPlatform != hostPlatform) "gcc-cross-wrapper"; inherit cc; - # This should be the only bintools runtime dep with this sort of logic. The - # Others should instead delegate to the next stage's choice with - # `targetPackages.stdenv.cc.bintools`. This one is different just to - # provide the default choice, avoiding infinite recursion. - bintools = if targetPlatform.isDarwin then darwin.binutils else binutils; - libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; }; - wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun { + wrapBintoolsWith = + { bintools + , libc ? if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc + , ... + } @ extraArgs: + callPackage ../build-support/bintools-wrapper (let self = { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; - noLibc = (libc == null); + noLibc = (self.libc == null); - inherit bintools libc extraBuildCommands; - }; + inherit bintools libc; + } // extraArgs; in self); # prolog yap = callPackage ../development/compilers/yap { }; @@ -7637,11 +7641,9 @@ with pkgs; noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; }; binutils = wrapBintoolsWith { - libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped; }; binutils_nogold = lowPrio (wrapBintoolsWith { - libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped.override { gold = false; }; From acc9843691c936bb807fb6c5c88e0b41782d6c29 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 May 2018 19:25:34 -0400 Subject: [PATCH 38/51] llvm: Starting to fix Clang wrapping and stdenv building for cross --- pkgs/development/compilers/llvm/3.7/default.nix | 6 ++++-- pkgs/development/compilers/llvm/3.8/default.nix | 10 +++++++--- pkgs/development/compilers/llvm/3.9/default.nix | 10 +++++++--- pkgs/development/compilers/llvm/4/default.nix | 6 ++++-- pkgs/development/compilers/llvm/5/default.nix | 6 ++++-- pkgs/development/compilers/llvm/6/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 12 ++++++++++++ 7 files changed, 42 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 3003a773cc6..8f73645afc0 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,7 @@ { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl , overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -34,7 +36,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -44,7 +46,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 6cb2c5676d0..a5f3b775951 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,8 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross +}: + let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -33,7 +37,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -43,7 +47,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 7d2ecd1a156..4b69996473d 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,8 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross +}: + let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -33,7 +37,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -43,7 +47,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index c92a1d84c0c..594397bdbbc 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -47,7 +49,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -57,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 63fb9831651..1f7619f7a37 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -47,7 +49,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -57,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 61fee1542e7..be26a38e32e 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -47,7 +49,7 @@ let libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -57,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d02b487f4..fb3d0942e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6706,30 +6706,40 @@ with pkgs; llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_37; + targetLlvmPackages = targetPackages.llvmPackages_37; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; }); llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_38; + targetLlvmPackages = targetPackages.llvmPackages_38; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; }); llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_39; + targetLlvmPackages = targetPackages.llvmPackages_39; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; }); llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_4; + targetLlvmPackages = targetPackages.llvmPackages_4; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; }); llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_5; + targetLlvmPackages = targetPackages.llvmPackages_5; } // stdenv.lib.optionalAttrs stdenv.isDarwin { cmake = cmake.override { isBootstrap = true; @@ -6743,6 +6753,8 @@ with pkgs; llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ inherit (stdenvAdapters) overrideCC; + buildLlvmPackages = buildPackages.llvmPackages_6; + targetLlvmPackages = targetPackages.llvmPackages_6; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); From 23dce527d82c83436f7ed8a6ac987d1dd097de4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 23:59:15 -0700 Subject: [PATCH 39/51] folly: 2018.04.23.00 -> 2018.05.21.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2018.05.21.00 with grep in /nix/store/n4qdpjqixmlcly3al00c5a2ivp6lh74f-folly-2018.05.21.00 - directory tree listing: https://gist.github.com/80adf61ca8bb6b1020e7b48cae590a9c - du listing: https://gist.github.com/dc5d5cb97ea76a087a50b733c659ebe5 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 17c6f75a59d..36da31e8908 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.04.23.00"; + version = "2018.05.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv"; + sha256 = "0x8qa0g0rj4bmy5cra7f0ch0srq34d8d04f1c59q93xd6ggkr52w"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From cde4ea79f80b9ba065d6f8d1fb44e87d2e18cc53 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Wed, 23 May 2018 00:14:18 -0700 Subject: [PATCH 40/51] vagrant: 2.0.2 -> 2.1.1 --- pkgs/development/tools/vagrant/Gemfile.lock | 24 ++++++++-- pkgs/development/tools/vagrant/default.nix | 4 +- pkgs/development/tools/vagrant/gemset.nix | 52 +++++++++++++++++---- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock index 2c63b57443a..8991bd9eb54 100644 --- a/pkgs/development/tools/vagrant/Gemfile.lock +++ b/pkgs/development/tools/vagrant/Gemfile.lock @@ -1,6 +1,6 @@ GIT - remote: https://github.com/mitchellh/vagrant-spec.git - revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1 + remote: https://github.com/hashicorp/vagrant-spec.git + revision: 9413ab298407114528766efefd1fb1ff24589636 specs: vagrant-spec (0.0.1) childprocess (~> 0.6.0) @@ -11,7 +11,7 @@ GIT PATH remote: . specs: - vagrant (2.0.2) + vagrant (2.1.1) childprocess (~> 0.6.0) erubis (~> 2.7.0) hashicorp-checkpoint (~> 0.1.5) @@ -25,6 +25,8 @@ PATH rest-client (>= 1.6.0, < 3.0) ruby_dep (<= 1.3.1) wdm (~> 0.1.0) + win32-file (~> 0.8.1) + win32-file-security (~> 1.0.10) winrm (~> 2.1) winrm-elevated (~> 1.1) winrm-fs (~> 1.0) @@ -40,11 +42,13 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) diff-lcs (1.3) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) fake_ftp (0.1.1) - ffi (1.9.18) + ffi (1.9.23) + ffi-win32-extensions (1.0.3) + ffi gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) @@ -115,6 +119,16 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + win32-file (0.8.1) + ffi + ffi-win32-extensions + win32-file-stat (>= 1.4.0) + win32-file-security (1.0.10) + ffi + ffi-win32-extensions + win32-file-stat (1.5.5) + ffi + ffi-win32-extensions winrm (2.2.3) builder (>= 2.1.2) erubis (~> 2.7) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3b055d38d03..42ff463e1cc 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,9 +1,9 @@ { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let - version = "2.0.2"; + version = "2.1.1"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir"; + sha256 = "0kgsb33f3wh6x4450x74wri6z78ky92sfrv7ba7h7zmxsadb6m4b"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 5d3d2693d01..867927cdc24 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -46,10 +46,10 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; type = "gem"; }; - version = "0.5.20170404"; + version = "0.5.20180417"; }; erubis = { source = { @@ -70,10 +70,19 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.18"; + version = "1.9.23"; + }; + ffi-win32-extensions = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l"; + type = "gem"; + }; + version = "1.0.3"; }; gssapi = { dependencies = ["ffi"]; @@ -397,16 +406,16 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"]; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; source = { fetchSubmodules = false; - rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1"; - sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h"; + rev = "9413ab298407114528766efefd1fb1ff24589636"; + sha256 = "1z77m3p6x82hipa7y4i71zafy0rdfajw2vhqdxczjmrlwp0pvisl"; type = "git"; - url = "https://github.com/mitchellh/vagrant-spec.git"; + url = "https://github.com/hashicorp/vagrant-spec.git"; }; version = "0.0.1"; }; @@ -427,6 +436,33 @@ }; version = "2.3.2"; }; + win32-file = { + dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0"; + type = "gem"; + }; + version = "0.8.1"; + }; + win32-file-security = { + dependencies = ["ffi" "ffi-win32-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r"; + type = "gem"; + }; + version = "1.0.10"; + }; + win32-file-stat = { + dependencies = ["ffi" "ffi-win32-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468"; + type = "gem"; + }; + version = "1.5.5"; + }; winrm = { dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { From 5db3a9df5e82a0af45bc20bb2eda15dc7fa290bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 May 2018 09:36:16 +0200 Subject: [PATCH 41/51] Revert "ghc, haskell infra: #40642 direct to master" --- pkgs/development/compilers/ghc/7.10.3.nix | 16 +---- pkgs/development/compilers/ghc/8.0.2.nix | 19 +---- pkgs/development/compilers/ghc/8.2.2.nix | 21 ++---- pkgs/development/compilers/ghc/8.4.2.nix | 33 +++------ pkgs/development/compilers/ghc/head.nix | 28 +++----- .../haskell-modules/configuration-nix.nix | 2 +- .../haskell-modules/generic-builder.nix | 72 +++++-------------- pkgs/development/haskell-modules/lib.nix | 2 - 8 files changed, 50 insertions(+), 143 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 7d2f3791632..e4bf23c6e9e 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -24,10 +24,6 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? true - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" }: assert !enableIntegerSimple -> gmp != null; @@ -46,14 +42,11 @@ let }; buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross Stage1Only = YES HADDOCK_DOCS = NO '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -75,6 +68,7 @@ let targetCC = builtins.head toolsForTarget; in + stdenv.mkDerivation rec { version = "7.10.3"; name = "${targetPrefix}ghc-${version}"; @@ -93,8 +87,6 @@ stdenv.mkDerivation rec { ./relocation.patch ]; - postPatch = "patchShebangs ."; - # GHC is a bit confused on its cross terminology. preConfigure = '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do @@ -111,7 +103,6 @@ stdenv.mkDerivation rec { export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' @@ -144,8 +135,7 @@ stdenv.mkDerivation rec { crossConfig = true; nativeBuildInputs = [ - perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 - ghc hscolour + ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; # For building runtime libs diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 3ab44ea7f5e..4017a01e702 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -23,10 +23,6 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? true - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" }: assert !enableIntegerSimple -> gmp != null; @@ -40,14 +36,11 @@ let "${targetPlatform.config}-"; buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross Stage1Only = YES HADDOCK_DOCS = NO '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -94,8 +87,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - postPatch = "patchShebangs ."; - # GHC is a bit confused on its cross terminology. preConfigure = '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do @@ -112,7 +103,6 @@ stdenv.mkDerivation rec { export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' @@ -144,10 +134,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ - perl sphinx - ghc hscolour - ]; + nativeBuildInputs = [ ghc perl hscolour sphinx ]; # For building runtime libs depsBuildTarget = toolsForTarget; @@ -167,7 +154,7 @@ stdenv.mkDerivation rec { # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/* + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 592d5d3603f..dcc2852a341 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -23,11 +23,10 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? true - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" + enableShared ? + !(targetPlatform.isDarwin + # On iOS, dynamic linking is not supported + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -45,14 +44,11 @@ let "${targetPlatform.config}-"; buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross Stage1Only = YES HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO @@ -157,10 +153,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ - autoconf autoreconfHook automake perl python3 sphinx - ghc alex happy hscolour - ]; + nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ]; # For building runtime libs depsBuildTarget = toolsForTarget; @@ -182,7 +175,7 @@ stdenv.mkDerivation rec { # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/* + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index 79244e46d1b..5d8adafa9a7 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3 , libffi, libiconv ? null, ncurses @@ -15,21 +15,16 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null + enableIntegerSimple ? false, gmp ? null, m4 , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? targetPlatform != hostPlatform , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt + enableShared ? !targetPlatform.useAndroidPrebuilt -, # Whetherto build terminfo. - enableTerminfo ? !targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" +, version ? "8.4.2" }: assert !enableIntegerSimple -> gmp != null; @@ -43,14 +38,11 @@ let "${targetPlatform.config}-"; buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross Stage1Only = YES HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO @@ -63,9 +55,9 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; toolsForTarget = if hostPlatform == buildPlatform then @@ -77,7 +69,7 @@ let in stdenv.mkDerivation rec { - version = "8.4.2"; + inherit version; name = "${targetPrefix}ghc-${version}"; src = fetchurl { @@ -134,7 +126,7 @@ stdenv.mkDerivation rec { "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" @@ -152,10 +144,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc alex happy - ]; + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; # For building runtime libs depsBuildTarget = toolsForTarget; @@ -177,7 +166,7 @@ stdenv.mkDerivation rec { # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/* + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ede25c7679a..7e1c73d166a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, perl, python3, m4 +, autoconf, automake, coreutils, fetchgit, perl, python3 , libffi, libiconv ? null, ncurses @@ -22,15 +22,9 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !targetPlatform.isWindows + enableShared ? !targetPlatform.useAndroidPrebuilt , version ? "8.5.20180118" -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" }: assert !enableIntegerSimple -> gmp != null; @@ -44,14 +38,11 @@ let "${targetPlatform.config}-"; buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + BuildFlavour = perf-cross Stage1Only = YES HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO @@ -64,9 +55,9 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: [ ncurses ] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; toolsForTarget = if hostPlatform == buildPlatform then @@ -132,7 +123,7 @@ stdenv.mkDerivation rec { "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" @@ -150,10 +141,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc alex happy - ]; + nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; # For building runtime libs depsBuildTarget = toolsForTarget; @@ -175,7 +163,7 @@ stdenv.mkDerivation rec { # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' - paxmark m $out/lib/${name}/bin/* + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2f1eb1ad97a..469b249010f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -128,7 +128,7 @@ self: super: builtins.intersectAttrs super { # Prevents needing to add security_tool as a build tool to all of x509-system's # dependencies. - x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc + x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc then let inherit (pkgs.darwin) security_tool; in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { postPatch = (drv.postPatch or "") + '' diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 99c85ac688a..3ab77c42cbb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -19,7 +19,6 @@ in , buildTarget ? "" , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] -, buildFlags ? [] , description ? "" , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) , doBenchmark ? false @@ -32,7 +31,7 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !hostPlatform.isWindows +, enableStaticLibraries ? true , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" @@ -69,10 +68,6 @@ in assert editedCabalFile != null -> revision != null; -# --enable-static does not work on windows. This is a bug in GHC. -# --enable-static will pass -staticlib to ghc, which only works for mach-o and elf. -assert hostPlatform.isWindows -> enableStaticLibraries == false; - let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast @@ -131,8 +126,6 @@ let crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); - buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); - defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") @@ -176,22 +169,18 @@ let optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ - setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); - allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs; - # When not cross compiling, also include Setup.hs dependencies. - ghcEnv = ghc.withPackages (p: - haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends); + ghcEnv = ghc.withPackages (p: haskellBuildInputs); setupCommand = "./Setup"; @@ -201,22 +190,6 @@ let nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; - buildPkgDb = ghcName: '' - if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then - cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/ - continue - fi - if [ -d "$p/include" ]; then - configureFlags+=" --extra-include-dirs=$p/include" - fi - if [ -d "$p/lib" ]; then - configureFlags+=" --extra-lib-dirs=$p/lib" - fi - if [[ -d "$p/Library/Frameworks" ]]; then - configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" - fi - ''; - in assert allPkgconfigDepends != [] -> pkgconfig != null; @@ -257,37 +230,30 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - '' + (optionalString (setupHaskellDepends != []) '' - setupPackageConfDir="$TMPDIR/setup-package.conf.d" - mkdir -p $setupPackageConfDir - '') + '' packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - '' - # We build the Setup.hs on the *build* machine, and as such should only add - # dependencies for the build machine. - # - # pkgs* arrays defined in stdenv/setup.hs - + (optionalString (setupHaskellDepends != []) '' - for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb nativeGhc.name} - done - ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache - '') - # For normal components - + '' + # host.*Pkgs defined in stdenv/setup.hs for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghc.name} + if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then + cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ + continue + fi + if [ -d "$p/include" ]; then + configureFlags+=" --extra-include-dirs=$p/include" + fi + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi done '' # only use the links hack if we're actually building dylibs. otherwise, the # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes # "ln -s $out/lib/links", which tries to recreate the links dir and fails - + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables)) '' + + (optionalString (stdenv.isDarwin && enableSharedLibraries) '' # Work around a limit in the macOS Sierra linker on the number of paths # referenced by any one dynamic library: # @@ -316,11 +282,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${optionalString (setupHaskellDepends != []) - '' - echo GHC_PACKAGE_PATH="$setupPackageConfDir:" - GHC_PACKAGE_PATH="$setupPackageConfDir:" '' - }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; @@ -348,7 +310,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${setupCommand} build ${buildTarget}${crossCabalFlagsString}${buildFlagsString} + ${setupCommand} build ${buildTarget}${crossCabalFlagsString} runHook postBuild ''; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index fb1302f60ea..55e45bd6559 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -131,8 +131,6 @@ rec { */ appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; }); - appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; }); - appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; }); /* removeConfigureFlag drv x is a Haskell package like drv, but with all cabal configure arguments that are equal to x removed. From 742a5e040f4a0b362ff3391caf863f42577a89ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 May 2018 00:48:22 -0700 Subject: [PATCH 42/51] debootstrap: 1.0.99 -> 1.0.100 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100/bin/debootstrap passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 1.0.100 with grep in /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100 - directory tree listing: https://gist.github.com/70fb3fb65a686979e6e2524ca19aabeb - du listing: https://gist.github.com/e292e6056ab90b1742bed2ca6569a506 --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 22bf8340156..d12038a707d 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.99"; + version = "1.0.100"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb"; + sha256 = "0jmwf26sq4bkdz6wi0dcjsrfkg8c8k3xdhi11xp6cdrw6qpw82ws"; }; buildInputs = [ dpkg gettext gawk perl ]; From ca556c4def105e9e818546ccbce280dbb8131962 Mon Sep 17 00:00:00 2001 From: Guthrie McAfee Armstrong Date: Wed, 23 May 2018 04:27:08 -0400 Subject: [PATCH 43/51] Remove "free and secure" from Discord description (#40968) * Remove "free and secure" from Discord description Changed Discord package description to remove "free and secure". We can't vouch for its security, but it's definitely not "free" in the sense that most users would read this description. ;) * Add "cross-platform" to Discord description --- .../networking/instant-messengers/discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6801edb9767..09ead9b3de6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone"; + description = "All-in-one cross-platform voice and text chat for gamers"; homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; From cc2ac8a39ebad753d8da6adf4c0d3dd18ec7fa65 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 May 2018 10:33:26 +0200 Subject: [PATCH 44/51] ocamlPackages.imagelib: init at 20171028 (#40910) --- .../ocaml-modules/imagelib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/imagelib/default.nix diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix new file mode 100644 index 00000000000..77b18f0ce3a --- /dev/null +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }: + +stdenv.mkDerivation rec { + version = "20171028"; + name = "ocaml${ocaml.version}-imagelib-${version}"; + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-imagelib"; + rev = "ocaml-imagelib_${version}"; + sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf"; + }; + + buildInputs = [ which ocaml findlib ocamlbuild ]; + + propagatedBuildInputs = [ decompress ]; + + createFindlibDestdir = true; + + meta = { + description = "Image formats such as PNG and PPM in OCaml"; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e46888992f7..7bbb56c7b64 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -269,6 +269,8 @@ let higlo = callPackage ../development/ocaml-modules/higlo { }; + imagelib = callPackage ../development/ocaml-modules/imagelib { }; + inotify = callPackage ../development/ocaml-modules/inotify { }; integers = callPackage ../development/ocaml-modules/integers { }; From fe2b50badba45c1bdc25f378996547402736e5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 May 2018 10:22:49 +0100 Subject: [PATCH 45/51] radare2: add myself as maintainer --- pkgs/development/tools/analysis/radare2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 5f7b389cc2b..5ddb03d318f 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "unix-like reverse engineering framework and commandline tools"; homepage = http://radare.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin makefu]; + maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; platforms = with stdenv.lib.platforms; linux; inherit version; }; From 31f76cde3e86c8cc2d67e3991988876b7535b0d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 May 2018 02:54:14 -0700 Subject: [PATCH 46/51] zsh-autosuggestions: 0.4.2 -> 0.4.3 (#40949) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zsh-autosuggestions/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 0.4.3 with grep in /nix/store/dvwkp03wvr20n7yf3738hxsl9h1ab02i-zsh-autosuggestions-0.4.3 - directory tree listing: https://gist.github.com/dd361ac28a6f251b013a1fafa71c394e - du listing: https://gist.github.com/cb334bbb9559eb43e36794d276a97db9 --- pkgs/shells/zsh/zsh-autosuggestions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 906301110e9..02e25cfdde6 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zsh-autosuggestions-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "1yvbhfaaqzhmjmwjh75i1p4mrqp3ksw74bp8lrll81c6zf8bmvig"; + sha256 = "117m4jk3lgh98k699v00pg554qblpr4pbfvgs0qrgygfx1n1bpl4"; }; buildInputs = [ zsh ]; From 8f96324584095764d769210a722c6b0defc5ec0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 May 2018 12:23:16 +0200 Subject: [PATCH 47/51] haskell-lambdabot-core: apply patch from @int-e to fix GHC 8.4.x build --- .../haskell-modules/configuration-ghc-8.4.x.nix | 2 ++ .../patches/lambdabot-core-ghc-8.4.x-fix.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 83d97c64b48..0adaa5f274c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -448,4 +448,6 @@ self: super: { sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8"; }); + lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; + } diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch new file mode 100644 index 00000000000..9b7b7cfb8f9 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch @@ -0,0 +1,15 @@ +index 60e134c..246d8ca 100644 +--- lambdabot-core/src/Lambdabot/Config.hs ++++ lambdabot-core/src/Lambdabot/Config.hs +@@ -29,9 +29,9 @@ import Data.Typeable + import Data.Generics (everywhere, mkT) + import Language.Haskell.TH + +-data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t ++data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t + +-cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a) ++cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a) + cast1 = fmap runIdentity . gcast1 . Identity + + instance GEq Config where From 32bad1b6361116f7bb0e866fc2aaa08a9eaa920c Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Sat, 19 May 2018 09:47:14 +0200 Subject: [PATCH 48/51] nixos/slimserver: Disable broken image/video support (#40589) --- nixos/modules/services/audio/slimserver.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 7d661dd6040..640403d2c97 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -51,7 +51,8 @@ in { serviceConfig = { User = "slimserver"; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache"; + # Issue 40589: Disable broken image/video support (audio still works!) + ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; }; }; From 308638c0ca1b1ccf64501aa25b8854d212488d3f Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Sat, 19 May 2018 10:20:00 +0200 Subject: [PATCH 49/51] nixos/slimserver: Fix transcoding --- pkgs/servers/slimserver/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index f79e53b64cf..c9bf8393afc 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPerlPackage, fetchurl -, perl, perlPackages, fetchpatch }: +{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper +, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: buildPerlPackage rec { name = "slimserver-${version}"; @@ -16,6 +16,7 @@ buildPerlPackage rec { } ) ]; buildInputs = [ + makeWrapper perl perlPackages.AnyEvent perlPackages.AudioScan @@ -75,17 +76,19 @@ buildPerlPackage rec { preConfigurePhase = ""; - buildPhase = " + buildPhase = '' mv lib tmp mkdir -p lib/perl5/site_perl mv CPAN_used/* lib/perl5/site_perl cp -rf tmp/* lib/perl5/site_perl - "; + ''; doCheck = false; installPhase = '' cp -r . $out + wrapProgram $out/slimserver.pl \ + --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; outputs = [ "out" ]; From 22d03ba02c8f315e9a488266448f637788b88dc4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 23 May 2018 12:31:59 +0200 Subject: [PATCH 50/51] vimpc: use git tag instead of commit hash --- pkgs/applications/audio/vimpc/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 37ccbb1425f..96a6081c4d8 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "boysetsfrog"; repo = "vimpc"; - # Using commit-hash as there is not tag available - # https://github.com/boysetsfrog/vimpc/issues/70 - rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba"; + rev = "v${version}"; sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6"; }; From 266adab32d55f1272e95e9aae8c6ee2bab3f0570 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 21 May 2018 19:50:12 -0400 Subject: [PATCH 51/51] cctools: Remove a bunch of stuff no longer needed for Linux --- pkgs/os-specific/darwin/cctools/port.nix | 34 +++++++----------------- pkgs/top-level/darwin-packages.nix | 1 - 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d8abdc2c6f8..dbe8bda5e1e 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook -, llvm, libcxx, libcxxabi, clang, libuuid -, libobjc ? null, maloader ? null, xctoolchain ? null +, libcxx, libcxxabi, libuuid +, libobjc ? null, maloader ? null , hostPlatform, targetPlatform , enableDumpNormalizedLibArgs ? false }: @@ -22,7 +22,7 @@ let in # Non-Darwin alternatives -assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); +assert (!hostPlatform.isDarwin) -> maloader != null; assert enableDumpNormalizedLibArgs -> (!useOld); @@ -57,8 +57,6 @@ let autoreconfHook ]; buildInputs = [ libuuid ] ++ - # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) - stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; patches = [ @@ -80,9 +78,6 @@ let # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ - "CXXFLAGS=-I${libcxx}/include/c++/v1" - ]; postPatch = '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp @@ -108,8 +103,6 @@ let # include_next "unistd.h" #endif EOF - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh '' + stdenv.lib.optionalString useOld '' cd cctools ''; @@ -128,21 +121,12 @@ let popd ''; - postInstall = - if hostPlatform.isDarwin - then '' - cat >$out/bin/dsymutil << EOF - #!${stdenv.shell} - EOF - chmod +x $out/bin/dsymutil - '' - else '' - for tool in dyldinfo dwarfdump dsymutil; do - ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${targetPlatform.config}-$tool" \ - --add-flags "${xctoolchain}/bin/$tool" - ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool" - done - ''; + postInstall = '' + cat >$out/bin/dsymutil << EOF + #!${stdenv.shell} + EOF + chmod +x $out/bin/dsymutil + ''; passthru = { inherit targetPrefix; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index d2d41792c46..907ec0c7592 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -29,7 +29,6 @@ in inherit (darwin) libobjc maloader; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; libcxxabi = pkgs.libcxxabi; - xctoolchain = darwin.xcode.toolchain; }; cf-private = callPackage ../os-specific/darwin/cf-private {