From fc8e1745c01be9fca7ae511ffdd292b1ca22a3d5 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Tue, 13 Nov 2018 10:13:23 +0100 Subject: [PATCH 01/80] nixos/etc: Make symlinks relative instead of absolute so that the links can be followed if the NixOS installation is not mounted as filesystem root. In particular, this makes /etc/os-release adhere to the standard: https://www.freedesktop.org/software/systemd/man/os-release.html Fixes #28833. --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ nixos/lib/make-system-tarball.sh | 2 +- nixos/modules/system/etc/make-etc.sh | 15 ++++++++++----- nixos/modules/system/etc/setup-etc.pl | 12 ++++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7ccbf65dd46a..3e42294a5f87 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -457,6 +457,14 @@ use nixos-rebuild boot; reboot. + + + Symlinks in /etc are now relative instead of absolute, + so that the links can be followed if the NixOS installation is not mounted as filesystem root. + In particular, this makes /etc/os-release adhere to + the standard. + + Flat volumes are now disabled by default in hardware.pulseaudio. diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 1a0017a1799a..6bce8fb0eea5 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s $object ./$symlink + ln -s --relative ./$object ./$symlink fi done diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh index 1ca4c3046f0e..9c0520e92fc2 100644 --- a/nixos/modules/system/etc/make-etc.sh +++ b/nixos/modules/system/etc/make-etc.sh @@ -10,6 +10,11 @@ users_=($users) groups_=($groups) set +f +# Create relative symlinks, so that the links can be followed if +# the NixOS installation is not mounted as filesystem root. +# Absolute symlinks violate the os-release format +# at https://www.freedesktop.org/software/systemd/man/os-release.html +# and break e.g. systemd-nspawn and os-prober. for ((i = 0; i < ${#targets_[@]}; i++)); do source="${sources_[$i]}" target="${targets_[$i]}" @@ -19,14 +24,14 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do # If the source name contains '*', perform globbing. mkdir -p $out/etc/$target for fn in $source; do - ln -s "$fn" $out/etc/$target/ + ln -s --relative "$fn" $out/etc/$target/ done else - + mkdir -p $out/etc/$(dirname $target) if ! [ -e $out/etc/$target ]; then - ln -s $source $out/etc/$target + ln -s --relative $source $out/etc/$target else echo "duplicate entry $target -> $source" if test "$(readlink $out/etc/$target)" != "$source"; then @@ -34,13 +39,13 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do exit 1 fi fi - + if test "${modes_[$i]}" != symlink; then echo "${modes_[$i]}" > $out/etc/$target.mode echo "${users_[$i]}" > $out/etc/$target.uid echo "${groups_[$i]}" > $out/etc/$target.gid fi - + fi done diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index eed20065087f..6cbf0e17793d 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -4,6 +4,7 @@ use File::Copy; use File::Path; use File::Basename; use File::Slurp; +use File::Spec; my $etc = $ARGV[0] or die; my $static = "/etc/static"; @@ -12,7 +13,13 @@ sub atomicSymlink { my ($source, $target) = @_; my $tmp = "$target.tmp"; unlink $tmp; - symlink $source, $tmp or return 0; + # Create relative symlinks, so that the links can be followed if + # the NixOS installation is not mounted as filesystem root. + # Absolute symlinks violate the os-release format + # at https://www.freedesktop.org/software/systemd/man/os-release.html + # and break e.g. systemd-nspawn and os-prober. + my $rel = File::Spec->abs2rel($source, dirname $target); + symlink $rel, $tmp or return 0; rename $tmp, $target or return 0; return 1; } @@ -30,7 +37,8 @@ sub isStatic { if (-l $path) { my $target = readlink $path; - return substr($target, 0, length "/etc/static/") eq "/etc/static/"; + my $rel = File::Spec->abs2rel("/etc/static", dirname $path); + return substr($target, 0, length $rel) eq $rel; } if (-d $path) { From f47bfce584b81ba84aa78617d1bede441cfff570 Mon Sep 17 00:00:00 2001 From: danbst Date: Wed, 23 Jan 2019 22:19:50 +0200 Subject: [PATCH 02/80] make back /etc/static absolute symlink --- nixos/doc/manual/release-notes/rl-1903.xml | 14 +++++++---- nixos/modules/system/etc/setup-etc.pl | 27 ++++++++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 3e42294a5f87..0a51e5b1a936 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -459,10 +459,16 @@ - Symlinks in /etc are now relative instead of absolute, - so that the links can be followed if the NixOS installation is not mounted as filesystem root. - In particular, this makes /etc/os-release adhere to - the standard. + Symlinks in /etc (except /etc/static) + are now relative instead of absolute. This makes possible to examine + NixOS container's /etc directory from host system + (previously it pointed to host /etc when viewed from host, + and to container /etc when viewed from container chroot). + + + This also makes /etc/os-release adhere to + the standard + for NixOS containers. diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index 6cbf0e17793d..82ef49a2a27e 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -13,18 +13,26 @@ sub atomicSymlink { my ($source, $target) = @_; my $tmp = "$target.tmp"; unlink $tmp; - # Create relative symlinks, so that the links can be followed if - # the NixOS installation is not mounted as filesystem root. - # Absolute symlinks violate the os-release format - # at https://www.freedesktop.org/software/systemd/man/os-release.html - # and break e.g. systemd-nspawn and os-prober. + symlink $source, $tmp or return 0; + rename $tmp, $target or return 0; + return 1; +} + +# Create relative symlinks, so that the links can be followed if +# the NixOS installation is not mounted as filesystem root. +# Absolute symlinks violate the os-release format +# at https://www.freedesktop.org/software/systemd/man/os-release.html +# and break e.g. systemd-nspawn and os-prober. +sub atomicRelativeSymlink { + my ($source, $target) = @_; + my $tmp = "$target.tmp"; + unlink $tmp; my $rel = File::Spec->abs2rel($source, dirname $target); symlink $rel, $tmp or return 0; rename $tmp, $target or return 0; return 1; } - # Atomically update /etc/static to point at the etc files of the # current configuration. atomicSymlink $etc, $static or die; @@ -37,8 +45,7 @@ sub isStatic { if (-l $path) { my $target = readlink $path; - my $rel = File::Spec->abs2rel("/etc/static", dirname $path); - return substr($target, 0, length $rel) eq $rel; + return substr($target, 0, length "/etc/static/") eq "/etc/static/"; } if (-d $path) { @@ -111,7 +118,7 @@ sub link { if (-e "$_.mode") { my $mode = read_file("$_.mode"); chomp $mode; if ($mode eq "direct-symlink") { - atomicSymlink readlink("$static/$fn"), $target or warn; + atomicRelativeSymlink readlink("$static/$fn"), $target or warn; } else { my $uid = read_file("$_.uid"); chomp $uid; my $gid = read_file("$_.gid"); chomp $gid; @@ -125,7 +132,7 @@ sub link { push @copied, $fn; print CLEAN "$fn\n"; } elsif (-l "$_") { - atomicSymlink "$static/$fn", $target or warn; + atomicRelativeSymlink "$static/$fn", $target or warn; } } From fd807c68c0f6c85fc74b532f4bca21e38049a635 Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 31 Jan 2019 10:04:03 +0200 Subject: [PATCH 03/80] this is not related to this PR --- nixos/lib/make-system-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 6bce8fb0eea5..80b1db3f4640 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s --relative ./$object ./$symlink + ln -s ./$object ./$symlink fi done From 3ae5420c9da797a4d57ea3e14e51be5920375dbb Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 31 Jan 2019 10:05:56 +0200 Subject: [PATCH 04/80] :facepalm: --- nixos/lib/make-system-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 80b1db3f4640..1a0017a1799a 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -40,7 +40,7 @@ for ((n = 0; n < ${#objects[*]}; n++)); do symlink=${symlinks[$n]} if test "$symlink" != "none"; then mkdir -p $(dirname ./$symlink) - ln -s ./$object ./$symlink + ln -s $object ./$symlink fi done From eb00ae9d21422d68973859fb7786b5da806c2190 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 7 Feb 2019 18:02:32 +0100 Subject: [PATCH 05/80] hplip: 3.18.5 -> 3.19.1 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f03d75dfa02d..10dd0401cf03 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.18.5"; + version = "3.19.1"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + sha256 = "1kl1q4753xx1w76dhp92wgrhn5k1yx1ib35pyi0vi3mw0njbhrzm"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + sha256 = "1fwjypy1ycyi7rr1vk1yxhbdhx51n7fxhvjb36mzw8qz71dif2i3"; }; hplipState = substituteAll { From 51edcce46c28a389fa5194508fbb438a3ae83c5a Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 8 Feb 2019 20:25:25 -0800 Subject: [PATCH 06/80] cocoapods: 1.5.3 -> 1.6.0 Fixes #55458. Fixes #55461. --- .../development/mobile/cocoapods/Gemfile.lock | 34 ++++++------ pkgs/development/mobile/cocoapods/gemset.nix | 54 ++++++++++++------- pkgs/development/mobile/cocoapods/update | 13 ++--- 3 files changed, 60 insertions(+), 41 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 31820eff7e53..988b4195aa2e 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,50 +2,50 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.0) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.3, >= 1.3.1) + xcodeproj (>= 1.8.0, < 2.0) + cocoapods-core (1.6.0) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) + cocoapods-stats (1.1.0) cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.2.0) + ruby-macho (1.3.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.6.0) + xcodeproj (1.8.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,4 +73,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 5fcbe59603b9..4239b29a2c3a 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,12 +1,14 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11"; }; atomos = { source = { @@ -34,21 +36,25 @@ }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h"; + sha256 = "173zvbld289ikvicwj2gqsv9hkvbxz7cswx21c7mh0gznsad1gsx"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.0"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39"; + sha256 = "1q0xd24pqa1biqrg597yhsrgzgi4msk3nr00gfxi40nfqnryvmyl"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.0"; }; cocoapods-deintegrate = { source = { @@ -59,12 +65,14 @@ version = "1.0.2"; }; cocoapods-downloader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik"; + sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -84,12 +92,14 @@ version = "1.0.0"; }; cocoapods-stats = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -117,12 +127,14 @@ version = "3.1.2"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; escape = { source = { @@ -133,12 +145,14 @@ version = "0.0.4"; }; fourflusher = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; fuzzy_match = { source = { @@ -206,12 +220,14 @@ version = "0.11.0"; }; ruby-macho = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q"; + sha256 = "106xrrinbhxd8z6x94j32abgd2w3rml0afj2rk2n6jshyj6141al"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; thread_safe = { source = { @@ -232,11 +248,13 @@ }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; + sha256 = "1hyahdwz0nfmzw9v6h5rwvnj5hxa0jwqyagmpn1k1isxb1vks70w"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 58a7bd4a4539..8215d1abe4fd 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,10 +1,11 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash ruby bundler bundix -rm Gemfile.lock -bundler install -bundix +BUNDIX_CACHE="$(mktemp -d)" -if [ "clean" == "$1" ]; then - rm -rf ~/.gem -fi +rm -f Gemfile.lock +bundler package --path "$BUNDIX_CACHE" +bundix --bundle-pack-path="$BUNDIX_CACHE" + +rm -rf "$BUNDIX_CACHE" +rm -rf .bundle From 0ce675a3d53904342ff04a4150ea7814e02a90a0 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 13 Jan 2019 13:19:38 +0100 Subject: [PATCH 07/80] tahoe-lafs: 1.12.1 -> 1.13.0 --- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index c682100b4384..6d4c77d51987 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,13 +6,13 @@ # some loss of functionality because of it. pythonPackages.buildPythonApplication rec { - version = "1.12.1"; + version = "1.13.0"; name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; + sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; }; outputs = [ "out" "doc" "info" ]; @@ -56,9 +56,11 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml + service-identity pyyaml magic-wormhole treq ]; + checkInputs = with pythonPackages; [ hypothesis ]; + # Install the documentation. postInstall = '' ( From 99d3982107f3a89fb399d35d771cf3360d5c3c7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 17 Feb 2019 20:31:01 -0600 Subject: [PATCH 08/80] libsForQt.qtstyleplugin-kvantum: 0.10.8 -> 0.10.9 https://github.com/tsujan/Kvantum/releases/tag/V0.10.9 --- .../libraries/qtstyleplugin-kvantum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3784d82dcc15..39f7fa91b02e 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l"; + sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9"; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; sourceRoot = "source/Kvantum"; From 750aa7f4744f516cea9b3c7fb516dfc0201a8d37 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 16 Feb 2019 01:21:31 -0600 Subject: [PATCH 09/80] libhandy: 0.0.7 -> 0.0.8 https://source.puri.sm/Librem5/libhandy/commit/3721b490b6aacd0a8c755bf445b0a91ee9c347bc --- pkgs/development/libraries/libhandy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1c50a28f0a4d..bfc6f732463c 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.7"; + version = "0.0.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; + sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj"; }; nativeBuildInputs = [ From 01c8bc867f01134884f175a9a64a366dc7928720 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 16 Feb 2019 23:04:46 -0600 Subject: [PATCH 10/80] udiskie: 1.7.5 -> 1.7.6 https://github.com/coldfix/udiskie/releases/tag/1.7.6 --- 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 5d96918e42da..17667232735a 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; + sha256 = "0yrzn2vi8mh4vg5d9m2v79pijlal1lws7h4h1s7x9h9ccl275f7l"; }; buildInputs = [ From ce4a0129546e13e8eea49f3c753de32a2f5b1a67 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 17 Feb 2019 20:10:22 -0600 Subject: [PATCH 11/80] udiskie: 1.7.6 -> 1.7.7 https://github.com/coldfix/udiskie/releases/tag/1.7.7 --- 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 17667232735a..1eb65098fd50 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "0yrzn2vi8mh4vg5d9m2v79pijlal1lws7h4h1s7x9h9ccl275f7l"; + sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb"; }; buildInputs = [ From 8f87a61de202067f618f028b82256055c46337bc Mon Sep 17 00:00:00 2001 From: Freezeboy Date: Sun, 17 Feb 2019 14:00:33 +0100 Subject: [PATCH 12/80] Replace platforms.linux with platforms.darwin for expressions that compile on darwin too (too restrictive platforms) --- pkgs/applications/editors/emacs-modes/calfw/default.nix | 2 +- pkgs/applications/misc/autospotting/default.nix | 2 +- pkgs/applications/misc/cointop/default.nix | 2 +- pkgs/applications/networking/cluster/nomad/default.nix | 2 +- pkgs/applications/networking/cluster/openshift/default.nix | 2 +- pkgs/applications/networking/cluster/ssm-agent/default.nix | 2 +- pkgs/applications/networking/drive/default.nix | 2 +- pkgs/applications/networking/gdrive/default.nix | 2 +- .../networking/instant-messengers/turses/default.nix | 2 +- pkgs/applications/office/qnotero/default.nix | 2 +- pkgs/applications/virtualization/ecs-agent/default.nix | 2 +- pkgs/development/python-modules/aafigure/default.nix | 2 +- pkgs/development/python-modules/actdiag/default.nix | 2 +- pkgs/development/python-modules/altair/default.nix | 2 +- pkgs/development/python-modules/asn1ate/default.nix | 2 +- pkgs/development/python-modules/bitstring/default.nix | 2 +- pkgs/development/python-modules/filebrowser_safe/default.nix | 2 +- pkgs/development/python-modules/grappelli_safe/default.nix | 2 +- pkgs/development/python-modules/i3-py/default.nix | 2 +- pkgs/development/python-modules/imread/default.nix | 2 +- pkgs/development/python-modules/koji/default.nix | 2 +- pkgs/development/python-modules/libais/default.nix | 2 +- pkgs/development/python-modules/libsavitar/default.nix | 2 +- pkgs/development/python-modules/mahotas/default.nix | 2 +- pkgs/development/python-modules/mezzanine/default.nix | 2 +- pkgs/development/python-modules/moretools/default.nix | 2 +- pkgs/development/python-modules/nwdiag/default.nix | 2 +- pkgs/development/python-modules/oauth2/default.nix | 2 +- pkgs/development/python-modules/openant/default.nix | 2 +- pkgs/development/python-modules/pg8000/default.nix | 2 +- pkgs/development/python-modules/plyvel/default.nix | 2 +- pkgs/development/python-modules/pychromecast/default.nix | 2 +- pkgs/development/python-modules/pyicu/default.nix | 2 +- pkgs/development/python-modules/pyinputevent/default.nix | 2 +- pkgs/development/python-modules/pyodbc/default.nix | 2 +- pkgs/development/python-modules/pyroute2/default.nix | 2 +- pkgs/development/python-modules/pyrtlsdr/default.nix | 2 +- pkgs/development/python-modules/rpy2/default.nix | 2 +- pkgs/development/python-modules/scapy/default.nix | 2 +- pkgs/development/python-modules/seqdiag/default.nix | 2 +- pkgs/development/python-modules/tlsh/default.nix | 2 +- pkgs/development/python-modules/toposort/default.nix | 2 +- pkgs/development/python-modules/vega/default.nix | 2 +- pkgs/development/python-modules/zetup/default.nix | 2 +- pkgs/development/tools/analysis/egypt/default.nix | 2 +- pkgs/development/tools/clog-cli/default.nix | 2 +- .../tools/database/timescaledb-parallel-copy/default.nix | 2 +- pkgs/development/tools/deis/default.nix | 2 +- pkgs/development/tools/deisctl/default.nix | 2 +- pkgs/development/tools/go-protobuf/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 2 +- pkgs/development/tools/misc/circleci-cli/default.nix | 2 +- pkgs/development/tools/misc/loccount/default.nix | 2 +- pkgs/servers/cloud-print-connector/default.nix | 2 +- pkgs/servers/mail/spamassassin/default.nix | 2 +- pkgs/servers/monitoring/bosun/default.nix | 2 +- pkgs/servers/monitoring/telegraf/default.nix | 2 +- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/teleport/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/tools/filesystems/gcsfuse/default.nix | 2 +- pkgs/tools/graphics/graph-easy/default.nix | 2 +- pkgs/tools/misc/aptly/default.nix | 2 +- pkgs/tools/misc/fsql/default.nix | 2 +- pkgs/tools/misc/heatseeker/default.nix | 2 +- pkgs/tools/misc/xmonad-log/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 2 +- pkgs/tools/package-management/mynewt-newt/default.nix | 2 +- pkgs/tools/security/kbfs/default.nix | 2 +- pkgs/tools/security/saml2aws/default.nix | 2 +- pkgs/tools/system/awstats/default.nix | 2 +- pkgs/tools/system/systemd-journal2gelf/default.nix | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 091635feda6f..25f0db1cae85 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 2f38307ca1e5..2dd151c1a6c1 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 23d76afff0ce..e1fcbbfe13c2 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.linux; # cannot test others + platforms = stdenv.lib.platforms.unix; # cannot test others maintainers = [ ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 765d16844991..9e55c2f8a0f3 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index f730329d0725..652d4e58f678 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -83,6 +83,6 @@ in buildGoPackage rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline bachp moretea]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index bb179606b367..052797db2f3f 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 113d6a2e5f46..34ebc84cea28 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/odeke-em/drive; description = "Google Drive client for the commandline"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f39fac2605a4..d5ef1d7beaab 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/prasmussen/gdrive; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.rzetterberg ]; }; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 1e7da4c119b2..97f04eea2d79 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index ad571cd8b186..b317838f6722 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { description = "Quick access to Zotero references"; homepage = http://www.cogsci.nl/software/qnotero; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 711838b29447..ab971fe64c98 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 0ee617a1be6d..d75511f8d4cf 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = https://launchpad.net/aafigure/; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 27a9a455c47f..34d4c2a37a70 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 5f21f4662cb6..cb34b5ef563c 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = https://github.com/altair-viz/altair; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 29dae1fd663a..6af5b3da8808 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for translating ASN.1 into other forms"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ leenaars ]; }; } diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 8e54e3bbde72..23f4257a3574 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 8e95d1e413e4..d0d324fb9774 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index bbba074b3f52..7c115b58d32f 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { downloadPage = http://pypi.python.org/pypi/grappelli_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index e433cd51c20c..ea6e449947c5 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 9a67568d9e52..d65010732ca5 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = https://imread.readthedocs.io/en/latest/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 86e677a03374..033ab8211350 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5261a7b65642..2fbe7207f4f7 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/schwehr/libais; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; - platforms = platforms.linux; # It currently fails to build on darwin + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 9f78b9994509..52760420b83c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej ]; }; } diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 9ba6698e4a0f..34e2260109be 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = http://mahotas.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 1a7478b266ab..a831618134bc 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { downloadPage = https://github.com/stephenmcd/mezzanine/releases; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index b5f5c1379bcf..9cb56b1f9128 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 2b37bab525e7..7fb1de53dbd9 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index e01ef7c902d9..09bde0cfa7c8 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 9b88a71c5cc0..116ba717add6 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a0e8d08a2c7b..161c5e62738e 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = https://github.com/mfenniak/pg8000; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index bb0b56b1e9c0..9ce01c098fd4 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://github.com/wbolster/plyvel; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index bda05a58e150..37535218ca0d 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 4b984566e919..d0db3c6ed838 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; - platforms = platforms.linux; # Maybe other non-darwin Unix + platforms = platforms.unix; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 6eeeeb20c005..153b5701b267 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; description = "Python interface to the Input Subsystem's input_event and uinput"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index c0e3fb51920e..428ec1d46b89 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 16805ac58c04..9f8103b06065 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://github.com/svinota/pyroute2; license = licenses.asl20; maintainers = [maintainers.mic92]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index a86badb3bca8..0bb240310847 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index dfbcdec858aa..7ff5b0343ea1 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { homepage = http://rpy.sourceforge.net/rpy2; description = "Python interface to R"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ joelmo ]; }; } diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 18dd6e58f5c3..7ca3fc0f94be 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Powerful interactive network packet manipulation program"; homepage = https://scapy.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; }; } diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index d3c6006bc6c8..158d9a054df9 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 1b144b4db8d1..848c114543d2 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Trend Micro Locality Sensitive Hash"; homepage = https://github.com/trendmicro/tlsh; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 3fcb118ac2ad..dd1156f4355c 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 09106e3a6d49..9a589ccf1f87 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = https://github.com/vega/ipyvega; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 99d05a359631..5772308f967a 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://github.com/zimmermanncode/zetup; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index defc39a9f749..7db46005f453 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -27,6 +27,6 @@ perlPackages.buildPerlPackage rec { ''; homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1cd8f7757f96..0e21164482a8 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { description = "Generate changelogs from local git metadata"; homepage = https://github.com/clog-tool/clog-cli; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index d667e49e7cbe..e559f714bd1b 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = http://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 91037e6dfaa9..d0bb744f1247 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 3f818ea7be62..b8f49c863e46 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 361fc74c729b..750df126e943 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index afac17b52519..be964cf4d308 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 97cf820f9a94..daf39318432a 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; homepage = https://circleci.com/; }; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 017c6ad80491..240d52ca7d0e 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { downloadPage="https://gitlab.com/esr/loccount/tree/master"; license = licenses.bsd2; maintainers = with maintainers; [ calvertvl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 76d925418550..21a5bad72fc8 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -51,6 +51,6 @@ buildGoPackage rec { maintainers = with maintainers; [ hodapp ]; # TODO: Fix broken build on macOS. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c3fcd13a41f8..431e66e38fb8 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec { homepage = http://spamassassin.apache.org/; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ peti qknight ]; }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 905244833602..c8eb07319245 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://bosun.org; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index c6c52bcbda58..d3ddfe26d4a5 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -28,6 +28,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index ffbeb2fca34c..90768e8f66ee 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -99,6 +99,6 @@ perlPackages.buildPerlPackage rec { # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt license = licenses.unfree; maintainers = [ maintainers.phile314 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0f08d94a052f..9ba60416119c 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -36,6 +36,6 @@ buildGoPackage rec { homepage = "https://gravitational.com/teleport/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 98079c37f1f8..696baff0ca32 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = https://trezor.io; license = licenses.lgpl3; maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 215f02ccdd4e..ccc5f1f2d4a8 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = []; homepage = https://cloud.google.com/storage/docs/gcs-fuse; description = diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index c21fc02753ec..63d3e60e2069 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Render/convert graphs in/from various formats"; license = licenses.gpl1; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 168a3f887728..eb8f09253c17 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -41,7 +41,7 @@ buildGoPackage { homepage = https://www.aptly.info; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 32deb0c23067..e723db260eb5 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { homepage = https://github.com/kshvmdn/fsql; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; inherit version; }; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index e7ddcf572aed..372213b92c39 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -24,6 +24,6 @@ buildRustPackage rec { homepage = https://github.com/rschmitt/heatseeker; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index c39da71e1797..7a092e595621 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "xmonad DBus monitoring solution"; homepage = https://github.com/xintron/xmonad-log; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ joko ]; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d8aed9ad8e07..f9e334d81962 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -17,6 +17,6 @@ buildGoPackage rec { description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index ea40a541a224..0cb8ad5a4376 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { homepage = https://github.com/sloonz/ua; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 74c2fd59d4e3..41471b2c8a7a 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 7c96085d37f6..9cd6ccca388c 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.keybase.io; description = "The Keybase FS FUSE driver"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ rvolosatovs bennofs np ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index e90517f1581b..7ccb9efcdd5d 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = https://github.com/Versent/saml2aws; license = licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index aaf5bf136cb5..9686ec5d715c 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -56,7 +56,7 @@ perlPackages.buildPerlPackage rec { description = "Real-time logfile analyzer to get advanced statistics"; homepage = http://awstats.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index bfbe217c2696..7230f55d309c 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz globin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 55560a61d7ebcf1ec62d50402df13b6796eb76ee Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Feb 2019 12:42:27 -0600 Subject: [PATCH 13/80] jdupes: 1.11.1 -> 1.12 https://github.com/jbruchon/jdupes/releases/tag/v1.12 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index ee6392457971..9ce06c9cf438 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.11.1"; + version = "1.12"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1yg7071lwl561s7r0qrnfx45z3ny8gjfrxpx0dbyhv3ywiac5kw8"; + sha256 = "1m5506scjbf2820p7mbsdsb2acg9jm74sb1604m9iz8v3dcn9dm6"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From 8019d4a1c7855610335483abfc65216a73759499 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Feb 2019 12:36:03 -0600 Subject: [PATCH 14/80] busybox: 1.29.3 -> 1.30.1 For changes see https://busybox.net (most of which are part of 1.30.0). --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 73bea1c7da69..4b2877250821 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.3"; + name = "busybox-1.30.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; + sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; }; hardeningDisable = [ "format" "pie" ] From a1fec8667dceac682f4cd5deeb9dff28fcee5e37 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Nov 2018 17:23:24 +0000 Subject: [PATCH 15/80] treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl` itself The only outside-curl uses of `fetchurlBoot` left are `stdenv` and `apple-source-releases`. The latter one can probably be removed too, but I can't test it. Pros: - Aggregates all behind-the-scenes insanity in a single place. Cons: - At the cost of 10 more derivations (but 0 new outpaths). --- .../development/interpreters/perl/default.nix | 8 +- .../development/libraries/libssh2/default.nix | 4 +- .../darwin/apple-source-releases/default.nix | 4 +- pkgs/top-level/all-packages.nix | 79 +++++++++---------- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5e8f5e2d59b6..40e6663407bd 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages +{ lib, stdenv, fetchurl, buildPackages , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -27,7 +27,7 @@ let name = "perl-${version}"; - src = fetchurlBoot { + src = fetchurl { url = "mirror://cpan/src/5.0/${name}.tar.gz"; inherit sha256; }; @@ -46,7 +46,7 @@ let ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurlBoot { + (fetchurl { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) @@ -156,7 +156,7 @@ let } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 - perl-cross-src = fetchurlBoot { + perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index b050dede8c61..0986dee0ca0d 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurlBoot, openssl, zlib, windows }: +{ stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { name = "libssh2-1.8.0"; - src = fetchurlBoot { + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4fa0c0e3e47f..c9473bca06d4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -141,7 +141,7 @@ let # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling fetch = if name == "libiconv" - then fetchurlBoot + then stdenv.fetchurlBoot else fetchurl; in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82cec..3c33ae92e848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -239,9 +239,35 @@ in # `fetchurl' downloads a file from the network. fetchurl = import ../build-support/fetchurl { inherit lib stdenvNoCC; - # On darwin, libkrb5 needs bootstrap_cmds which would require - # converting many packages to fetchurl_boot to avoid evaluation cycles. - curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); + curl = buildPackages.curl.override rec { + # break dependency cycles + fetchurl = stdenv.fetchurlBoot; + pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; + perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + openssl = buildPackages.openssl.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + buildPackages = { inherit perl; }; + }; + libssh2 = buildPackages.libssh2.override { + fetchurl = stdenv.fetchurlBoot; + inherit openssl; + }; + # On darwin, libkrb5 needs bootstrap_cmds which would require + # converting many packages to fetchurl_boot to avoid evaluation cycles. + gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + libkrb5 = buildPackages.libkrb5.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig perl openssl; + keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; + }; + nghttp2 = buildPackages.nghttp2.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig openssl; + c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; + libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + }; + }; }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -250,13 +276,6 @@ in inherit curl stdenv; }; - # fetchurlBoot is used for curl and its dependencies in order to - # prevent a cyclic dependency (curl depends on curl.tar.bz2, - # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It - # uses the curl from the previous bootstrap phase (e.g. a statically - # linked curl in the case of stdenv-linux). - fetchurlBoot = stdenv.fetchurlBoot; - fetchzip = callPackage ../build-support/fetchzip { }; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; @@ -2139,9 +2158,7 @@ in brotliSupport = true; }; - curl = callPackage ../tools/networking/curl rec { - fetchurl = fetchurlBoot; - }; + curl = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; @@ -8971,9 +8988,7 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkg-config = callPackage ../development/tools/misc/pkg-config { - fetchurl = fetchurlBoot; - }; + pkg-config = callPackage ../development/tools/misc/pkg-config { }; pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); @@ -9436,9 +9451,7 @@ in bzrtp = callPackage ../development/libraries/bzrtp { }; - c-ares = callPackage ../development/libraries/c-ares { - fetchurl = fetchurlBoot; - }; + c-ares = callPackage ../development/libraries/c-ares { }; c-blosc = callPackage ../development/libraries/c-blosc { }; @@ -10499,10 +10512,7 @@ in inherit (buildPackages.darwin) bootstrap_cmds; }; krb5Full = krb5; - libkrb5 = krb5.override { - fetchurl = fetchurlBoot; - type = "lib"; - }; + libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10878,9 +10888,7 @@ in libechonest = callPackage ../development/libraries/libechonest { }; - libev = callPackage ../development/libraries/libev { - fetchurl = fetchurlBoot; - }; + libev = callPackage ../development/libraries/libev { }; libevent = callPackage ../development/libraries/libevent { }; @@ -11099,9 +11107,7 @@ in ln -sv ${libcDev}/include/iconv.h $out/include ''; - libiconvReal = callPackage ../development/libraries/libiconv { - fetchurl = fetchurlBoot; - }; + libiconvReal = callPackage ../development/libraries/libiconv { }; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; @@ -11771,9 +11777,7 @@ in newt = callPackage ../development/libraries/newt { }; - nghttp2 = callPackage ../development/libraries/nghttp2 { - fetchurl = fetchurlBoot; - }; + nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; nix-plugins = callPackage ../development/libraries/nix-plugins { @@ -11931,9 +11935,7 @@ in openssl = openssl_1_0_2; - inherit (callPackages ../development/libraries/openssl { - fetchurl = fetchurlBoot; - }) + inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 openssl_1_1; @@ -13132,9 +13134,7 @@ in zeitgeist = callPackage ../development/libraries/zeitgeist { }; - zlib = callPackage ../development/libraries/zlib { - fetchurl = fetchurlBoot; - }; + zlib = callPackage ../development/libraries/zlib { }; libdynd = callPackage ../development/libraries/libdynd { }; @@ -14913,8 +14913,7 @@ in kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; - # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on - keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; }; + keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { }; From 9f3fe63b5f491db8a2b9daf20d4cdd4f13623542 Mon Sep 17 00:00:00 2001 From: Robert Klotzner Date: Mon, 18 Feb 2019 19:33:36 +0100 Subject: [PATCH 16/80] Add some hint on howto get valid signing keys. --- nixos/modules/services/networking/nix-serve.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 880a1d361dfe..914ea98eef57 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -31,6 +31,15 @@ in default = null; description = '' The path to the file used for signing derivation data. + Generate with: + + ``` + nix-store --generate-binary-cache-key key-name secret-key-file public-key-file + ``` + + Make sure user `nix-serve` has read access to the private key file. + + For more details see nix-store1. ''; }; From f9dab198395c741642bbc96dc7c99b75be02f123 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 20 Feb 2019 21:29:03 +0100 Subject: [PATCH 17/80] ktouch: fix build failure due to dependecy missing fixes #56097 --- pkgs/applications/kde/ktouch.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 75e72c0ba180..64179f2e64dc 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,7 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg }: @@ -19,7 +19,8 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + qtx11extras qtgraphicaleffects qtxmlpatterns + xorg.libxkbfile xorg.libxcb ]; enableParallelBuilding = true; From 96dde14360671acebfca807985f7b30ebc079809 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Wed, 20 Feb 2019 14:00:17 -0800 Subject: [PATCH 18/80] Add Cody Allen (ceedubs) to maintainer list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 63d8385eeb36..164b1ddb6214 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -817,6 +817,11 @@ github = "cdepillabout"; name = "Dennis Gosnell"; }; + ceedubs = { + email = "ceedubs@gmail.com"; + github = "ceedubs"; + name = "Cody Allen"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; From 0094157f86b6a8e82bb97e5ef8c46847daaca841 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Wed, 20 Feb 2019 14:21:37 -0800 Subject: [PATCH 19/80] ddgr: 1.1 -> 1.6 ddgr (DuckDuckGo CLI) 1.6 no longer requires the `requests` Python package and includes the commit that patched zsh-completion. --- pkgs/applications/misc/ddgr/default.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index ca7e332cc286..0716125859b1 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,29 +1,17 @@ -{stdenv, fetchpatch, fetchFromGitHub, python3Packages}: +{stdenv, fetchpatch, fetchFromGitHub, python3}: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.6"; name = "ddgr-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf"; + sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c"; }; - buildInputs = [ - (python3Packages.python.withPackages (ps: with ps; [ - requests - ])) - ]; - - patches = [ - (fetchpatch { - sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc"; - name = "Fix-zsh-completion.patch"; - url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch"; - }) - ]; + buildInputs = [ python3 ]; makeFlags = "PREFIX=$(out)"; @@ -40,7 +28,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jarun/ddgr; description = "Search DuckDuckGo from the terminal"; license = licenses.gpl3; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ ceedubs markus1189 ]; platforms = platforms.unix; }; } From f4e98fde9bebef9591a06d9d588b480a0ff927e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 20 Feb 2019 19:00:04 -0500 Subject: [PATCH 20/80] xterm: 342 -> 344 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ee267c1ec7cc..25d2e0905806 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-342"; + name = "xterm-344"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0"; + sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; }; buildInputs = From c41ed752dccf5c672954c7feefe7d930a3f796b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 19 Feb 2019 14:26:11 +0000 Subject: [PATCH 21/80] radare2: 3.2.1 -> 3.3.0 --- .../tools/analysis/radare2/default.nix | 38 +++++++++++-------- .../tools/analysis/radare2/update.py | 14 +++---- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 68931773f04e..f88dc3f6d333 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -29,7 +29,7 @@ let rev, version, sha256, - cs_tip, + cs_ver, cs_sha256 }: stdenv.mkDerivation rec { @@ -46,15 +46,21 @@ let owner = "aquynh"; repo = "capstone"; # version from $sourceRoot/shlr/Makefile - rev = cs_tip; + rev = cs_ver; sha256 = cs_sha256; }; in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - # When using meson, it expects capstone source relative to build directory mkdir -p build/shlr - cp -r ${capstone} shlr/capstone - chmod -R +w shlr/capstone + cp -r ${capstone} capstone-${cs_ver} + chmod -R +w capstone-${cs_ver} + # radare 3.3 compat for radare2-cutter + (cd shlr && ln -s ../capstone-${cs_ver} capstone) + tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} + # necessary because they broke the offline-build: + # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 + # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 + curl() { true; } + export -f curl ''; postInstall = '' @@ -104,23 +110,23 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20591"; - gittap = "3.2.1"; - gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; - rev = "3.2.1"; - version = "3.2.1"; - sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; - cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; - cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; + version_commit = "20942"; + gittap = "3.3.0"; + gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + rev = "3.3.0"; + version = "3.3.0"; + sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + cs_ver = "4.0.1"; + cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "20591"; + version_commit = "20942"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; version = "2018-10-07"; sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; - cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; # diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 684d70bc0bc4..794581bca7ad 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -61,15 +61,15 @@ def git(dirname: str, *args: str) -> str: def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: sha256 = prefetch_github("radare", "radare2", rev) - cs_tip = None + cs_ver = None with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: for l in makefile: - match = re.match("CS_TIP=(\S+)", l) + match = re.match("CS_VER=(\S+)", l) if match: - cs_tip = match.group(1) - assert cs_tip is not None + cs_ver = match.group(1) + assert cs_ver is not None - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + cs_sha256 = prefetch_github("aquynh", "capstone", cs_ver) return dict( rev=rev, @@ -77,7 +77,7 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: version_commit=git(dirname, "rev-list", "--all", "--count"), gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), gittip=git(dirname, "rev-parse", "HEAD"), - cs_tip=cs_tip, + cs_ver=cs_ver, cs_sha256=cs_sha256, ) @@ -90,7 +90,7 @@ def write_package_expr(version: str, info: Dict[str, str]) -> str: rev = "{info["rev"]}"; version = "{version}"; sha256 = "{info["sha256"]}"; - cs_tip = "{info["cs_tip"]}"; + cs_ver = "{info["cs_ver"]}"; cs_sha256 = "{info["cs_sha256"]}"; }}""" From b0ec4c1fd3c34235826e81cbeeceef4a7ddfefa7 Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Tue, 19 Feb 2019 18:46:33 +0100 Subject: [PATCH 22/80] nix-prefetch: init at 0.1.0 --- .../nix-prefetch/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/tools/package-management/nix-prefetch/default.nix diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix new file mode 100644 index 000000000000..96a283a8ea8a --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt +, coreutils, gawk, gnugrep, gnused, jq, nix }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "nix-prefetch"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "msteen"; + repo = "nix-prefetch"; + rev = "f9507a655651b51f3a3ebacde85bb40758853615"; + sha256 = "0ykrbvbwwpz348424yy2452idgw8dffi3klh7n85n96dfflyyd4s"; + }; + + nativeBuildInputs = [ + makeWrapper + asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + ]; + + configurePhase = '' + . configure.sh + ''; + + buildPhase = '' + a2x -f manpage doc/nix-prefetch.1.asciidoc + ''; + + installPhase = '' + lib=$out/lib/${pname} + mkdir -p $lib + substitute src/main.sh $lib/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version '${version}' + chmod +x $lib/main.sh + patchShebangs $lib/main.sh + cp lib/*.nix $lib/ + + mkdir -p $out/bin + makeWrapper $lib/main.sh $out/bin/${pname} \ + --prefix PATH : '${makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' + + substitute src/tests.sh $lib/tests.sh \ + --subst-var-by bin $out/bin + chmod +x $lib/tests.sh + patchShebangs $lib/tests.sh + + mkdir -p $out/share/man/man1 + substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ + --subst-var-by version '${version}' \ + --replace '01/01/1970' "$date" + + install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch + install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + + mkdir $out/contrib + cp -r contrib/hello_rs $out/contrib/ + ''; + + meta = { + description = "Prefetch any fetcher function call, e.g. package sources"; + homepage = https://github.com/msteen/nix-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ msteen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82cec..99b3f932ddae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22655,6 +22655,8 @@ in nix-pin = callPackage ../tools/package-management/nix-pin { }; + nix-prefetch = callPackage ../tools/package-management/nix-prefetch { }; + nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {}; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) From 582b952cc031e7396708b4a6481c9d3116e149f5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 21 Feb 2019 04:09:28 +0100 Subject: [PATCH 23/80] emacsPackagesNg.lua-mode: Fix hash See https://github.com/NixOS/nixpkgs/issues/54641 --- pkgs/applications/editors/emacs-modes/melpa-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index bfc6c26ea09a..636e24464f87 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -60583,7 +60583,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; - sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; + sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -107584,4 +107584,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } From 89401b0e3e7d608913ba7a2b3a1ddcc0bd08eeaa Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 21 Feb 2019 09:23:24 +0100 Subject: [PATCH 24/80] python3Packages.imageio-ffmpeg: init at 0.2.0 --- .../python-modules/imageio-ffmpeg/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/imageio-ffmpeg/default.nix diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix new file mode 100644 index 000000000000..8977a7868542 --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "imageio-ffmpeg"; + version = "0.2.0"; + + src = fetchPypi { + sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + inherit pname version; + }; + + # No test infrastructure in repository. + doCheck = false; + + meta = with stdenv.lib; { + description = "FFMPEG wrapper for Python"; + homepage = https://github.com/imageio/imageio-ffmpeg; + license = licenses.bsd2; + maintainers = [ maintainers.pmiddend ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0077482ab17e..76bac51ec19f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2794,6 +2794,8 @@ in { imageio = callPackage ../development/python-modules/imageio { }; + imageio-ffmpeg = disabledIf isPy27 (callPackage ../development/python-modules/imageio-ffmpeg { }); + imgaug = callPackage ../development/python-modules/imgaug { }; inflection = callPackage ../development/python-modules/inflection { }; From cf549409cebf4e2c5ee6ccf9bb30fec349e80e00 Mon Sep 17 00:00:00 2001 From: dywedir Date: Thu, 21 Feb 2019 09:12:30 +0200 Subject: [PATCH 25/80] alacritty: add wayland, libxkbcommon to rpath --- pkgs/applications/misc/alacritty/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ef0b49f8d7ba..327272ae39cc 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -17,6 +17,8 @@ libXrandr, libGL, xclip, + wayland, + libxkbcommon, # Darwin Frameworks cf-private, AppKit, @@ -40,6 +42,9 @@ let libXrandr libGL libXi + ] ++ lib.optionals stdenv.isLinux [ + wayland + libxkbcommon ]; in buildRustPackage rec { name = "alacritty-${version}"; From c210206b7a3e58132dedaaeaa8889ee0ca37a7af Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 31 Jan 2019 02:03:02 -0800 Subject: [PATCH 26/80] mgba: 0.6.3 -> 0.7.0 --- pkgs/misc/emulators/mgba/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7fb804d31e41..09c3d8e762d2 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, pkgconfig , cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit , qttools, minizip }: @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; + sha256 = "0s4dl4pi8rxqahvzxnh37xdgsfax36cn5wlh1srdcmabwsrfpb3w"; }; enableParallelBuilding = true; @@ -32,11 +32,6 @@ in stdenv.mkDerivation rec { qttools ]; - patches = [(fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; - sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; - })]; - postInstall = '' cp -r ${desktopItem}/share/applications $out/share wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ From 6959c375a5ba0092a0d76af5f1d6b263d85f240a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 31 Jan 2019 02:02:23 -0800 Subject: [PATCH 27/80] openjdk11: 11.0.1+13 -> 11.0.2+9 --- pkgs/development/compilers/openjdk/11.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index a389f0f5ca1a..f2a566c87df6 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -18,8 +18,8 @@ let else "amd64"; major = "11"; - update = ".0.1"; - build = "13"; + update = ".0.2"; + build = "9"; repover = "jdk-${major}${update}+${build}"; openjdk = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; - sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm"; + sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30"; }; nativeBuildInputs = [ pkgconfig ]; From c8e61efae360c8d86909de5f1ab372f39de6a453 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:02:43 +0100 Subject: [PATCH 28/80] cereal: run test suite on ghc-8.6 --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a0..47bf367875c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -45,7 +45,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; From d5f45a65669816ec2312fed3ec08e66f82637b6c Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:04:11 +0100 Subject: [PATCH 29/80] cereal: run test suite on ghc-head --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be375348..e94d9c8fda01 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; From 5aa3f23a9865352cae50d2efbf20131439f99434 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:06:42 +0100 Subject: [PATCH 30/80] psqueues: run test suite on ghc-8.6 --- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a0..febc14f5f903 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -54,7 +54,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 From 7e153d9e2d31451343dc031098330b2699c6886f Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 21 Feb 2019 10:08:04 +0100 Subject: [PATCH 31/80] psqueues: run test suite on ghc-head --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be375348..f7cb81b21f04 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -60,7 +60,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 From da4484c9a6c4a1f2db3ab25c2fbf551d243f78b2 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 21 Jan 2019 02:41:25 -0800 Subject: [PATCH 32/80] mwprocapture: 1.2.3950 -> 1.2.4054 --- pkgs/os-specific/linux/mwprocapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f6f6c10112a7..9490bc911819 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3950"; + version = "4054"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; + sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; From 22c7c4b697cfab8c3bef9dd6a5b4617bd7a0978d Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Thu, 21 Feb 2019 01:34:58 +0100 Subject: [PATCH 33/80] owncloud-client: 2.4.3 -> 2.5.3.11470 --- .../networking/owncloud-client/default.nix | 6 ++---- .../networking/owncloud-client/find-sql.patch | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/owncloud-client/find-sql.patch diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c142661fd033..6b85dbfa3ccd 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.4.3"; + version = "2.5.3.11470"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk"; + sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"; }; - patches = [ ./find-sql.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch deleted file mode 100644 index 44dea6414e92..000000000000 --- a/pkgs/applications/networking/owncloud-client/find-sql.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/cmake/modules/QtVersionAbstraction.cmake ---- b/cmake/modules/QtVersionAbstraction.cmake -*************** -*** 8,13 **** ---- 8,14 ---- - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Xml REQUIRED) -+ find_package(Qt5Sql REQUIRED) - find_package(Qt5Concurrent REQUIRED) - if(UNIT_TESTING) - find_package(Qt5Test REQUIRED) From 4cfb4ec5f49229a15b479d6809594e565714a2f8 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 21 Feb 2019 01:26:24 -0800 Subject: [PATCH 34/80] dolphinEmuMaster: 2018-12-25 -> 2019-02-16 --- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index b720bf142d4a..e57c3854926f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-12-25"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe"; - sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb"; + rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; + sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; }; enableParallelBuilding = true; From 95039d066841691e56bbd8db2c4e61b7f86c37a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Feb 2019 09:42:11 +0000 Subject: [PATCH 35/80] nixos/xserver: drop intel from videoDrivers (#55583) * nixos/xserver: drop intel from videoDrivers * Some more notes about possible regressions --- nixos/doc/manual/release-notes/rl-1903.xml | 17 ++++++++++++++++- nixos/modules/services/x11/xserver.nix | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 269f27f74fbd..cec399b62199 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -604,7 +604,22 @@ The kubernetes module does no longer add the kubernetes package to environment.systemPackages implicitly. - + + + + The intel driver has been removed from the default list of + X.org video drivers. + The modesetting driver should take over automatically, + it is better maintained upstream and has less problems with advanced X11 features. + Some performance regressions on some GPU models might happen. + Some OpenCL and VA-API applications might also break + (Beignet seems to provide OpenCL support with + modesetting driver, too). + Users who need this functionality more than multi-output XRandR are advised + to add `intel` to `videoDrivers` and report an issue (or provide additional + details in an existing one) + + diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 34ae8c11a3f0..34fbefa4256b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -240,7 +240,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; + default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" From 7a6bbb41ac81e5c0664b0a9ee9da027270c248fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 12:09:50 +0100 Subject: [PATCH 36/80] haskell-hledger: don't install data files that don't belong to this package Fixes https://github.com/NixOS/nixpkgs/issues/53936. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 426d23d6c7e1..443fd4fc303c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -964,6 +964,9 @@ self: super: { # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { postInstall = '' + # Don't install files that don't belong into this package to avoid + # conflicts when hledger and hledger-ui end up in the same profile. + rm embeddedfiles/hledger-{api,ui,web}.* for i in $(seq 1 9); do for j in embeddedfiles/*.$i; do mkdir -p $out/share/man/man$i From 6450d8c5ca6f4a9de975897bccdebc15c68f1ec3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 12:10:49 +0100 Subject: [PATCH 37/80] haskell-hledger: drop obsolete (and already commented-out) overrides --- .../haskell-modules/configuration-common.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 443fd4fc303c..5971ee6f9c84 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -953,13 +953,6 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # hledger needs a newer megaparsec version than we have in LTS 12.x. - hledger-lib = super.hledger-lib.overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; - }); - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -977,7 +970,7 @@ self: super: { cp -v embeddedfiles/*.info* $out/share/info/ ''; }); - hledger-ui = (overrideCabal super.hledger-ui (drv: { + hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -988,11 +981,6 @@ self: super: { mkdir -p $out/share/info cp -v *.info* $out/share/info/ ''; - })).overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # config-ini = self.config-ini_0_2_4_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' From 0ea8c6e3de08b902887eef8aa107891f49d1f610 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 21 Feb 2019 12:05:43 +0000 Subject: [PATCH 38/80] linux: Enable support for Self-Encrypting Drives To quote block/Kconfig: > Builds Logic for interfacing with Opal enabled controllers. > Enabling this option enables users to setup/unlock/lock > Locking ranges for SED devices using the Opal protocol. Without `BLK_SED_OPAL`, it is impossible to resume from sleep when using a locked self-encrypting drive. This configuration option appeared in earlier kernels, but only reached maturity in 4.14 according to discussion at: - https://github.com/Drive-Trust-Alliance/sedutil/issues/90 and - https://github.com/Drive-Trust-Alliance/sedutil/pull/190 This kernel option is enabled in the default kernels shipped with Fedora, Debian, and other mainstream Linux distributions. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e8126c23d3d1..61dbf2393bb1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -592,6 +592,8 @@ let BLK_DEV_INTEGRITY = yes; + BLK_SED_OPAL = whenAtLeast "4.14" yes; + BSD_PROCESS_ACCT_V3 = yes; BT_HCIUART_BCSP = option yes; From 3ad5550d213d7f2ae68ca46bc29f577d1ef1b34f Mon Sep 17 00:00:00 2001 From: Adam Finn Tulinius Date: Thu, 21 Feb 2019 13:55:46 +0100 Subject: [PATCH 39/80] morph: 1.1.0 -> 1.2.0 --- pkgs/tools/package-management/morph/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 27dbad884132..51a963497fa2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "morph-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0pixm48is9if9d2b4qc5mwwa4lzma6snkib6z2a1d4pmdx1lmpmm"; + sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -16,6 +16,12 @@ buildGoPackage rec { buildInputs = [ go-bindata ]; + buildFlagsArray = '' + -ldflags= + -X + main.version=${version} + ''; + prePatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; From 3382d93982eecfdec05452d8e169781852f88aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 Feb 2019 14:02:05 +0100 Subject: [PATCH 40/80] home-assistant-cli: 0.5.0 -> 0.6.0 --- nixos/tests/home-assistant.nix | 4 ++-- pkgs/servers/home-assistant/cli.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index a93360b252f6..8def0a6f9b9a 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -87,8 +87,8 @@ in { $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); # Toggle a binary sensor using hass-cli - $hass->succeed("${hassCli} --output json entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); - $hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); + $hass->succeed("${hassCli} --output json state get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); + $hass->succeed("${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); # Print log to ease debugging diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index baed66bb4bdb..92ec5d97dcd5 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.5.0"; + version = "0.6.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d"; + sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; }; postPatch = '' From 255f67e50ff4439b6dd64978b5551a399ae3cbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 21 Feb 2019 14:18:22 +0100 Subject: [PATCH 41/80] abcmidi: 2019.01.01 -> 2019.02.08 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ffea29691d69..7a6d4e6d3ab9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.01.01"; + version = "2019.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "10kqxw4vrz7xa8fc9z5cdyrvks8fsr2s9nai9yg1z9p5w7xhagrg"; + sha256 = "14j2vgcck7c6x8bplhfng7mmqcmh7h98jggi30d5xa0anx1271sb"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 291c80988801b4c7a59e722762a1993b70f707c7 Mon Sep 17 00:00:00 2001 From: Adam Finn Tulinius Date: Thu, 21 Feb 2019 14:34:22 +0100 Subject: [PATCH 42/80] nixos/kubernetes: add missing systemd restart options --- nixos/modules/services/cluster/kubernetes/proxy.nix | 2 ++ nixos/modules/services/cluster/kubernetes/scheduler.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 6bcf2eaca82a..83cd3e231000 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -64,6 +64,8 @@ in ${cfg.extraOpts} ''; WorkingDirectory = top.dataDir; + Restart = "on-failure"; + RestartSec = 5; }; }; diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 655e6f8b6e20..0305b9aefe59 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -76,6 +76,8 @@ in WorkingDirectory = top.dataDir; User = "kubernetes"; Group = "kubernetes"; + Restart = "on-failure"; + RestartSec = 5; }; }; From 3ed9664827cd81c4fc1622bcb328a68e26422624 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 17:49:27 +0100 Subject: [PATCH 43/80] openmpi: 3.1.3 -> 4.0.0 openmpi-4.0.0 removes deprecated MPI-1 symbols. For upgrade guide see: https://www.open-mpi.org/faq/?category=mpi-removed --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 345dffa87f5b..4bd7e76494ad 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -9,14 +9,14 @@ }: let - version = "3.1.3"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b"; + sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; postPatch = '' From c26a79a5568aec6dadf962d5a20121bbfee73461 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 Jan 2019 11:14:07 +0100 Subject: [PATCH 44/80] release-notes: add note about openmpi-4.0.0 upgrade. Add link to openmpi upgrade guide, regarding deprecated MPI-1 symbols. --- nixos/doc/manual/release-notes/rl-1903.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index fc3d75f32cf0..c32c0fc14cb8 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -618,7 +618,7 @@ The kubernetes module does no longer add the kubernetes package to environment.systemPackages implicitly. - + The intel driver has been removed from the default list of @@ -634,6 +634,13 @@ details in an existing one) + + + Openmpi has been updated to version 4.0.0, which removes some deprecated MPI-1 symbols. + This may break some older applications that still rely on those symbols. + An upgrade guide can be found here. + + From 840716a8b65a3267cf17231073426daaf9cf0d8f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 18:28:44 +0100 Subject: [PATCH 45/80] openmpi: Use external hwloc and libevent Recommended in the upgrade guide: https://www.open-mpi.org/software/ompi/major-changes.php --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 4bd7e76494ad..b3f170216064 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl +, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; From c0bc7a3b3d06da55b1f553b6619371d26a1262c5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 17:53:07 +0100 Subject: [PATCH 46/80] globalarrays: add openmpi-4 compatibility patches --- .../development/libraries/globalarrays/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 2da5474eb9d1..6a57ef3a2b9a 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, automake, autoconf, libtool , openblas, gfortran, openssh, openmpi } : @@ -15,6 +15,18 @@ in stdenv.mkDerivation { sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; }; + # upstream patches for openmpi-4 compatibility + patches = [ (fetchpatch { + name = "MPI_Type_struct-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; + sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; + }) + (fetchpatch { + name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; + sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; + })]; + nativeBuildInputs = [ automake autoconf libtool ]; buildInputs = [ openmpi openblas gfortran openssh ]; From 47a774527dc72bef12ec0c4e3df8df1cdf56027d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 20 Feb 2019 00:02:04 +0100 Subject: [PATCH 47/80] globalarrays: use autoreconfHook --- pkgs/development/libraries/globalarrays/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 6a57ef3a2b9a..269071434d57 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , openblas, gfortran, openssh, openmpi } : @@ -27,11 +27,10 @@ in stdenv.mkDerivation { sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; })]; - nativeBuildInputs = [ automake autoconf libtool ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openmpi openblas gfortran openssh ]; preConfigure = '' - autoreconf -ivf configureFlagsArray+=( "--enable-i8" \ "--with-mpi" \ "--with-mpi3" \ From 4aa90ac08927dcb93f281235349555ac98dfcbda Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 28 Jan 2019 18:11:58 +0100 Subject: [PATCH 48/80] scalapack: add openmpi4 compatibility patch --- .../science/math/scalapack/default.nix | 3 + .../science/math/scalapack/openmpi4.patch | 143 ++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 pkgs/development/libraries/science/math/scalapack/openmpi4.patch diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3f37bf49de38..d897536f524b 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"; }; + # patch to rename outdated MPI functions + patches = [ ./openmpi4.patch ]; + nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran openblasCompat ]; diff --git a/pkgs/development/libraries/science/math/scalapack/openmpi4.patch b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch new file mode 100644 index 000000000000..5d0afb58c027 --- /dev/null +++ b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch @@ -0,0 +1,143 @@ +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; From 10e5cfd5fcb786227cbcbe4ba09c6d02cb463f1d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 29 Jan 2019 11:24:36 +0100 Subject: [PATCH 49/80] pythonPackages.mpi4py: add patch for openmpi-4.0.0 compatibility --- .../development/python-modules/mpi4py/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad4..74b061602c78 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,11 +13,18 @@ buildPythonPackage rec { inherit mpi; }; - patches = [ (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + patches = [ + (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; }) + (fetchpatch { + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; + }) + ]; postPatch = '' From dbf51353854ffa02a6972b2efc90dd91bea30646 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 6 Feb 2019 13:12:39 +0100 Subject: [PATCH 50/80] scalapack: update meta data * Set platform from linux -> x86_64-linux Scalapack does not seem to run properly on ARM (failing tests) * Add markuskowa as maintainer --- pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index d897536f524b..53f9af7a98ac 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/scalapack/; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ costrouc markuskowa ]; }; } From c6f039e59cda597af3165ebfdf3a9147c095c2a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 7 Feb 2019 13:34:06 +0100 Subject: [PATCH 51/80] openmpi: add patch for mpi tests on machines with less than 4 cores Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). This bug breaks the test from libs, such as scalapack, on machines with less than 4 cores. --- pkgs/development/libraries/openmpi/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index b3f170216064..cd60e0edca1c 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl, libevent, hwloc +{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +, rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -19,6 +19,14 @@ in stdenv.mkDerivation rec { sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; + patches = [ (fetchpatch { + # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). + # This bug breaks the test from libs, such as scalapack, + # on machines with less than 4 cores. + url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; + sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; + }) ]; + postPatch = '' patchShebangs ./ ''; From 99ca454f2366c1468a7d400cb1ccc5294fd19529 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 21 Feb 2019 14:04:05 +0100 Subject: [PATCH 52/80] hdf5: add openmpi-4 compatibility patches --- ...se-the-MPI-2-function-MPI_Type_get_e.patch | 58 +++++++++ .../hdf5/0001-Yanked-all-MPI-1-calls.patch | 115 ++++++++++++++++++ pkgs/tools/misc/hdf5/default.nix | 10 +- 3 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch create mode 100644 pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch diff --git a/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch new file mode 100644 index 000000000000..8b32ea4bab1c --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch @@ -0,0 +1,58 @@ +From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001 +From: Dana Robinson +Date: Mon, 26 Nov 2018 22:10:06 -0800 +Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten() + where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() + call by default, so this avoids needing a special OpenMPI build. + +--- + src/H5Smpio.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index 2bd275a729..e71e2cb858 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +- MPI_Type_extent (inner_type, &inner_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++} ++#else ++ MPI_Type_extent(inner_type, &inner_extent); ++#endif + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +- MPI_Type_extent (old_type, &old_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++} ++#else ++ MPI_Type_extent(old_type, &old_extent); ++#endif + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch new file mode 100644 index 000000000000..8dc831dbba12 --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch @@ -0,0 +1,115 @@ +From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001 +From: Dana Robinson +Date: Tue, 27 Nov 2018 10:31:54 -0800 +Subject: [PATCH] Yanked all MPI-1 calls + +--- + src/H5.c | 2 +- + src/H5Smpio.c | 24 ++++++++---------------- + testpar/t_cache.c | 20 ++++++++++---------- + 3 files changed, 19 insertions(+), 27 deletions(-) + +diff --git a/src/H5.c b/src/H5.c +index d1967e611b..bf4643ca59 100644 +--- a/src/H5.c ++++ b/src/H5.c +@@ -138,7 +138,7 @@ H5_init_library(void) + if (mpi_initialized && !mpi_finalized) { + int key_val; + +- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, ++ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index e71e2cb858..935d27972e 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); +-} +-#else +- MPI_Type_extent(inner_type, &inner_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++ } + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); +-} +-#else +- MPI_Type_extent(old_type, &old_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++ } + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +diff --git a/testpar/t_cache.c b/testpar/t_cache.c +index 5e15ec274c..ca5ded9ecf 100644 +--- a/testpar/t_cache.c ++++ b/testpar/t_cache.c +@@ -1217,15 +1217,15 @@ setup_derived_types(void) + struct mssg_t sample; /* used to compute displacements */ + + /* setup the displacements array */ +- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { ++ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { + + nerrors++; + success = FALSE; +@@ -1245,7 +1245,7 @@ setup_derived_types(void) + + if ( success ) { + +- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); ++ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); + + if ( result != MPI_SUCCESS ) { + +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3d50b068cc49..ae34cfd32358 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"; - }; + }; passthru = { mpiSupport = (mpi != null); @@ -45,7 +45,13 @@ stdenv.mkDerivation rec { ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] ++ optional enableShared "--enable-shared"; - patches = [./bin-mv.patch]; + patches = [ + ./bin-mv.patch + # upstream patches for openmpi-4 compatiblity + # To be removed with the upgrade to 1.10.5 + ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch + ./0001-Yanked-all-MPI-1-calls.patch + ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + From c36c048c0ea3dfa3a88f42ede4ce30b95c9dc2af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 21 Feb 2019 08:10:45 -0600 Subject: [PATCH 53/80] dockerTools: mark store-path-to-layer.sh as executable bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 introduced a treewide change to use ${stdenv.shell} where-ever possible. However, this broke a script used by dockerTools, store-path-to-layer.sh, as it did not preserve the +x mode bit. This meant the file got put into the store as mode 0444, resulting in a build-time error later on that looked like: xargs: /nix/store/jixivxhh3c8sncp9xlkc4ls3y5f2mmxh-store-path-to-layer.sh: Permission denied However, in a twist of fate, bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 not only introduced this regression but, in this particular instance, didn't even fix the original bug: the store-path-to-layer.sh script *still* uses /bin/sh as its shebang line, rather than an absolute path to stdenv. (Fixing this can be done in a separate commit.) Signed-off-by: Austin Seipp --- pkgs/build-support/docker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ef17a3f4e58a..4b20c5624607 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -283,6 +283,7 @@ rec { let storePathToLayer = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./store-path-to-layer.sh; }; in From dd269b462897883f4e09bb23f29969ef487f7e56 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Feb 2019 01:33:04 +0000 Subject: [PATCH 54/80] kmplot: init at 18.12.1 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kmplot.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/kmplot.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0c..b9b318e75c3e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix new file mode 100644 index 000000000000..c0c00f213400 --- /dev/null +++ b/pkgs/applications/kde/kmplot.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools +, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons +}: + +mkDerivation { + name = "kmplot"; + meta = { + license = with lib.licenses; [ gpl2Plus fdl12 ]; + maintainers = [ lib.maintainers.orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a0ba1c984ea..514bf8a170e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17853,7 +17853,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From d0d099266efa2b552ee3292c1d824f5878d48fa3 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Thu, 21 Feb 2019 19:21:08 +0200 Subject: [PATCH 55/80] postgresql: fix regression in NixOS after update to 11.2 (#56146) ryantm bot updates `psqlSchema` alongside with version: https://github.com/NixOS/nixpkgs/pull/50646, https://github.com/NixOS/nixpkgs/pull/55860 but `psqlSchema` is used to generate `stateDir`. It shouldn't be updated. Ideally it should be equal to postgresql major version for pg versions, but we already have deployments in /var/lib/postgresql/11.1. Strange why nobody complained when it was changed from 11.0 -> 11.1. I propose do correct naming for PG12+, but status quo for current versions. Fixes https://github.com/NixOS/nixpkgs/issues/56134 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b61382974b7a..44559885850f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -182,7 +182,7 @@ in self: { postgresql_10 = self.callPackage generic { version = "10.6"; - psqlSchema = "10.0"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; this = self.postgresql_10; inherit self; @@ -190,7 +190,7 @@ in self: { postgresql_11 = self.callPackage generic { version = "11.2"; - psqlSchema = "11.2"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6"; this = self.postgresql_11; inherit self; From ba42e056dc721fdb2f7d7b0f4edfd4eb6b705d37 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 21 Feb 2019 19:19:59 +0100 Subject: [PATCH 56/80] zim: 0.69 -> 0.69.1 --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a3e2bdd4d1e0..48027c194da6 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.69"; + version = "0.69.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1"; + sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; From 191eeb45d46786f723e0f9fac40db04104feaa63 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Feb 2019 11:50:48 -0800 Subject: [PATCH 57/80] bazel-watcher: 0.9.0 -> 0.9.1 (#56122) --- pkgs/development/tools/bazel-watcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 5bb1825d0350..c75a053acb27 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v"; + sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8"; + sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; }; buildAttrs = { From b72070959ae7bd0d33215f7e7a043d16ce874b62 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 21 Feb 2019 21:17:15 +0100 Subject: [PATCH 58/80] xcodeenv: do not rename bundleId to lowercase --- pkgs/development/mobile/xcodeenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b88f806d5866..720cf061f9a3 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ ${codeSignIdentity} provisioningProfiles - ${stdenv.lib.toLower bundleId} + ${bundleId} $PROVISIONING_PROFILE signingStyle From f3294b93ecb81549cad6def9c6828a2c6a716b3c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 21 Feb 2019 21:42:05 +0100 Subject: [PATCH 59/80] xcodeenv: fix generation of ad-hoc wireless installation page --- pkgs/development/mobile/xcodeenv/build-app.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 720cf061f9a3..05ddf5366c72 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -129,9 +129,9 @@ stdenv.mkDerivation ({ ${stdenv.lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations - appname="$(basename "$out/*.ipa" .ipa)" - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + appname="$(basename "$(echo $out/*.ipa)" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html + echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} ${stdenv.lib.optionalString generateXCArchive '' From e66b8d5fb1e37bcf61e1b7af2cafdb10b60e4b21 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 21 Feb 2019 22:10:14 +0100 Subject: [PATCH 60/80] signal-desktop: 1.21.2 -> 1.22.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 668f466cf976..51561fa2233b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.2"; + version = "1.22.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci"; + sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5"; }; phases = [ "unpackPhase" "installPhase" ]; From 98c6d9d799bbb295148f5c252b30881c408f0ea6 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Tue, 22 Jan 2019 23:00:35 +0100 Subject: [PATCH 61/80] ldc: 1.12.0 -> 1.14.0 --- pkgs/development/compilers/ldc/default.nix | 344 +++++++++------------ 1 file changed, 146 insertions(+), 198 deletions(-) diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 80ccb0dbbd30..a290d2b6cfe6 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.12.0" -, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm" +, version ? "1.14.0" +, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c" }: let @@ -18,208 +18,156 @@ let else ""; - ldcBuild = stdenv.mkDerivation rec { - name = "ldcBuild-${version}"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - postUnpack = '' - patchShebangs . - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r ldc-${version}-src/tests/dynamiccompile - - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d - rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d - - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile - - # Remove cppa test for now because it doesn't work. - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp - ''; - - datetimePath = if bootstrapVersion then - "phobos/std/datetime.d" - else - "phobos/std/datetime/timezone.d"; - - postPatch = '' - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so - - substituteInPlace tests/d2/dmd-testsuite/Makefile \ - --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - - buildInputs = [ curl tzdata ]; - - #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" - # Xcode 9.0.1 fixes that bug according to ldc release notes - #"-DRT_ARCHIVE_WITH_LDC=OFF" - #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/" - #"-DCMAKE_BUILD_TYPE=Release" - #"-DCMAKE_SKIP_RPATH=ON" - - #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc - # - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' - "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - doCheck = !bootstrapVersion; - - 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" - ''; - - 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 https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; - - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then - stdenv.mkDerivation rec { - name = "ldcUnittests-${version}"; - - enableParallelBuilding = ldcBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = ldcBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - src = ldcBuild.src; - - postUnpack = ldcBuild.postUnpack; - - postPatch = ldcBuild.postPatch; - - nativeBuildInputs = ldcBuild.nativeBuildInputs - - ++ [ - ldcBuild - ]; - - buildInputs = ldcBuild.buildInputs; - - preConfigure = '' - cmakeFlagsArray=( - ${ldcBuild.cmakeFlagsString} - "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" - ) - ''; - - postConfigure = ldcBuild.postConfigure; - - makeFlags = ldcBuild.makeFlags; - - buildCmd = if bootstrapVersion then - "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" - else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; - - testCmd = if bootstrapVersion then - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" - else - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; - - buildPhase = '' - ${buildCmd} - ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 - ${testCmd} - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; - in stdenv.mkDerivation rec { - inherit ldcUnittests; name = "ldc-${version}"; - phases = "installPhase"; - buildInputs = ldcBuild.buildInputs; - installPhase = '' - mkdir $out - cp -r --symbolic-link ${ldcBuild}/* $out/ + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile + + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile ''; - meta = ldcBuild.meta; + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + nativeBuildInputs = [ cmake makeWrapper llvm unzip ] + + ++ stdenv.lib.optional (!bootstrapVersion) [ + bootstrapLdc python lit + ] + + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ] + + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + + buildInputs = [ curl tzdata ]; + + cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" + "-DCMAKE_BUILD_TYPE=Release" + ''; + + preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlagsArray=( + ${cmakeFlagsString} + ) + ''; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = if stdenv.hostPlatform.isDarwin then '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + '' + else + ""; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = if stdenv.hostPlatform.isDarwin then + "|druntime-test-shared" + else + ""; + + doCheck = !bootstrapVersion; + + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + make -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" + 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 default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + 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 https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } From 14f653b47a0f204aaaaa4cc28ad66da9dfe961ae Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 21 Feb 2019 23:16:07 +0100 Subject: [PATCH 62/80] undefined-medium: init at 1.0 --- pkgs/data/fonts/undefined-medium/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/undefined-medium/default.nix diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix new file mode 100644 index 000000000000..e61e582d742a --- /dev/null +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip rec { + name = "undefined-medium-1.0"; + + url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw"; + + meta = with stdenv.lib; { + homepage = https://undefined-medium.com/; + description = "A pixel grid-based monospace typeface"; + longDescription = '' + undefined medium is a free and open-source pixel grid-based + monospace typeface suitable for programming, writing, and + whatever else you can think of … it’s pretty undefined. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 514bf8a170e6..1e833f3d4003 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15944,6 +15944,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; unifont = callPackage ../data/fonts/unifont { }; From 114575ef7162001d2db3f2d946cefcca54769b85 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 18:09:17 -0500 Subject: [PATCH 63/80] pantheon.elementary-screenshot-tool: 1.6.1 -> 1.6.2 --- .../pantheon/apps/elementary-screenshot-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 192b6ff358ff..f1c07b8d3f56 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 - version = "1.6.1"; + version = "1.6.2"; name = "elementary-${pname}-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g"; + sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; }; passthru = { From a1c295e971c8e417ae2db626c4ceffdfd3265dcd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 21 Feb 2019 18:09:35 -0500 Subject: [PATCH 64/80] pantheon.wingpanel-indicator-nightlight: 2.0.1 -> 2.0.2 --- .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 53754c31d874..08b0710977fa 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339"; + sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph"; }; passthru = { From add7b20858f98ce6417e3b3c5b22f81d7f4a9b5c Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Thu, 21 Feb 2019 22:54:45 -0500 Subject: [PATCH 65/80] gmsh: 4.1.3 -> 4.1.5 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 694c621db00b..76e5071908f1 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.3"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx"; + sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined From 64c958e9a4ca32ce6123b09d7e909d82c9115d37 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sat, 16 Feb 2019 18:56:46 +0100 Subject: [PATCH 66/80] dmd: 2.084.0 -> 2.084.1 --- pkgs/development/compilers/dmd/default.nix | 330 +++++++++------------ 1 file changed, 148 insertions(+), 182 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 3ab25c3a830b..6130608062d0 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,199 +1,165 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git , callPackage, targetPackages, ldc -, version ? "2.084.0" -, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf" -, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq" -, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53" +, version ? "2.084.1" +, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms" +, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb" +, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc" }: let - dmdBuild = stdenv.mkDerivation rec { - name = "dmdBuild-${version}"; - inherit version; - - enableParallelBuilding = true; - - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; - name = "phobos"; - }) - ]; - - sourceRoot = "."; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - ''; - - postPatch = '' - substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \ - --replace "2018" "__YEAR__" - - substituteInPlace dmd/test/runnable/test16096.sh \ - --replace "{EXT}" "{EXE}" - ''; - - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata ]; - - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then - "osx" - else - stdenv.hostPlatform.parsed.kernel.name; - top = "$(echo $NIX_BUILD_TOP)"; - pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} - cd ../phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - cd .. - ''; - - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - doCheck = true; - - checkPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release - cd .. - ''; - - dontStrip = true; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp ${pathToDmd} $out/bin - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --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 (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + dmdConfFile = writeTextFile { + name = "dmd.conf"; + text = (lib.generators.toINI {} { + "Environment" = { + DFLAGS = ''-I$@out@/include/d2 -L-L$@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + }; + }); }; - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - phobosUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "phobosUnittests-${version}"; - version = dmdBuild.version; - - enableParallelBuilding = dmdBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dmdBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - srcs = dmdBuild.srcs; - - sourceRoot = "."; - - nativeBuildInputs = dmdBuild.nativeBuildInputs; - buildInputs = dmdBuild.buildInputs; - - buildPhase = '' - cd phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; - in stdenv.mkDerivation rec { - inherit phobosUnittests; name = "dmd-${version}"; - phases = "installPhase"; - buildInputs = dmdBuild.buildInputs; + inherit version; + + enableParallelBuilding = true; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + patches = [ + (fetchpatch { + name = "fix-loader-import.patch"; + url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch"; + sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx"; + }) + ]; + + patchFlags = [ "--directory=dmd" "-p1" ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + ''; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" + else + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; + + doCheck = true; + + checkPhase = '' + cd dmd + # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846 + #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; + + dontStrip = true; installPhase = '' - mkdir $out - cp -r --symbolic-link ${dmdBuild}/* $out/ + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + + substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; - meta = dmdBuild.meta; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } From f8165d0d0190fd3bb6f7874582639c3f3a8421f2 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Feb 2019 10:48:00 +0100 Subject: [PATCH 67/80] dtools: 2.084.0 -> 2.084.1 --- pkgs/development/tools/dtools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index ccfcfaace014..593287dbf21a 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.084.0"; + version = "2.084.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"; + sha256 = "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"; name = "dmd"; }) (fetchFromGitHub { @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { postUnpack = '' mv dmd dtools cd dtools + + substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" "" ''; nativeBuildInputs = [ dmd ]; From 0e88d17fb1eca54ec7464a8194cd1314db3f7f7e Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Sun, 17 Feb 2019 10:48:59 +0100 Subject: [PATCH 68/80] dub: Disable network tests because they add impurities --- .../tools/build-managers/dub/default.nix | 145 +++++++----------- 1 file changed, 56 insertions(+), 89 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 18c6eff76e1f..024c57201e12 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,109 +1,76 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: -let +stdenv.mkDerivation rec { + name = "dub-${version}"; + version = "1.13.0"; - dubBuild = stdenv.mkDerivation rec { - name = "dubBuild-${version}"; - version = "1.13.0"; + enableParallelBuilding = true; - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; - }; - - postUnpack = '' - patchShebangs . - ''; - - # Can be removed with https://github.com/dlang/dub/pull/1368 - dubvar = "\\$DUB"; - postPatch = '' - substituteInPlace test/fetchzip.sh \ - --replace "dub remove" "\"${dubvar}\" remove" - ''; - - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; - - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; - - installPhase = '' - mkdir $out - mkdir $out/bin - cp bin/dub $out/bin - ''; - - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; }; - # Need to test in a fixed-output derivation, otherwise the - # network tests would fail if sandbox mode is enabled. - # Disable tests on Darwin for now because they don't work - # reliably there. - dubUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "dubUnittests-${version}"; - version = dubBuild.version; + postUnpack = '' + patchShebangs . + ''; - enableParallelBuilding = dubBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dubBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; + postPatch = '' + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" + ''; - src = dubBuild.src; - - postUnpack = dubBuild.postUnpack; - postPatch = dubBuild.postPatch; + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; - nativeBuildInputs = dubBuild.nativeBuildInputs; - buildInputs = dubBuild.buildInputs; + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; - buildPhase = '' - # Can't use dub from dubBuild directly because one unittest - # (issue895-local-configuration) needs to generate a config - # 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 - ''; + doCheck = true; - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; + checkPhase = '' + 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 -in + rm -rf test/issue502-root-import + rm test/issue990-download-optional-selected.sh + rm test/timeout.sh + rm test/issue674-concurrent-dub.sh + rm test/issue672-upgrade-optional.sh + rm test/issue1574-addcommand.sh + rm test/issue1524-maven-upgrade-dependency-tree.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1037-better-dependency-messages.sh + rm test/interactive-remove.sh + rm test/fetchzip.sh + rm test/feat663-search.sh + rm test/ddox.sh + rm test/0-init-multi.sh + rm test/0-init-multi-json.sh -stdenv.mkDerivation rec { - inherit dubUnittests; - name = "dub-${dubBuild.version}"; - phases = "installPhase"; - buildInputs = dubBuild.buildInputs; + ./test/run-unittest.sh + ''; installPhase = '' mkdir $out - cp -r --symbolic-link ${dubBuild}/* $out/ + mkdir $out/bin + cp bin/dub $out/bin ''; - meta = dubBuild.meta; + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } From 396965fa588c87f8a7a562da51346a70d19fcea6 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Thu, 21 Feb 2019 14:59:23 +0100 Subject: [PATCH 69/80] init automirror at v49 --- pkgs/tools/misc/automirror/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/automirror/default.nix diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix new file mode 100644 index 000000000000..3fd520513570 --- /dev/null +++ b/pkgs/tools/misc/automirror/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, git, ronn}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "automirror"; + version = "49"; + + src = fetchFromGitHub { + owner = "schlomo"; + repo = "automirror"; + rev = "v${version}"; + sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch"; + }; + + patchPhase = "sed -i s#/usr##g Makefile"; + + buildInputs = [ git ronn ]; + + installFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/schlomo/automirror; + description = "Automatic Display Mirror"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e833f3d4003..51479c38944a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -638,6 +638,8 @@ in autorevision = callPackage ../tools/misc/autorevision { }; + automirror = callPackage ../tools/misc/automirror { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; From c736f9693d49b44710d640630eb74c93dd64d30d Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Fri, 22 Feb 2019 04:32:24 +0000 Subject: [PATCH 70/80] Added maps to sc2-headless --- .../machine-learning/sc2-headless/default.nix | 5 +-- .../machine-learning/sc2-headless/maps.nix | 31 ++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index ced075ff432e..c0536b36cfe3 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ - "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ + cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \ + "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 228bafe3f7c5..c71099ad6a71 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,7 +1,7 @@ -{ fetchzip +{ fetchzip, unzip }: let - fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; }); in { minigames = fetchzip { @@ -17,32 +17,47 @@ in }; ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; - sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd"; stripRoot = false; }; ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; - sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5"; stripRoot = false; }; ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; - sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld"; stripRoot = false; }; ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; - sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp"; stripRoot = false; }; ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; - sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq"; stripRoot = false; }; ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; - sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv"; + stripRoot = false; + }; + ladder2018season3 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip"; + sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp"; + stripRoot = false; + }; + ladder2018season4 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip"; + sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s"; + stripRoot = false; + }; + ladder2019season1 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip"; + sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9"; stripRoot = false; }; } From a86ffa4988bcf8228a500f9e4493849ae90de521 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 20 Feb 2019 14:58:28 +0000 Subject: [PATCH 71/80] haskell-modules/generic-builder.nix: add haddockFlags option --- pkgs/development/haskell-modules/generic-builder.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724ff5d6220..e8195668c41c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -19,6 +19,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , buildFlags ? [] +, haddockFlags ? [] , description ? "" , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false @@ -372,7 +373,8 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} + ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ + ${stdenv.lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; From 4f208c5818d21ddaf9765f5570962a25845cfbb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2019 02:31:00 +0100 Subject: [PATCH 72/80] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.1-6-gd2bed2e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f59e85c25b8e9f07459338884e25d16752839b54. --- .../haskell-modules/hackage-packages.nix | 234 ++++++++++++++---- 1 file changed, 189 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3113d433bac4..189c65d58389 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -28729,8 +28729,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric"; - version = "1.1.1"; - sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h"; + version = "1.2.0"; + sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf"; libraryHaskellDepends = [ base containers generic-lens lens mtl resourcet stm text transformers @@ -29818,7 +29818,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asif_4_0_0" = callPackage + "asif_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -29828,8 +29828,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "4.0.0"; - sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6"; + version = "4.0.1"; + sha256 = "172vqpdv9jjqj8vzq2v2pfvkmjpkhlpl03mafqk5cvdj72a7vy3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60432,8 +60432,8 @@ self: { }: mkDerivation { pname = "datadog-tracing"; - version = "1.0.1"; - sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq"; + version = "1.1.0"; + sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61738,10 +61738,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "decimal-literals"; - version = "0.1.0.0"; - sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7"; - revision = "3"; - editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb"; + version = "0.1.0.1"; + sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -84030,6 +84028,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_7_0_1" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.7.0.1"; + sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -97487,26 +97498,28 @@ self: { "halive" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear - , mtl, process, random, sdl2, signal, stm, text, time, transformers + , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec + , lens, linear, mtl, pretty-show, process, random, sdl2, signal + , stm, text, time, transformers }: mkDerivation { pname = "halive"; - version = "0.1.3"; - sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378"; + version = "0.1.6"; + sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath foreign-store fsnotify ghc - ghc-boot ghc-paths mtl process signal stm time transformers + ghc-boot ghc-paths mtl process signal stm text time transformers ]; executableHaskellDepends = [ base directory filepath fsnotify ghc ghc-paths process stm transformers ]; testHaskellDepends = [ - base bytestring containers filepath foreign-store gl linear mtl - random sdl2 stm text time + base bytestring containers directory filepath foreign-store ghc + ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text + time ]; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; @@ -102619,8 +102632,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.10.1"; - sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2"; + version = "0.11.0"; + sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118413,8 +118426,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.31"; - sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; + version = "1.0.33"; + sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types mtl network network-uri @@ -133832,6 +133845,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-puppet_1_4_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filecache, filepath, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.4.3"; + sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory filecache filepath + formatting hashable hruby hslogger http-api-data http-client lens + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers Glob hslogger + http-client lens mtl optparse-applicative regex-pcre-builtin + strict-base-types text transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils scientific strict-base-types temporary text transformers + unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -137352,6 +137409,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "line-bot-sdk" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json + , http-client, http-client-tls, http-types, scientific, servant + , servant-client, servant-client-core, servant-server + , string-conversions, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "line-bot-sdk"; + version = "0.1.0.0"; + sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 errors + http-client http-client-tls http-types scientific servant + servant-client servant-client-core servant-server + string-conversions text time transformers wai wai-extra + ]; + executableHaskellDepends = [ + base servant servant-client servant-server time transformers wai + wai-extra warp + ]; + testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ]; + description = "Haskell SDK for LINE Messaging API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -166728,15 +166814,16 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.3.4.0"; - sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a"; + version = "0.3.4.1"; + sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable semigroups text unordered-containers vector ]; + libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck - semigroups text unordered-containers vector + base bytestring containers hspec QuickCheck semigroups text + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; @@ -174243,6 +174330,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius-test_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.1.0.0"; + sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text @@ -174338,6 +174443,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proxied_0_3_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "proxied"; + version = "0.3.1"; + sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; + libraryHaskellDepends = [ base ]; + description = "Make functions consume Proxy instead of undefined"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proxy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -178682,7 +178799,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_6_2_2" = callPackage + "rattletrap_6_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -178690,8 +178807,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.2"; - sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p"; + version = "6.2.3"; + sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195484,8 +195601,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.0"; - sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll"; + version = "0.1.0.1"; + sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -214479,6 +214596,8 @@ self: { pname = "these-skinny"; version = "0.7.4"; sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr"; + revision = "1"; + editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c"; libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; license = stdenv.lib.licenses.bsd3; @@ -224697,8 +224816,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.52.1"; - sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq"; + version = "0.9.52.2"; + sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225269,6 +225388,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_9_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.9.0.1"; + sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -226901,6 +227033,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-named-sugar" = callPackage + ({ mkDerivation, base, vinyl }: + mkDerivation { + pname = "vinyl-named-sugar"; + version = "0.1.0.0"; + sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h"; + libraryHaskellDepends = [ base vinyl ]; + description = "Syntax sugar for vinyl records using overloaded labels"; + license = stdenv.lib.licenses.mit; + }) {}; + "vinyl-operational" = callPackage ({ mkDerivation, base, operational, operational-extra, vinyl-plus }: @@ -227489,28 +227632,29 @@ self: { , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers , scientific, semigroupoids, semigroups, tagged, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, text, transformers, vector, witherable - , wl-pprint-annotated, zippers + , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector, witherable, wl-pprint-annotated, zippers }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.2"; - sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; + version = "0.6.0.0"; + sha256 = "1nbykbgx9qzwzcilg2kmrr51fggczynn6kv7a60vsxxckkqlgy8j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant digit - distributive errors generics-sop hoist-error hw-balancedparens - hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural - parsers scientific semigroupoids semigroups tagged text - transformers vector witherable wl-pprint-annotated zippers + attoparsec base bifunctors bytestring containers contravariant + digit distributive errors generics-sop hoist-error + hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph + mtl nats natural parsers scientific semigroupoids semigroups tagged + text transformers unordered-containers vector witherable + wl-pprint-annotated zippers ]; testHaskellDepends = [ attoparsec base bytestring containers contravariant digit directory distributive doctest filepath generics-sop hedgehog hedgehog-fn lens mtl natural scientific semigroupoids semigroups tagged tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - text vector zippers + tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit + template-haskell text unordered-containers vector zippers ]; description = "JSON wrangling"; license = stdenv.lib.licenses.bsd3; From 6f5d2f461106dc885691e4c69970fe0650626cc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2019 10:30:28 +0100 Subject: [PATCH 73/80] ghcjs: mark build as broken Build errors are at: - https://hydra.nixos.org/build/89288500 - https://hydra.nixos.org/build/89286604 --- pkgs/development/compilers/ghcjs-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 14a210783896..7e8c3c7dcf05 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,4 +105,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.broken = true; } From 37676c64d36ec0eb0a3ae664558c1a3e91964bbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Feb 2019 10:33:12 +0100 Subject: [PATCH 74/80] all-cabal-hashes: update to Hackage at 2019-02-22T00:20:34Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c50c511e7363..b167069cd893 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; - sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f59e85c25b8e9f07459338884e25d16752839b54.tar.gz"; + sha256 = "0yapmana2kzsixmgghj76w3s546d258rbzw7qmfqhi6bxyhc6a86"; } From 673f50f4d95acac75d004e2befccd812b0bd611c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 22 Feb 2019 17:03:29 +0700 Subject: [PATCH 75/80] haskellPackages.servant-client-core: patch out runtime error --- .../haskell-modules/configuration-nix.nix | 3 + .../servant-client-core-streamBody.patch | 82 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0502e7003133..5a562f78af0c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; + # https://github.com/haskell-servant/servant/pull/1128 + servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch; + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch new file mode 100644 index 000000000000..ebadd215cb76 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch @@ -0,0 +1,82 @@ +diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs +index 712007006..6be92ec6d 100644 +--- a/src/Servant/Client/Core/Internal/HasClient.hs ++++ b/src/Servant/Client/Core/Internal/HasClient.hs +@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where + import Prelude () + import Prelude.Compat + ++import Control.Concurrent.MVar ++ (modifyMVar, newMVar) + import qualified Data.ByteString as BS + import qualified Data.ByteString.Lazy as BL + import Data.Foldable +@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H + import Servant.API + ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData, + BuildHeadersTo (..), Capture', CaptureAll, Description, +- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header', +- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender), ++ EmptyAPI, FramingRender (..), FramingUnrender (..), ++ FromSourceIO (..), Header', Headers (..), HttpVersion, ++ IsSecure, MimeRender (mimeRender), + MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag, + QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost, + ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData, +- Vault, Verb, WithNamedContext, contentType, getHeadersHList, +- getResponse, toQueryParam, toUrlPiece) ++ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType, ++ getHeadersHList, getResponse, toQueryParam, toUrlPiece) + import Servant.API.ContentTypes + (contentTypes) + import Servant.API.Modifiers +@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api) + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + + instance +- ( HasClient m api ++ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a + ) => HasClient m (StreamBody' mods framing ctype a :> api) + where + +@@ -547,7 +550,39 @@ instance + hoistClientMonad pm _ f cl = \a -> + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + +- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody" ++ clientWithRoute pm Proxy req body ++ = clientWithRoute pm (Proxy :: Proxy api) ++ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req ++ where ++ ctypeP = Proxy :: Proxy ctype ++ framingP = Proxy :: Proxy framing ++ ++ sourceIO = framingRender ++ framingP ++ (mimeRender ctypeP :: chunk -> BL.ByteString) ++ (toSourceIO body) ++ ++ -- not pretty. ++ givesPopper :: (IO BS.ByteString -> IO ()) -> IO () ++ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do ++ ref <- newMVar step0 ++ ++ -- Note sure we need locking, but it's feels safer. ++ let popper :: IO BS.ByteString ++ popper = modifyMVar ref nextBs ++ ++ needsPopper popper ++ ++ nextBs S.Stop = return (S.Stop, BS.empty) ++ nextBs (S.Error err) = fail err ++ nextBs (S.Skip s) = nextBs s ++ nextBs (S.Effect ms) = ms >>= nextBs ++ nextBs (S.Yield lbs s) = case BL.toChunks lbs of ++ [] -> nextBs s ++ (x:xs) | BS.null x -> nextBs step' ++ | otherwise -> return (step', x) ++ where ++ step' = S.Yield (BL.fromChunks xs) s + + + From 47519a1e4ef4f7d6c4237a617388d6d4919807f4 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Thu, 21 Feb 2019 09:40:41 +0100 Subject: [PATCH 76/80] python3Packages.imageio: 2.4.1 -> 2.5.0 --- .../python-modules/imageio-ffmpeg/default.nix | 6 ++++-- .../python-modules/imageio/default.nix | 18 ++++++++++++++---- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 8977a7868542..f72698fd0d13 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , isPy3k @@ -13,10 +13,12 @@ buildPythonPackage rec { inherit pname version; }; + disabled = !isPy3k; + # No test infrastructure in repository. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "FFMPEG wrapper for Python"; homepage = https://github.com/imageio/imageio-ffmpeg; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index de8380280670..f7b3ff63c53c 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,28 +1,34 @@ { stdenv , buildPythonPackage +, pathlib , fetchPypi , pillow , psutil +, imageio-ffmpeg , pytest , numpy , isPy3k +, ffmpeg , futures , enum34 }: buildPythonPackage rec { pname = "imageio"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { - sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2"; inherit pname version; }; - checkInputs = [ pytest psutil ]; + checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ + imageio-ffmpeg ffmpeg + ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures enum34 + pathlib ]; checkPhase = '' @@ -34,8 +40,12 @@ buildPythonPackage rec { # For some reason, importing imageio also imports xml on Nix, see # https://github.com/imageio/imageio/issues/395 + + # Also, there are tests that test the downloading of ffmpeg if it's not installed. + # "Uncomment" those by renaming. postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" + substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," + substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76bac51ec19f..c31f10167f05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2794,7 +2794,7 @@ in { imageio = callPackage ../development/python-modules/imageio { }; - imageio-ffmpeg = disabledIf isPy27 (callPackage ../development/python-modules/imageio-ffmpeg { }); + imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; imgaug = callPackage ../development/python-modules/imgaug { }; From b275d092249b6e2899d4bf93a87d69a41b965aae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 13 Feb 2019 21:26:50 +0000 Subject: [PATCH 77/80] ocamlPackages.lablgtk3: 3.0.beta3 -> 3.0.beta4 --- .../ocaml-modules/lablgtk3/default.nix | 33 ++++++++++++------- .../ocaml-modules/lablgtk3/gtkspell3.nix | 8 +++++ .../ocaml-modules/lablgtk3/sourceview3.nix | 9 +++++ pkgs/top-level/ocaml-packages.nix | 8 ++++- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix create mode 100644 pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 9f2227327e49..8da00b76393a 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,27 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }: +{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "lablgtk3 is not available for OCaml ${ocaml.version}" else +# This package uses the dune.configurator library +# It thus needs said library to be compiled with this OCaml compiler +let __dune = dune; in +let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in + stdenv.mkDerivation rec { - version = "3.0.beta3"; - name = "ocaml${ocaml.version}-lablgtk3-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1775/lablgtk-3.0.beta3.tar.gz; - sha256 = "174mwwdz1s91a6ycbas7nc0g87c2l6zqv68zi5ab33yb76l46a6w"; + version = "3.0.beta4"; + pname = "lablgtk3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ]; + buildInputs = [ ocaml findlib dune gtk3 ]; + propagatedBuildInputs = [ cairo2 ]; - buildFlags = "world"; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix new file mode 100644 index 000000000000..7e898be74901 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -0,0 +1,8 @@ +{ buildDunePackage, gtkspell3, lablgtk3 }: + +buildDunePackage rec { + pname = "lablgtk3-gtkspell3"; + buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs; +} diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix new file mode 100644 index 000000000000..7e8807576eeb --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -0,0 +1,9 @@ +{ stdenv, ocaml, gtksourceview, lablgtk3 }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; + buildPhase = "dune build -p lablgtk3-sourceview3"; + buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs installPhase; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 510fd62f2405..1541bb12ee1b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -355,7 +355,13 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { + cairo2 = cairo2.override { enableGtkSupport = false; }; + }; + + lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; + + lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; From b6c82183be6c1118fd52220887722601ed86bd76 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 22 Feb 2019 13:33:26 +0100 Subject: [PATCH 78/80] shab: init at 1.0.0 (#56164) --- pkgs/tools/text/shab/default.nix | 74 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/tools/text/shab/default.nix diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix new file mode 100644 index 000000000000..73323c784fd7 --- /dev/null +++ b/pkgs/tools/text/shab/default.nix @@ -0,0 +1,74 @@ +{ bash, stdenv, lib, runCommand, writeText, fetchFromGitHub }: +let + version = "1.0.0"; + + shab = stdenv.mkDerivation { + pname = "shab"; + inherit version; + + src = fetchFromGitHub { + owner = "zimbatm"; + repo = "shab"; + rev = "v${version}"; + sha256 = "02lf1s6plhhcfyj9xha44wij9jbphb1x5q55xj3b5bx2ji2jsvji"; + }; + + postPatch = '' + for f in test.sh test/*.sh; do + patchShebangs "$f" + done + ''; + + doBuild = false; + doCheck = true; + doInstallCheck = true; + + checkPhase = '' + ./test.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./shab $out/bin/shab + ''; + + installCheckPhase = '' + [[ "$(echo 'Hello $entity' | entity=world $out/bin/shab)" == 'Hello world' ]] + ''; + + passthru = { + inherit render renderText; + }; + + meta = with lib; { + description = "The bash templating language"; + homepage = https://github.com/zimbatm/shab; + license = licenses.unlicense; + maintainers = with maintainers; [ zimbatm ]; + platforms = bash.meta.platforms; + }; + }; + + /* + shabScript: a path or filename to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + render = shabScript: parameters: + let extraParams = { + inherit shabScript; + }; + in runCommand "out" (parameters // extraParams) '' + ${shab}/bin/shab "$shabScript" >$out + ''; + + /* + shabScriptText: a string to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + renderText = shabScriptText: parameters: + render (writeText "template" shabScriptText) parameters; + +in + shab diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51479c38944a..6112ff44e6ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1615,6 +1615,8 @@ in s2png = callPackage ../tools/graphics/s2png { }; + shab = callPackage ../tools/text/shab { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; snipes = callPackage ../games/snipes { }; From e5405f9ae8b87c202a22438dd162defda1996a97 Mon Sep 17 00:00:00 2001 From: aanderse Date: Fri, 22 Feb 2019 08:10:02 -0500 Subject: [PATCH 79/80] nixos/beanstalkd: new service for existing package (#55953) --- nixos/doc/manual/release-notes/rl-1903.xml | 5 +++ nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/beanstalkd.nix | 52 ++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/beanstalkd.nix | 43 ++++++++++++++++++ 5 files changed, 102 insertions(+) create mode 100644 nixos/modules/services/misc/beanstalkd.nix create mode 100644 nixos/tests/beanstalkd.nix diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index c32c0fc14cb8..1b99724c6bc7 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -91,6 +91,11 @@ in nixos/modules/virtualisation/google-compute-config.nix. + + + ./services/misc/beanstalkd.nix + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7af6e117c517..75217581a944 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -361,6 +361,7 @@ ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix ./services/misc/canto-daemon.nix diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix new file mode 100644 index 000000000000..8a3e0ab1949a --- /dev/null +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.beanstalkd; + pkg = pkgs.beanstalkd; +in + +{ + # interface + + options = { + services.beanstalkd = { + enable = mkEnableOption "Enable the Beanstalk work queue."; + + listen = { + port = mkOption { + type = types.int; + description = "TCP port that will be used to accept client connections."; + default = 11300; + }; + + address = mkOption { + type = types.str; + description = "IP address to listen on."; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + }; + }; + }; + + # implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkg ]; + + systemd.services.beanstalkd = { + description = "Beanstalk Work Queue"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port}"; + }; + }; + + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3d8fea95a501..65227857a38e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -25,6 +25,7 @@ in atd = handleTest ./atd.nix {}; avahi = handleTest ./avahi.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 + beanstalkd = handleTest ./beanstalkd.nix {}; beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64 bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix new file mode 100644 index 000000000000..9b7ac111a57b --- /dev/null +++ b/nixos/tests/beanstalkd.nix @@ -0,0 +1,43 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +let + produce = pkgs.writeScript "produce.py" '' + #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + queue.put('this is a job') + queue.put('this is another job') + ''; + + consume = pkgs.writeScript "consume.py" '' + #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + + job = queue.reserve(timeout=0) + print job.body + job.delete() + ''; + +in +{ + name = "beanstalkd"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { ... }: + { services.beanstalkd.enable = true; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('beanstalkd.service'); + + $machine->succeed("${produce}"); + $machine->succeed("${consume}") eq "this is a job\n" or die; + $machine->succeed("${consume}") eq "this is another job\n" or die; + ''; +}) From 28a8b9956f64c6f421854697fef1df89f97eed36 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Feb 2019 09:39:29 -0500 Subject: [PATCH 80/80] xapian: fix darwin build --- pkgs/development/libraries/xapian/default.nix | 2 ++ .../xapian/skip-flaky-darwin-test.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index cf331f014567..35e3cc78b537 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,8 @@ let doCheck = true; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch new file mode 100644 index 000000000000..72a7c3e721f4 --- /dev/null +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -0,0 +1,33 @@ +diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc +--- xapian-core.old/tests/api_db.cc ++++ xapian-core.new/tests/api_db.cc +@@ -998,6 +998,7 @@ + + // test for keepalives + DEFINE_TESTCASE(keepalive1, remote) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + + /* Test that keep-alives work */ +diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc +--- xapian-core.old/tests/api_scalability.cc ++++ xapian-core.new/tests/api_scalability.cc +@@ -53,6 +53,7 @@ + } + + DEFINE_TESTCASE(bigoaddvalue1, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + // O(n*n) is bad, but O(n*log(n)) is acceptable. + test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); + return true; +diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc +--- xapian-core.old/tests/api_serialise.cc ++++ xapian-core.new/tests/api_serialise.cc +@@ -110,6 +110,7 @@ + + // Test for serialising a document obtained from a database. + DEFINE_TESTCASE(serialise_document2, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Document origdoc; + origdoc.add_term("foo", 2); + origdoc.add_posting("foo", 10);