From dc53518dc3efb0a7152e101a75b8c3a16d44feb0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 14 Feb 2018 17:22:11 +0100 Subject: [PATCH 001/369] buildRustPackage: Restrict `find` to files `find -executable` finds everything with the executable bit set, including directories. Thats not harmful in this scenario as `cp` won't copy those directories, but it does result in a few warning messages. --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 63d08e1d0311..d5c8cc1ec8de 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall mkdir -p $out/bin - find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \; + find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \; runHook postInstall ''; From 78e23d13cd7c399147b6f04a8b3f868c7231ce20 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 7 Mar 2018 19:50:33 -0800 Subject: [PATCH 002/369] c-ares: 1.13.0 -> 1.14.0 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.14.0 with grep in /nix/store/0azgccv236s0l92yfyxx7rbh8nci8g2z-c-ares-1.14.0 - found 1.14.0 in filename of file in /nix/store/0azgccv236s0l92yfyxx7rbh8nci8g2z-c-ares-1.14.0 --- pkgs/development/libraries/c-ares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 6b3b69f99971..a384a7707832 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -2,11 +2,11 @@ let self = stdenv.mkDerivation rec { - name = "c-ares-1.13.0"; + name = "c-ares-1.14.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3"; + sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; meta = with stdenv.lib; { From 06a239e3a0729f584574f64b8da554e70404989b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 13:18:09 -0800 Subject: [PATCH 003/369] soxr: 0.1.2 -> 0.1.3 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.1.3 with grep in /nix/store/n6as7dvjq9vlsri84smc05yjmdvwmxww-soxr-0.1.3 - found 0.1.3 in filename of file in /nix/store/n6as7dvjq9vlsri84smc05yjmdvwmxww-soxr-0.1.3 --- pkgs/applications/misc/audio/soxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 12da125bb3e2..7c4e6ff8c3d7 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.2"; + name = "soxr-0.1.3"; src = fetchurl { url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; - sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; + sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; }; outputs = [ "out" "doc" ]; # headers are just two and very small From 70840050b357a4b9b6913b135c316f1cd0310889 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 18:17:47 -0800 Subject: [PATCH 004/369] x265: 2.6 -> 2.7 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7/bin/x265 -V` and found version 2.7 - ran `/nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7/bin/x265 --version` and found version 2.7 - found 2.7 with grep in /nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7 - found 2.7 in filename of file in /nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7 --- pkgs/development/libraries/x265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 418829e7af8a..d11a93254bfb 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"; + sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym"; }; enableParallelBuilding = true; From 2b8ce2a8106457da1107c84a0d52942597d48413 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 13 Mar 2018 23:51:11 -0700 Subject: [PATCH 005/369] audit: 2.8.2 -> 2.8.3 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.8.3 in filename of file in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1 --- pkgs/os-specific/linux/audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 390bab849c28..7e14983a6d2b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.2"; + name = "audit-2.8.3"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7"; + sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; }; outputs = [ "bin" "dev" "out" "man" ]; From 48698a0668552a477f4454909ca4455fef0a6d19 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 14 Mar 2018 14:10:00 -0700 Subject: [PATCH 006/369] itstool: 2.0.2 -> 2.0.4 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool -h` got 0 exit code - ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool --help` got 0 exit code - ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool -v` and found version 2.0.4 - ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool --version` and found version 2.0.4 - found 2.0.4 with grep in /nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4 - found 2.0.4 in filename of file in /nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4 --- pkgs/development/tools/misc/itstool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 70ed9cd0570e..129c1c6b3a93 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -2,11 +2,11 @@ # We need the same Python as is used to build libxml2Python stdenv.mkDerivation rec { - name = "itstool-2.0.2"; + name = "itstool-2.0.4"; src = fetchurl { url = "http://files.itstool.org/itstool/${name}.tar.bz2"; - sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"; + sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp"; }; buildInputs = [ python2 libxml2Python ]; From 3157bd3dc91a6c87dd26ea24effc96296f2d4bc2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 14 Mar 2018 19:51:48 -0700 Subject: [PATCH 007/369] libxml2: 2.9.7 -> 2.9.8 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.9.8 in filename of file in /nix/store/cjycf1wx5a5l22a9kwhpnnh2h9i7pahk-libxc-4.0.4 --- pkgs/development/libraries/libxml2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c4f3ff1efdd5..be2f83cb498e 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "034hylzspvkm0p4bczqbf8q05a7r2disr8dz725x4bin61ymwg7n"; + sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; }; outputs = [ "bin" "dev" "out" "man" "doc" ] From 38acfcad477d892a87d0dc324396f94fcee3d0a5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 12:58:07 -0700 Subject: [PATCH 008/369] libv4l: 1.12.3 -> 1.14.2 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.14.2 with grep in /nix/store/rbajjyaiyj3q7lxnxs1j3sn1j5x5qgpp-v4l-utils-1.14.2 - directory tree listing: https://gist.github.com/2bfaf54c93c6f29802c6049289a7bf94 --- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 84b31d4d516b..9bdb16cd1f16 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "v4l-utils-${version}"; - version = "1.12.3"; + version = "1.14.2"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss"; + sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6"; }; outputs = [ "out" "dev" ]; From 7b2eab31d548a72a6fbc35c823cbecf0d25cd86e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 10:07:57 -0700 Subject: [PATCH 009/369] libcap_ng: 0.7.8 -> 0.7.9 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest -h` got 0 exit code - ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest --help` got 0 exit code - ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest help` got 0 exit code - found 0.7.9 with grep in /nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9 - directory tree listing: https://gist.github.com/eec1818588ca8e5fe720bfe3febec73b --- pkgs/os-specific/linux/libcap-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index d4625687c472..845e4e704eba 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "libcap-ng-${version}"; # When updating make sure to test that the version with # all of the python bindings still works - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2"; + sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa"; }; nativeBuildInputs = [ swig ]; From dc3055487472bf3296bea58ec1eb49d32989cca0 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 11:09:31 -0700 Subject: [PATCH 010/369] libjpeg_original: 8d -> 9c Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 9c with grep in /nix/store/m070zrgfdkwdqz5p3klbw9r27iz38mjh-libjpeg-9c-bin - directory tree listing: https://gist.github.com/94ec29f471c8e23b5f10a875c612fd29 --- pkgs/development/libraries/libjpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 8b0a4ec98eda..636699609f1c 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation { - name = "libjpeg-8d"; + name = "libjpeg-9c"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; - sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; + url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz; + sha256 = "1m3a137r7m14wd92a03qdvp4jfazc0657nzry7rqzs2p1xhkyfhz"; }; configureFlags = optional static "--enable-static --disable-shared"; From 1a6439fea2e18d9bc93b34f216f78fe66f7a5b35 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 21 Mar 2018 08:39:58 -0700 Subject: [PATCH 011/369] xkeyboard_config: 2.22 -> 2.23.1 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.23.1 with grep in /nix/store/rzna96awj2li59rvgpk0ib40bj0jx8xx-xkeyboard-config-2.23.1 - directory tree listing: https://gist.github.com/6c094cb77d9d6e1110bc5d44144a55ba --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d22565ae8db9..6551c89726bd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2468,11 +2468,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.22"; + name = "xkeyboard-config-2.23.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2; - sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2; + sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; From c1127b95ceeaf07ca9c345b687b1b4ecddbc0572 Mon Sep 17 00:00:00 2001 From: tkatchev Date: Thu, 22 Mar 2018 15:45:39 +0300 Subject: [PATCH 012/369] boost: Fix static library builds. (link=static and runtime-link=static together breaks Boost's build scripts.) --- pkgs/development/libraries/boost/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 14ea512afbd2..efe1151359d7 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -55,11 +55,11 @@ let "--layout=${layout}" "variant=${variant}" "threading=${threading}" - "runtime-link=${runtime-link}" "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" - ] ++ optional (variant == "release") "debug-symbols=off" + ] ++ optional (link != "static") "runtime-link=${runtime-link}" + ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optionals (hostPlatform.libc == "msvcrt") [ From 81d60d59240e6457f5e2f51e59801261e758fb70 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 22 Mar 2018 15:42:19 -0700 Subject: [PATCH 013/369] libvpx: 1.6.1 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS /tmp/tmp.Z8QazLD8jI /home/ryantm/.cache/nixpkgs /home/ryantm/.cache/nixpkgs - ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxdec --help` got 0 exit code - ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxdec --help` and found version 1.7.0 - ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxenc --help` got 0 exit code - ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxenc --help` and found version 1.7.0 - found 1.7.0 with grep in /nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin - directory tree listing: https://gist.github.com/feae181f96e3cbf1235f1f3b9503500c --- pkgs/development/libraries/libvpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1ad..f8894de3c752 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -58,13 +58,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0"; + sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"; }; patchPhase = ''patchShebangs .''; From 0a74845ce367bbc57751ae526c8ca7756a27a300 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 25 Mar 2018 16:14:48 -0500 Subject: [PATCH 014/369] util-linux: 2.31.1 -> 2.32 --- pkgs/os-specific/linux/util-linux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 618ba42e7416..9ec6c22d32a5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,15 +4,15 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.31"; - patchVersion = "1"; + majorVersion = "2.32"; + patchVersion = ""; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"; + sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc"; }; patches = [ From 991fd430f3b97353a6934db3926af6ba6ad33b45 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 28 Mar 2018 11:14:22 +0300 Subject: [PATCH 015/369] mariadb.connector-c: 2.3.4 -> 2.3.5 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5d..b67cc3bbe89d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -167,11 +167,11 @@ everything = stdenv.mkDerivation (common // { connector-c = stdenv.mkDerivation rec { name = "mariadb-connector-c-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb"; + sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; From ea968066ef63fb127d85721525beceefbf483260 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 02:42:32 -0700 Subject: [PATCH 016/369] nspr: 4.18 -> 4.19 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nspr/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 4.19 with grep in /nix/store/0gx5qa3iipnwiyaixnqgd4lljy70gqx8-nspr-4.19 - directory tree listing: https://gist.github.com/9813e84e7c71d6493cbe5b433f8f7f25 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 17805f32afb1..ce18498ee858 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.18"; in +let version = "4.19"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq"; + sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f"; }; outputs = [ "out" "dev" ]; From 0e48f5ffb3f35707b6dc1001da5ed31c05af1ee9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 03:25:35 -0700 Subject: [PATCH 017/369] libinput: 1.10.0 -> 1.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libinput/versions. These checks were done: - built on NixOS - ran `/nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3/bin/libinput -h` got 0 exit code - ran `/nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3/bin/libinput --help` got 0 exit code - found 1.10.3 with grep in /nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3 - directory tree listing: https://gist.github.com/27c5534de9dd9c8e7237f21c2dc8e824 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0e2458a38959..6773b7c1b1f1 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.10.0"; + version = "1.10.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2"; + sha256 = "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd"; }; outputs = [ "out" "dev" ]; From 46a99d140927686fe5c04e1dd96a6cc5d907c4d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 03:59:09 -0700 Subject: [PATCH 018/369] libdvdcss: 1.4.1 -> 1.4.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdvdcss/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.4.2 with grep in /nix/store/4fb959a9v1a5nv65smypcp3vxk3j1jhl-libdvdcss-1.4.2 - directory tree listing: https://gist.github.com/8d034c11cb818a43ba4b289989a957a3 --- pkgs/development/libraries/libdvdcss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 66cb5215a8a9..f18e0622d0cc 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdvdcss-${version}"; - version = "1.4.1"; + version = "1.4.2"; buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; - sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb"; + sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq"; }; meta = with stdenv.lib; { From 2f9c38c05669bb8768a7876b9ced7794ce6d31d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 04:47:05 -0700 Subject: [PATCH 019/369] libevdev: 1.5.8 -> 1.5.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libevdev/versions. These checks were done: - built on NixOS - ran `/nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9/bin/libevdev-tweak-device -h` got 0 exit code - ran `/nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9/bin/libevdev-tweak-device --help` got 0 exit code - found 1.5.9 with grep in /nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9 - directory tree listing: https://gist.github.com/060e1adaed5f9993a82d48c08503be7c --- pkgs/development/libraries/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 5bcb9a1ede22..2ef1d3965ce9 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.5.8"; + name = "libevdev-1.5.9"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0"; + sha256 = "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1"; }; buildInputs = [ python ]; From 2d57df881fc15d3e4806490af0cce1760d964c5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 05:02:08 -0700 Subject: [PATCH 020/369] libwacom: 0.28 -> 0.29 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwacom/versions. These checks were done: - built on NixOS - ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices -h` got 0 exit code - ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices --help` got 0 exit code - ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices help` got 0 exit code - found 0.29 with grep in /nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29 - directory tree listing: https://gist.github.com/cc947710a926712edfc2c49d7f55510b --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 8e36edff7edd..cc3f19ab7d31 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.28"; + version = "0.29"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7"; + sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw"; }; nativeBuildInputs = [ pkgconfig ]; From 16affca0be6f32ea5b38e1c8ef2658dce9fa27de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 06:51:21 -0700 Subject: [PATCH 021/369] harfbuzz-icu: 1.7.5 -> 1.7.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz-icu/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.7.6 with grep in /nix/store/9dzws8q45r5sybzlcz8xc9gil9ng0wf6-harfbuzz-icu-1.7.6 - found 1.7.6 in filename of file in /nix/store/9dzws8q45r5sybzlcz8xc9gil9ng0wf6-harfbuzz-icu-1.7.6 - directory tree listing: https://gist.github.com/660379e3d103a344b19913754635a124 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bb68ae94a7f0..2c59fb3f9ea6 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.7.5"; + version = "1.7.6"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"; + sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys"; }; outputs = [ "out" "dev" ]; From 47e497b6692f979fee1addead853c2eac102b460 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 1 Apr 2018 01:59:42 -0700 Subject: [PATCH 022/369] libidn: 1.33 -> 1.34 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libidn/versions. These checks were done: - built on NixOS - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -h` got 0 exit code - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --help` got 0 exit code - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn help` got 0 exit code - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -V` and found version 1.34 - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --version` and found version 1.34 - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -h` and found version 1.34 - ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --help` and found version 1.34 - found 1.34 with grep in /nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin - directory tree listing: https://gist.github.com/2097e7f4c50acbee75a30738c68f417c --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 54d669f1913b..185cd2ede84c 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libidn-1.33"; + name = "libidn-1.34"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; From 731d6486cb1bc35683616ac5aab95019326ea9fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Apr 2018 07:01:00 -0700 Subject: [PATCH 023/369] gnused: 4.4 -> 4.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gnused/versions. These checks were done: - built on NixOS - ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --help` got 0 exit code - ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --version` and found version 4.5 - ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --help` and found version 4.5 - found 4.5 with grep in /nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5 - directory tree listing: https://gist.github.com/20a2031e4b27616ba71439622e5fe4d1 --- pkgs/tools/text/gnused/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 72d632533ffa..47193e61615d 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnused-${version}"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb"; + sha256 = "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs"; }; outputs = [ "out" "info" ]; From 972dce4dc5a75a1fcf3e2173421f5ef37bf419b2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Apr 2018 10:19:43 -0500 Subject: [PATCH 024/369] ruby: 2.3.6 -> 2.3.7 --- pkgs/development/interpreters/ruby/default.nix | 8 ++++---- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4ebc488d9988..d80ec3053162 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -94,7 +94,7 @@ let # support is disabled (if it's enabled, we already have it) and we're # running on darwin ++ (op (!cursesSupport && stdenv.isDarwin) readline) - ++ (op (isRuby25 && stdenv.isDarwin) Foundation) + ++ (op stdenv.isDarwin Foundation) ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); enableParallelBuilding = true; @@ -200,10 +200,10 @@ let in { ruby_2_3 = generic { - version = rubyVersion "2" "3" "6" ""; + version = rubyVersion "2" "3" "7" ""; sha256 = { - src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; - git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds"; + src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m"; + git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index fc79761252f2..e672402ffb67 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,7 +6,7 @@ rec { "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.6" = ops useRailsExpress [ + "2.3.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" From 4c1e987b95833e9f7d93498e455f6df9b3b27fdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Apr 2018 10:21:51 -0500 Subject: [PATCH 025/369] ruby: 2.4.3 -> 2.4.4 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d80ec3053162..edf8ec693317 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -208,10 +208,10 @@ in { }; ruby_2_4 = generic { - version = rubyVersion "2" "4" "3" ""; + version = rubyVersion "2" "4" "4" ""; sha256 = { - src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; - git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m"; + src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5"; + git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index e672402ffb67..e52091fd0687 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.3" = ops useRailsExpress [ + "2.4.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" From 1a35b2adc10f429afb7b81e0906d9b17156ff142 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 2 Apr 2018 10:22:25 -0500 Subject: [PATCH 026/369] ruby: 2.5.0 -> 2.5.1 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index edf8ec693317..0df7ec0a7959 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -216,10 +216,10 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "0" ""; + version = rubyVersion "2" "5" "1" ""; sha256 = { - src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; - git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd"; + src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; + git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index e52091fd0687..e53f231884d9 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,7 +16,7 @@ rec { "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.0" = ops useRailsExpress [ + "2.5.1" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" From 4292c633b438c10ad45030fa656b40cf3dfd6e44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Apr 2018 10:18:21 -0700 Subject: [PATCH 027/369] libuv: 1.19.2 -> 1.20.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libuv/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.20.0 with grep in /nix/store/r6j9x782s7pl6a5055icynmzk1991imw-libuv-1.20.0 - directory tree listing: https://gist.github.com/cff77ff2c13f732c2027bb680a833c5e --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e8877c7f54b6..e6b29a6c36be 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.19.2"; + version = "1.20.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z"; + sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz"; }; postPatch = let From 80cd26375e7e28a0a9dc5100198b644f166369c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 18:39:32 -0700 Subject: [PATCH 028/369] dhcp: 4.3.6-P1 -> 4.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dhcp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped -h’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped --help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient -h’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient --help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient --version’ and found version 4.4.1 - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script -h’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script --help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd -h’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd --help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd --version’ and found version 4.4.1 - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay -h’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay --help’ got 0 exit code - ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay --version’ and found version 4.4.1 - found 4.4.1 with grep in /nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1 - directory tree listing: https://gist.github.com/3f68e1eba2f701473b249d35042cc502 --- pkgs/tools/networking/dhcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 8b1ac864a434..1ebf57997d00 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "dhcp-${version}"; - version = "4.3.6-P1"; + version = "4.4.1"; src = fetchurl { url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; - sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g"; + sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; patches = From f43da349ba0722784ad7088ddddd4812a7fa9990 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 09:41:36 -0700 Subject: [PATCH 029/369] wayland: 1.14.0 -> 1.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wayland/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -h’ got 0 exit code - ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --help’ got 0 exit code - ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner help’ got 0 exit code - ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -v’ and found version 1.15.0 - ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --version’ and found version 1.15.0 - found 1.15.0 with grep in /nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0 - directory tree listing: https://gist.github.com/4f5bd9b49f975338e758858eb2b89e4d --- pkgs/development/libraries/wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index a5b7a6a99ce4..bbc33f33e701 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"; + sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb"; }; configureFlags = [ "--with-scanner" "--disable-documentation" ]; From f94c9c545918f39cb8a84a40049077c542dc1730 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 18:53:09 -0500 Subject: [PATCH 030/369] unix-tools: provide getconf and getent --- pkgs/top-level/all-packages.nix | 11 ++--------- pkgs/top-level/unix-tools.nix | 7 +++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72a2fb90f4b8..7f7c74611e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13703,14 +13703,6 @@ with pkgs; musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; musl-getent = callPackage ../os-specific/linux/musl/getent.nix { }; - getent = - if hostPlatform.isMusl then musl-getent - # This may not be right on other platforms, but preserves existing behavior - else /* if hostPlatform.libc == "glibc" then */ glibc.bin; - - getconf = - if hostPlatform.isMusl then musl-getconf - else lib.getBin stdenv.cc.libc; nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -21228,5 +21220,6 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject modprobe umount - mount wall hostname more sysctl; + mount wall hostname more sysctl getconf + getent; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 0d6e8d1c6c2d..69bd6b7a7cca 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -44,6 +44,13 @@ in rec { eject = singleBinary "eject" { linux = pkgs.utillinux; }; + getconf = singleBinary "getconf" { + linux = pkgs.musl-getconf; + darwin = pkgs.system_cmds; + }; + getent = singleBinary "getconf" { + linux = pkgs.musl-getent; + }; getopt = singleBinary "getopt" { linux = pkgs.utillinux; darwin = pkgs.getopt; From 037e5d863b6797270607cd7e148bff71e6eb384e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 18:54:11 -0500 Subject: [PATCH 031/369] rabbitmq-server: use provided getconf --- pkgs/servers/amqp/rabbitmq-server/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3d4a8902c918..4cc187846d0d 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,17 +1,11 @@ { stdenv, fetchurl, runCommand , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync - , AppKit, Carbon, Cocoa +, getconf }: -let - # we only need that one glibc binary (28k instead of 2.7M) - getconf = runCommand "getconf" {} '' - install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf - ''; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; version = "3.6.15"; From 70c378891e923f8983d905fb76d30bf86b03a5c8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 18:55:25 -0500 Subject: [PATCH 032/369] unix-tools: copy instead of linking This prevents big closures from getting pulled in. --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 69bd6b7a7cca..919ff9e81060 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -24,7 +24,7 @@ let exit 1 fi - ln -s "${provider}" "$out/bin/${cmd}" + cp "${provider}" "$out/bin/${cmd}" ''; in rec { From 50bdc5a6128a84dbf5b45543cdb306296fda74d4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 21:18:42 -0500 Subject: [PATCH 033/369] unix-tools: fix typo --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 919ff9e81060..19e315f6f603 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -46,7 +46,7 @@ in rec { }; getconf = singleBinary "getconf" { linux = pkgs.musl-getconf; - darwin = pkgs.system_cmds; + darwin = pkgs.darwin.system_cmds; }; getent = singleBinary "getconf" { linux = pkgs.musl-getent; From 3e3a26e0cc3ef09c0124319b17daceeb02630050 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 00:07:54 -0700 Subject: [PATCH 034/369] gdbm: 1.14 -> 1.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdbm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool --help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load --help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump --help’ got 0 exit code - found 1.14.1 with grep in /nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1 - directory tree listing: https://gist.github.com/b8277402d4a886ce7a0ee2baa8451e83 --- pkgs/development/libraries/gdbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 310aaa430daf..3fd0bb082440 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14"; + name = "gdbm-1.14.1"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd"; + sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; }; doCheck = true; # not cross; From 0d2f4615af793f0bdee69b24db7e536b379fa572 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 00:38:26 -0700 Subject: [PATCH 035/369] dbus-glib: 0.108 -> 0.110 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbus-glib/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.110 with grep in /nix/store/745gjl73bz311i35h57d3slqd320bvjr-dbus-glib-0.110 - directory tree listing: https://gist.github.com/87d5b9565bc23aa3acfd68aaa8d88725 --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4d27552d7351..5d78e084e983 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.108"; + name = "dbus-glib-0.110"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"; + sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"; }; outputs = [ "out" "dev" "devdoc" ]; From 260194193c333a3d939a07989f160f3d6e1b3047 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Mar 2018 18:06:10 -0500 Subject: [PATCH 036/369] git: 2.16.2 -> 2.16.3 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- .../git-and-tools/git/git-sh-i18n.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 38509dddeb8f..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh From ad076ff7ce5ea04d7e890934440702e0228fc660 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 9 Apr 2018 10:02:57 +0200 Subject: [PATCH 037/369] git: 2.16.3 -> 2.17.0 --- .../git-and-tools/git/default.nix | 4 ++-- .../git-and-tools/git/docbook2texi.patch | 16 ++++++++-------- .../git/git-send-email-honor-PATH.patch | 8 +++----- .../git-and-tools/git/symlinks-in-bin.patch | 8 ++++---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b336f72c7ac1..de2c67ddc59d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.3"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index bf36b2d321f3..ab5bb3c3a6c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi', and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). -diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile ---- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 -+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 -@@ -101,7 +101,7 @@ +diff --git a/Documentation/Makefile b/Documentation/Makefile +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -122,7 +122,7 @@ MAKEINFO = makeinfo INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi +DOCBOOK2X_TEXI = docbook2texi DBLATEX = dblatex - ifndef PERL_PATH - PERL_PATH = /usr/bin/perl -@@ -205,7 +205,7 @@ + ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex + DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty +@@ -240,7 +240,7 @@ man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile pdf: user-manual.pdf -@@ -221,10 +221,9 @@ +@@ -256,10 +256,9 @@ install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 9a484262b7b2..6b93d061a3be 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,22 +1,20 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. +@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration - option; the built-in default is to search for `sendmail` in - `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. --smtp-server-port=:: diff --git a/git-send-email.perl b/git-send-email.perl -index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { +@@ -944,8 +944,7 @@ if (defined $reply_to) { } if (!defined $smtp_server) { diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch index 29d537db25f9..0a581a61d46d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -1,7 +1,7 @@ -diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile ---- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 -+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 -@@ -2319,8 +2319,7 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -2609,8 +2609,7 @@ { test "$$bindir/" = "$$execdir/" || \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ $(RM) "$$execdir/$$p" && \ From 2ddba49f59c3291014f7c765c5b6944bbddd2c26 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 11 Apr 2018 13:00:40 +0200 Subject: [PATCH 038/369] git: fix perl libs path --- .../git-and-tools/git/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index de2c67ddc59d..f75515b1cc09 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -54,11 +54,19 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " - + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") - + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") - + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); + preBuild = '' + makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') ) + ''; + + makeFlags = stdenv.lib.concatStringsSep " " [ + "prefix=\${out}" + "PERL_PATH=${perl}/bin/perl" + "SHELL_PATH=${stdenv.shell}" + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then "INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then "NO_APPLE_COMMON_CRYPTO=1" else "sysconfdir=/etc/ ") + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "") + ]; # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' From 27dd87222769bc602d34c5a5c2a13f492f432dbe Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 11 Apr 2018 12:46:53 -0500 Subject: [PATCH 039/369] unix-tools: fixup --- pkgs/top-level/unix-tools.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 19e315f6f603..16c2a6b77bfe 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,4 @@ -{ pkgs, buildEnv, runCommand, hostPlatform }: +{ pkgs, buildEnv, runCommand, hostPlatform, stdenv, lib }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -45,11 +45,14 @@ in rec { linux = pkgs.utillinux; }; getconf = singleBinary "getconf" { - linux = pkgs.musl-getconf; + linux = if hostPlatform.isMusl then pkgs.musl-getconf + else lib.getBin stdenv.cc.libc; darwin = pkgs.darwin.system_cmds; }; - getent = singleBinary "getconf" { - linux = pkgs.musl-getent; + getent = singleBinary "getent" { + linux = if hostPlatform.isMusl then pkgs.musl-getent + # This may not be right on other platforms, but preserves existing behavior + else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin; }; getopt = singleBinary "getopt" { linux = pkgs.utillinux; From 0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 11 Apr 2018 14:00:13 -0400 Subject: [PATCH 040/369] Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix"" This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying PR #28029 which was supposed to have gone to staging all along. --- .../bintools-wrapper/add-flags.sh | 5 +- .../bintools-wrapper/add-hardening.sh | 87 ++++++------- .../bintools-wrapper/ld-wrapper.sh | 4 +- .../bintools-wrapper/setup-hook.sh | 4 + pkgs/build-support/cc-wrapper/add-flags.sh | 4 +- .../build-support/cc-wrapper/add-hardening.sh | 115 +++++++++--------- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 +- pkgs/build-support/cc-wrapper/setup-hook.sh | 4 + pkgs/stdenv/generic/make-derivation.nix | 7 ++ 9 files changed, 130 insertions(+), 104 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 7d118d20fc68..a97809258954 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -5,6 +5,7 @@ var_templates_list=( NIX+LDFLAGS_BEFORE NIX+LDFLAGS_AFTER NIX+LDFLAGS_HARDEN + NIX+HARDENING_ENABLE ) var_templates_bool=( NIX+SET_BUILD_ID @@ -23,10 +24,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then fi for var in "${var_templates_list[@]}"; do - mangleVarList "$var" "${role_infixes[@]}" + mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" "${role_infixes[@]}" + mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} done if [ -e @out@/nix-support/libc-ldflags ]; then diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 5282d17fce27..a15be821659f 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -1,53 +1,58 @@ -hardeningFlags=(relro bindnow) -# Intentionally word-split in case 'hardeningEnable' is defined in -# Nix. Also, our bootstrap tools version of bash is old enough that -# undefined arrays trip `set -u`. -if [[ -v hardeningEnable[@] ]]; then - hardeningFlags+=(${hardeningEnable[@]}) -fi -hardeningLDFlags=() +declare -a hardeningLDFlags=() -declare -A hardeningDisableMap +declare -A hardeningEnableMap=() -# Intentionally word-split in case 'hardeningDisable' is defined in Nix. -for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ -do - hardeningDisableMap[$flag]=1 +# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The +# array expansion also prevents undefined variables from causing trouble with +# `set -u`. +for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do + hardeningEnableMap["$flag"]=1 +done + +# Remove unsupported flags. +for flag in @hardening_unsupported_flags@; do + unset -v hardeningEnableMap["$flag"] done if (( "${NIX_DEBUG:-0}" >= 1 )); then + declare -a allHardeningFlags=(pie relro bindnow) + declare -A hardeningDisableMap=() + + # Determine which flags were effectively disabled so we can report below. + for flag in "${allHardeningFlags[@]}"; do + if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then + hardeningDisableMap[$flag]=1 + fi + done + printf 'HARDENING: disabled flags:' >&2 (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 echo >&2 -fi -if [[ -z "${hardeningDisableMap[all]:-}" ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then + if (( "${#hardeningEnableMap[@]}" )); then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi - for flag in "${hardeningFlags[@]}" - do - if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then - case $flag in - pie) - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningLDFlags+=('-pie') - fi - ;; - relro) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi - hardeningLDFlags+=('-z' 'relro') - ;; - bindnow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi - hardeningLDFlags+=('-z' 'now') - ;; - *) - # Ignore unsupported. Checked in Nix that at least *some* - # tool supports each flag. - ;; - esac - fi - done fi + +for flag in "${!hardeningEnableMap[@]}"; do + case $flag in + pie) + if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi + hardeningLDFlags+=('-pie') + fi + ;; + relro) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi + hardeningLDFlags+=('-z' 'relro') + ;; + bindnow) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi + hardeningLDFlags+=('-z' 'now') + ;; + *) + # Ignore unsupported. Checked in Nix that at least *some* + # tool supports each flag. + ;; + esac +done diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 991ed0fe263c..672a3dcbe385 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -57,8 +57,8 @@ fi source @out@/nix-support/add-hardening.sh -extraAfter=("${hardeningLDFlags[@]}") -extraBefore=() +extraAfter=() +extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then extraAfter+=($NIX_@infixSalt@_LDFLAGS) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 48a00b0b9b07..831ee9b03872 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -83,6 +83,10 @@ do fi done +# If unset, assume the default hardening flags. +: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"} +export NIX_HARDENING_ENABLE + # No local scope in sourced file unset -v role_pre role_post cmd upper_case set +u diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 604aaf6b6cf0..e384d30ecbb6 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -30,10 +30,10 @@ fi # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. for var in "${var_templates_list[@]}"; do - mangleVarList "$var" "${role_infixes[@]}" + mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" "${role_infixes[@]}" + mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index a35ff3cb4260..026e48671447 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,67 +1,72 @@ -hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow) -# Intentionally word-split in case 'hardeningEnable' is defined in -# Nix. Also, our bootstrap tools version of bash is old enough that -# undefined arrays trip `set -u`. -if [[ -v hardeningEnable[@] ]]; then - hardeningFlags+=(${hardeningEnable[@]}) -fi -hardeningCFlags=() +declare -a hardeningCFlags=() -declare -A hardeningDisableMap +declare -A hardeningEnableMap=() -# Intentionally word-split in case 'hardeningDisable' is defined in Nix. -for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ -do - hardeningDisableMap[$flag]=1 +# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The +# array expansion also prevents undefined variables from causing trouble with +# `set -u`. +for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do + hardeningEnableMap["$flag"]=1 +done + +# Remove unsupported flags. +for flag in @hardening_unsupported_flags@; do + unset -v hardeningEnableMap["$flag"] done if (( "${NIX_DEBUG:-0}" >= 1 )); then + declare -a allHardeningFlags=(fortify stackprotector pie pic strictoverflow format) + declare -A hardeningDisableMap=() + + # Determine which flags were effectively disabled so we can report below. + for flag in "${allHardeningFlags[@]}"; do + if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then + hardeningDisableMap["$flag"]=1 + fi + done + printf 'HARDENING: disabled flags:' >&2 (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2 echo >&2 -fi -if [[ -z "${hardeningDisableMap[all]:-}" ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then + if (( "${#hardeningEnableMap[@]}" )); then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi - for flag in "${hardeningFlags[@]}" - do - if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then - case $flag in - fortify) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi - hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') - ;; - stackprotector) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi - hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') - ;; - pie) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi - hardeningCFlags+=('-fPIE') - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningCFlags+=('-pie') - fi - ;; - pic) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi - hardeningCFlags+=('-fPIC') - ;; - strictoverflow) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi - hardeningCFlags+=('-fno-strict-overflow') - ;; - format) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi - hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') - ;; - *) - # Ignore unsupported. Checked in Nix that at least *some* - # tool supports each flag. - ;; - esac - fi - done fi + +for flag in "${!hardeningEnableMap[@]}"; do + case $flag in + fortify) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi + hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') + ;; + stackprotector) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi + hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') + ;; + pie) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi + hardeningCFlags+=('-fPIE') + if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi + hardeningCFlags+=('-pie') + fi + ;; + pic) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi + hardeningCFlags+=('-fPIC') + ;; + strictoverflow) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi + hardeningCFlags+=('-fno-strict-overflow') + ;; + format) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi + hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') + ;; + *) + # Ignore unsupported. Checked in Nix that at least *some* + # tool supports each flag. + ;; + esac +done diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index c2e6c1406358..8a3cfb694b4f 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -134,8 +134,8 @@ fi source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}") -extraBefore=() +extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) +extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"}) if [ "$dontLink" != 1 ]; then diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 29a7306b9b7e..15b84dca2794 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -147,6 +147,10 @@ export ${role_pre}CXX=@named_cxx@ export CC${role_post}=@named_cc@ export CXX${role_post}=@named_cxx@ +# If unset, assume the default hardening flags. +: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"} +export NIX_HARDENING_ENABLE + # No local scope in sourced file unset -v role_pre role_post set +u diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 46df958b8396..7b5f9f7d6b0b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -74,6 +74,11 @@ rec { # TODO(@Ericson2314): Make this more modular, and not O(n^2). let supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; + defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags; + enabledHardeningOptions = + if builtins.elem "all" hardeningDisable + then [] + else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); in if builtins.length erroneousHardeningFlags != 0 @@ -179,6 +184,8 @@ rec { ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { + NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = From b9219912de7ea94e7d420f3846d56a79f67be373 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 6 Apr 2018 18:59:30 +0200 Subject: [PATCH 041/369] =?UTF-8?q?cairo:=201.14.10=20=E2=86=92=201.15.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/cairo/default.nix | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6a7beb1cc1a8..6d7b79c0b20a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -9,25 +9,17 @@ assert glSupport -> libGL != null; -let inherit (stdenv.lib) optional optionals; in - -stdenv.mkDerivation rec { - name = "cairo-1.14.10"; +let + version = "1.15.10"; + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { + name = "cairo-${version}"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"; + url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + sha256 = "14l3jll98pjdlpm8f972v0spzcsf6y5nz85y2k8iybyg6ihj5jk2"; }; - patches = [ - # from https://bugs.freedesktop.org/show_bug.cgi?id=98165 - (fetchpatch { - name = "cairo-CVE-2016-9082.patch"; - url = "https://bugs.freedesktop.org/attachment.cgi?id=127421"; - sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri"; - }) - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small From 2b6596962b82270ad6ba3e00211372035553e5dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Apr 2018 01:52:15 +0200 Subject: [PATCH 042/369] =?UTF-8?q?librsvg:=202.42.2=20=E2=86=92=202.42.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index c2e1739117b5..7ee1733f34d2 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.42.2"; + version = "2.42.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; + sha256 = "0mz6rdxpnnjnk15nahlwpa2gba0ws1hs2dnyk1agqw5ip522qkvh"; }; outputs = [ "out" "dev" ]; From 8bf523e17cc69e00c872a449aa8a31c484b72286 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 Apr 2018 01:53:34 +0200 Subject: [PATCH 043/369] =?UTF-8?q?python.pkgs.pycairo:=201.15.4=20?= =?UTF-8?q?=E2=86=92=201.16.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/pycairo/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 39c06bff3bf7..091ac809a9bb 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -2,8 +2,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.15.4"; - name = "${pname}-${version}"; + version = "1.16.3"; disabled = isPyPy; @@ -11,13 +10,21 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "02vzmfxx8nl6dbwzc911wcj7hqspgqz6v9xmq6579vwfla0vaglv"; + sha256 = "0clk6wrfls3fa1xrn844762qfaw6gs4ivwkrfysidbzmlbxhpngl"; }; - postPatch = '' - # we are unable to pass --prefix to bdist_wheel - # see https://github.com/NixOS/nixpkgs/pull/32034#discussion_r153285955 - substituteInPlace setup.py --replace '"prefix": self.install_base' "'prefix': '$out'" + # We need to create the pkgconfig file but it cannot be installed as a wheel since wheels + # are supposed to be relocatable and do not support --prefix option + buildPhase = '' + ${python.interpreter} setup.py build + ''; + + installPhase = '' + ${python.interpreter} setup.py install --skip-build --prefix="$out" --optimize=1 + ''; + + checkPhase = '' + ${python.interpreter} setup.py test ''; nativeBuildInputs = [ pkgconfig ]; From 36ce7ac867168e735c86db55529a00f8609d598c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Apr 2018 12:19:47 +0200 Subject: [PATCH 044/369] python.pkgs.deprecation: init at 2.0.2 --- .../python-modules/deprecation/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/deprecation/default.nix diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix new file mode 100644 index 000000000000..63c3fcd74cac --- /dev/null +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }: + +buildPythonPackage rec { + pname = "deprecation"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe"; + }; + + propagatedBuildInputs = [ packaging ]; + + checkInputs = [ unittest2 ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "A library to handle automated deprecations"; + homepage = https://deprecation.readthedocs.io/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ce9bde2c97d..b3ada10d65a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2101,6 +2101,8 @@ in { demjson = callPackage ../development/python-modules/demjson { }; + deprecation = callPackage ../development/python-modules/deprecation { }; + derpconf = callPackage ../development/python-modules/derpconf { }; deskcon = self.buildPythonPackage rec { From 13dadd48b5eed7b65f55d3d4068d0fa0a7ba9944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Apr 2018 12:23:06 +0200 Subject: [PATCH 045/369] conan: 1.1.1 -> 1.2.3 --- .../tools/build-managers/conan/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 04d7d93455e9..849c722e5548 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.1.1"; # remove patch below when updating + version = "1.2.3"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; + sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23"; }; checkInputs = with newPython.pkgs; [ @@ -39,15 +39,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch bottle pluginbase six distro pylint node-semver - future pygments mccabe - ]; - - patches = [ - # already merged, remove with the next package update - (fetchpatch { - url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch"; - sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7"; - }) + future pygments mccabe deprecation ]; preCheck = '' From 59b75e06a658ad0ad62fd752bd5d1862f2458803 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 09:16:59 -0700 Subject: [PATCH 046/369] brotli: 1.0.3 -> 1.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brotli/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -h’ got 0 exit code - ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --help’ got 0 exit code - ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -V’ and found version 1.0.4 - ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --version’ and found version 1.0.4 - directory tree listing: https://gist.github.com/8f1f6ce7cb6e005fe8d7cb00a4f50222 --- pkgs/tools/compression/brotli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 707b8f0d799f..1a42ba03d464 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7"; + sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i"; }; nativeBuildInputs = [ cmake ]; From 435176a64b7090f07574f4290161271132796322 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 10:45:10 -0700 Subject: [PATCH 047/369] gnome3.webkitgtk: 2.20.0 -> 2.20.1 (#38824) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/webkitgtk/versions. These checks were done: - built on NixOS - ran ‘/nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1/bin/WebKitWebDriver -h’ got 0 exit code - ran ‘/nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1/bin/WebKitWebDriver --help’ got 0 exit code - found 2.20.1 with grep in /nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1 - directory tree listing: https://gist.github.com/a60788ffc43ea1bedb466120462ff111 --- pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 27524504872e..3cc26b512c89 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.0"; + version = "2.20.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp"; + sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23"; }; patches = optionals stdenv.isDarwin [ From 4707dc6454904bee0bacd3a53829bcc76b4f0667 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sat, 14 Apr 2018 15:16:34 +0100 Subject: [PATCH 048/369] {cc,bintools}-wrapper: fix removal of unsupported hardening flags --- pkgs/build-support/bintools-wrapper/add-hardening.sh | 2 +- pkgs/build-support/cc-wrapper/add-hardening.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index a15be821659f..b7180870860a 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -11,7 +11,7 @@ done # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do - unset -v hardeningEnableMap["$flag"] + unset -v "hardeningEnableMap[$flag]" done if (( "${NIX_DEBUG:-0}" >= 1 )); then diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 026e48671447..fc40fe7408b6 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -11,7 +11,7 @@ done # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do - unset -v hardeningEnableMap["$flag"] + unset -v "hardeningEnableMap[$flag]" done if (( "${NIX_DEBUG:-0}" >= 1 )); then From d26c032d1499b3b119f195cc4833355da53f2284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Apr 2018 21:28:09 +0100 Subject: [PATCH 049/369] nspr: 4.18 -> 4.19 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 17805f32afb1..ce18498ee858 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.18"; in +let version = "4.19"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq"; + sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f"; }; outputs = [ "out" "dev" ]; From 2adc297e52413fc60299b823984b569ecc55b557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Apr 2018 21:28:28 +0100 Subject: [PATCH 050/369] nss: 3.35 -> 3.36.1 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8662b956ce22..840b349035b1 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.35"; + version = "3.36.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz"; - sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl"; + url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz"; + sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0"; }; buildInputs = [ perl zlib sqlite ] From d3d0c0196ebffe23eaab27086ef1a426990ef3cc Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Sun, 15 Apr 2018 21:06:16 -0700 Subject: [PATCH 051/369] clang: refactor post-install comments Throughout the evolution of the Clang packages, some comments have become misplaced. Put some of Clang's postInstall comments next to the lines they refer to. --- pkgs/development/compilers/llvm/5/clang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5aea54b5771..8a25db3ef41a 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -50,10 +50,10 @@ let outputs = [ "out" "lib" "python" ]; - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix postInstall = '' + # Clang expects to find LLVMgold in its own prefix ln -sv ${llvm}/lib/LLVMgold.so $out/lib + # Clang expects to find sanitizer libraries in its own prefix ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp From 2505aa51a449e5237808b2b6dc6a90105da90caa Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Sun, 15 Apr 2018 21:08:24 -0700 Subject: [PATCH 052/369] clang: fix install on Darwin As of Nix 2.0, building the `user-environment` package on macOS (Darwin) fails because LLVMgold.so is a broken symlink. Fix the issue by not creating the symlink in the first place, since it wouldn't be used on Darwin anyway. --- pkgs/development/compilers/llvm/5/clang/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 8a25db3ef41a..36f09a42308a 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -52,7 +52,9 @@ let postInstall = '' # Clang expects to find LLVMgold in its own prefix - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi # Clang expects to find sanitizer libraries in its own prefix ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp From e5b678698b2fd5ec49a9502bdb5a01acf1bff91b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 02:31:12 -0700 Subject: [PATCH 053/369] geoclue2: 2.4.7 -> 2.4.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geoclue/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.8 with grep in /nix/store/94izsg39mjz2f8z4wp0z4i2kxpwj8gv4-geoclue-2.4.8 - directory tree listing: https://gist.github.com/387fefa5c6ac00efbebe272c600f309f --- pkgs/development/libraries/geoclue/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 495a113391e3..4d348c92171b 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-2.4.7"; + name = "geoclue-2.4.8"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; + sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; }; outputs = [ "out" "dev" ]; From 50f568e2d5cfcbcbdbaad4ba6fc7133d9f422536 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 02:41:37 -0700 Subject: [PATCH 054/369] ethtool: 4.15 -> 4.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ethtool/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool -h’ got 0 exit code - ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool --help’ got 0 exit code - ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool --version’ and found version 4.16 - found 4.16 with grep in /nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16 - directory tree listing: https://gist.github.com/03539f0a0b1a6c9a35f832b19650ba47 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 2527c34feebb..62c782b26fec 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.15"; + version = "4.16"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi"; + sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py"; }; meta = with stdenv.lib; { From 02b022a9b2a672a17b2c72573aa155b371362308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 02:45:07 -0700 Subject: [PATCH 055/369] file: 5.32 -> 5.33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/file/versions. These checks were done: - built on NixOS - ran ‘/nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33/bin/file --help’ got 0 exit code - ran ‘/nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33/bin/file help’ got 0 exit code - found 5.33 with grep in /nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33 - directory tree listing: https://gist.github.com/b6f0a44bc22e88f13fe5dbc4f56d9296 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 3765f9134308..aeb43d7c1151 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.32"; + version = "5.33"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6"; + sha256 = "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; From 11fd378f73898fe53db75f2cf6e59bf351d6c187 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 17 Apr 2018 09:03:12 +0200 Subject: [PATCH 056/369] gnupatch: fix CVE-2018-6951 fixes #39045 --- pkgs/tools/text/gnupatch/CVE-2018-6951.patch | 28 ++++++++++++++++++++ pkgs/tools/text/gnupatch/default.nix | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/text/gnupatch/CVE-2018-6951.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch new file mode 100644 index 000000000000..22d5f061c332 --- /dev/null +++ b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch @@ -0,0 +1,28 @@ +From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 12 Feb 2018 16:48:24 +0100 +Subject: Fix segfault with mangled rename patch + +http://savannah.gnu.org/bugs/?53132 +* src/pch.c (intuit_diff_type): Ensure that two filenames are specified +for renames and copies (fix the existing check). +--- + src/pch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/pch.c b/src/pch.c +index ff9ed2c..bc6278c 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) + if ((pch_rename () || pch_copy ()) + && ! inname + && ! ((i == OLD || i == NEW) && +- p_name[! reverse] && ++ p_name[reverse] && p_name[! reverse] && ++ name_is_valid (p_name[reverse]) && + name_is_valid (p_name[! reverse]))) + { + say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); +-- +cgit v1.0-41-gc330 diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 3840811a3e36..c83eab2e2ef6 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; }; + patches = [ + # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a + ./CVE-2018-6951.patch + ]; + buildInputs = stdenv.lib.optional doCheck ed; configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [ From 7b73c7f49a0a4673987b661b9d679ec595704d89 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 09:50:21 -0500 Subject: [PATCH 057/369] clang: only link if LLVMgold exists buildEnv now errors with broken symlinks. Lots of things like this still exist. Discussion in #39038. --- pkgs/development/compilers/llvm/3.4/clang.nix | 5 ++++- pkgs/development/compilers/llvm/3.5/clang.nix | 5 ++++- pkgs/development/compilers/llvm/3.7/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/3.8/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/3.9/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/4/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/6/clang/default.nix | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 10510c750354..863e7eb22474 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation { # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index f15c989ef510..b61118439ee7 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -31,7 +31,10 @@ in stdenv.mkDerivation { # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index f27e3f0089e2..a63706e95cfb 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -32,7 +32,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 0147485dd58d..c8b2fec5e51d 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -34,7 +34,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index aafe30e4c9b3..fabc6a39d9f4 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -36,7 +36,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 5531fd2ab77e..e8f025c24ede 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -52,7 +52,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 919efdc8ef97..c540a8267e97 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -53,7 +53,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp From 9ee69c27c9b300154f1b26c1c21737cf000656cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 16 Apr 2018 20:04:54 -0500 Subject: [PATCH 058/369] llvm: remove libedit from clang clang should never need libedit. From what I understand this is only needed by LLDB. https://github.com/llvm-mirror/clang/search?q=libedit --- pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++-- pkgs/development/compilers/llvm/3.5/clang.nix | 4 ++-- pkgs/development/compilers/llvm/3.7/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/3.8/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/3.9/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/4/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/5/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/6/clang/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 863e7eb22474..2c5d3524911d 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libedit libxml2 zlib ]; + buildInputs = [ cmake libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index b61118439ee7..7e0163577baf 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ in stdenv.mkDerivation { mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm ]; + buildInputs = [ cmake libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index a63706e95cfb..4ccd00af6846 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -13,7 +13,7 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm ]; + buildInputs = [ cmake libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index c8b2fec5e51d..05893704d872 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -13,7 +13,7 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm python ]; + buildInputs = [ cmake libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index fabc6a39d9f4..1f6d80ab3be9 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - buildInputs = [ libedit libxml2 llvm python ]; + buildInputs = [ libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index e8f025c24ede..c6538282f23e 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 36f09a42308a..6499be2a0bdc 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index c540a8267e97..3d02062a4a32 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ From 5ce2d3355d4bcda5e1393b0cfb52b834e82d2546 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Tue, 17 Apr 2018 16:21:28 +0100 Subject: [PATCH 059/369] binutils: apply patch on aarch64 to fix https://sourceware.org/bugzilla/show_bug.cgi?id=22764 --- .../tools/misc/binutils/default.nix | 6 + ...RCH64_ABS32-R_AARCH64_ABS16-absolute.patch | 130 ++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 5c88902a68c4..ff798fb39691 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch + + ] ++ stdenv.lib.optionals targetPlatform.isAarch64 [ + # Version 2.30 introduced strict requirements on ELF relocations which cannot + # be satisfied on aarch64 platform. Add backported fix from bugzilla. + # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 + ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch ]; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch new file mode 100644 index 000000000000..6a04b3cc5588 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch @@ -0,0 +1,130 @@ +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index c310da6ed3..d31f46171f 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,10 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the ++ R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the ++ check for writeable section as well. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index d5711e0eb1..973188220b 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, + #if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_32: + #endif +- if (bfd_link_pic (info) +- && (sec->flags & SEC_ALLOC) != 0 +- && (sec->flags & SEC_READONLY) != 0) ++ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) + { ++ if (h != NULL ++ /* This is an absolute symbol. It represents a value instead ++ of an address. */ ++ && ((h->root.type == bfd_link_hash_defined ++ && bfd_is_abs_section (h->root.u.def.section)) ++ /* This is an undefined symbol. */ ++ || h->root.type == bfd_link_hash_undefined)) ++ break; ++ ++ /* For local symbols, defined global symbols in a non-ABS section, ++ it is assumed that the value is an address. */ + int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; + _bfd_error_handler + /* xgettext:c-format */ +diff --git a/ld/ChangeLog b/ld/ChangeLog +index 6337cd0cb6..1aaa6da3b5 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,11 @@ ++2018-02-05 Renlin Li ++ ++ PR ld/22764 ++ * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address. ++ * testsuite/ld-aarch64/emit-relocs-259.s: Likewise. ++ * testsuite/ld-aarch64/pr22764.s: New. ++ * testsuite/ld-aarch64/pr22764.d: New. ++ + 2018-01-27 Nick Clifton + + This is the 2.30 release: +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index f31089361b..d766f3736b 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -275,6 +275,7 @@ run_dump_test "pr17415" + run_dump_test_lp64 "tprel_g2_overflow" + run_dump_test "tprel_add_lo12_overflow" + run_dump_test "protected-data" ++run_dump_test_lp64 "pr22764" + + # ifunc tests + run_dump_test "ifunc-1" +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s +index f724776243..87bb657c5d 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s +index 7e1ba3ceb4..0977c9d869 100644 +--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s ++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s +@@ -1,5 +1,6 @@ ++.global dummy + .text +- ++dummy: + ldr x0, .L1 + + .L1: +diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d +new file mode 100644 +index 0000000000..997519f469 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.d +@@ -0,0 +1,18 @@ ++#source: pr22764.s ++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs ++#notarget: aarch64_be-*-* ++#objdump: -dr ++#... ++ ++Disassembly of section \.text: ++ ++0000000000010000 \<\.text\>: ++ 10000: d503201f nop ++ ... ++ 10004: R_AARCH64_ABS64 sym_abs1 ++ 1000c: 00000002 \.word 0x00000002 ++ 1000c: R_AARCH64_ABS32 sym_abs2 ++ 10010: 0003 \.short 0x0003 ++ 10010: R_AARCH64_ABS16 sym_abs3 ++ 10012: 0000 \.short 0x0000 ++ 10014: d503201f nop +diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s +new file mode 100644 +index 0000000000..25e36b4a12 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/pr22764.s +@@ -0,0 +1,6 @@ ++ .text ++ nop ++ .xword sym_abs1 ++ .word sym_abs2 ++ .short sym_abs3 ++ nop From 2d90138b3b90fb36db50a0954629b2f306795d5a Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 18 Apr 2018 13:13:03 -0500 Subject: [PATCH 060/369] clang3.4: still needs libedit https://hydra.nixos.org/build/72965931/nixlog/1 --- pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 2c5d3524911d..863e7eb22474 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libxml2 zlib ]; + buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" From 79f9657841ea79a98effb7044c1c44e1cb9d9195 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 19 Apr 2018 11:54:42 -0500 Subject: [PATCH 061/369] libjpeg: fixup hash https://hydra.nixos.org/build/72972836/nixlog/1 --- pkgs/development/libraries/libjpeg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 636699609f1c..96dbd463370b 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz; - sha256 = "1m3a137r7m14wd92a03qdvp4jfazc0657nzry7rqzs2p1xhkyfhz"; + sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"; }; configureFlags = optional static "--enable-static --disable-shared"; From 54c6a9c7104660757a713a8d2795df57b59251c5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 13:06:30 -0500 Subject: [PATCH 062/369] procps-ng: 3.3.13 -> 3.3.14 * patches were from upstream, merged in this update \o/ * "addressses" incorrect hash by moving to latest version --- pkgs/os-specific/linux/procps-ng/default.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 316f0ad1a28d..617bbd2d64fe 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,33 +1,19 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; - version = "3.3.13"; + version = "3.3.14"; src = fetchFromGitLab { owner ="procps-ng"; repo = "procps"; rev = "v${version}"; - sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q"; + sha256 = "0l2xfm3vr8qpzvdnkcvmfj1rdw6lxx840zw9vp0z9f008y5fc31g"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; - # https://gitlab.com/procps-ng/procps/issues/88 - # Patches needed for musl and glibc 2.28 - patches = [ - (fetchpatch { - url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff"; - sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5"; - extraPrefix = ""; - }) - (fetchpatch { - url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff"; - sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p"; - }) - ]; - # autoreconfHook doesn't quite get, what procps-ng buildprocss does # with po/Makefile.in.in and stuff. preConfigure = '' From dde9c099e9dacda65623ef8d08d9490068f4927c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 13:10:34 -0500 Subject: [PATCH 063/369] procps-ng: switch URL style to (hopefully) fix problems with hash See: https://github.com/NixOS/nixpkgs/issues/39154 Not sure why we're seeing that behavior re:fetchFromGitLab, but for now use a likely-to-be-stable URL instead. Fixes #39154. (although the issue warrants some additional investigation IMO) --- pkgs/os-specific/linux/procps-ng/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 617bbd2d64fe..d164af63315f 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchurl, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; version = "3.3.14"; - src = fetchFromGitLab { - owner ="procps-ng"; - repo = "procps"; - rev = "v${version}"; - sha256 = "0l2xfm3vr8qpzvdnkcvmfj1rdw6lxx840zw9vp0z9f008y5fc31g"; + src = fetchurl { + url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2"; + sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf"; }; buildInputs = [ ncurses ]; From 737c1c491dd78066f0d7a27f0476d3ebcd40140b Mon Sep 17 00:00:00 2001 From: Keith Amidon Date: Thu, 19 Apr 2018 11:40:10 -0700 Subject: [PATCH 064/369] gnome-boxes: fix USB redirection (#39129) This fixes USB redirection in gnome-boxes by ensuring that the required PolicyKit action policy file is installed in the spice-gtk package and adding that package to gnome-boxes propagatedUserEnvPkgs. --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 3 +++ pkgs/development/libraries/spice-gtk/default.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 8921d70787ca..8ce9617aaae4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -24,6 +24,9 @@ in stdenv.mkDerivation rec { meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils ]; + # Required for USB redirection PolicyKit rules file + propagatedUserEnvPkgs = [ spice-gtk ]; + buildInputs = [ libvirt-glib glib gtk3 gtkvnc libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 0564459b24c0..05fd952eb2e8 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions"; configureFlags = [ "--with-gtk3" From 01a4d957dd46bfffd792fea07bb9784a8f2931af Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 20 Apr 2018 14:55:01 +0200 Subject: [PATCH 065/369] openssl: enable parallel building There is no improvement for the build duration of openssl 1.0 but the one of openssl 1.1 is reduced significantly. --- pkgs/development/libraries/openssl/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5a9052222cb8..370616745d33 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -71,8 +71,7 @@ let makeFlags = [ "MANDIR=$(man)/share/man" ]; - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; + enableParallelBuilding = true; postInstall = '' # If we're building dynamic libraries, then don't install static From a23c0c577c0ba8b4f492a5d61a677c68036983b3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 20 Apr 2018 21:10:47 -0500 Subject: [PATCH 066/369] boehmgc: 7.6.4 -> 7.6.6 https://github.com/ivmai/bdwgc/releases/tag/v7.6.6 --- pkgs/development/libraries/boehm-gc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d4e91deb7449..14479a560913 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "7.6.4"; + version = "7.6.6"; src = fetchurl { urls = [ "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" ]; - sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r"; + sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; }; buildInputs = [ libatomic_ops ]; From 6d2dd3307060a0a9dc3532e123726c8657ba6c98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 14 Apr 2018 17:11:50 +0200 Subject: [PATCH 067/369] python.pkgs.bootstrapped-pip: 9.0.3 -> 10.0.1 --- .../development/python-modules/bootstrapped-pip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 4ff4c687e5c0..28962d0c9361 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "9.0.3"; + version = "10.0.1"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5"; + sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7"; }; unpackPhase = '' @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { # install pip binary echo '#!${python.interpreter}' > $out/bin/pip - echo 'import sys;from pip import main' >> $out/bin/pip + echo 'import sys;from pip._internal import main' >> $out/bin/pip echo 'sys.exit(main())' >> $out/bin/pip chmod +x $out/bin/pip From e5f57757d0396841bb6d9f215cb6777f1914c9dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 14 Apr 2018 17:12:10 +0200 Subject: [PATCH 068/369] python.pkgs.pip: 9.0.3 -> 10.0.1 --- pkgs/development/python-modules/pip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index a566e31e035f..20558312f290 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "9.0.3"; + version = "10.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796"; + sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"; }; # pip detects that we already have bootstrapped_pip "installed", so we need @@ -31,4 +31,4 @@ buildPythonPackage rec { homepage = https://pip.pypa.io/; priority = 10; }; -} \ No newline at end of file +} From 6a45d0b1791ae7f35f5b1478416893e8782fbd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Apr 2018 17:23:52 +0200 Subject: [PATCH 069/369] python.pkgs.flake8-future-import: 0.4.3 -> 0.4.5 --- .../flake8-future-import/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 2ece8ba85abc..2612cfde1f50 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -3,27 +3,18 @@ buildPythonPackage rec { pname = "flake8-future-import"; - name = "${pname}-${version}"; - version = "0.4.3"; + version = "0.4.5"; + # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; rev = version; - sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4"; + sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr"; }; - patches = [ - # Tests in 0.4.3 are broken. We can remove this patch after - # the next release. - (fetchurl { - url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch"; - sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn"; - }) - ]; - - propagatedBuildInputs = [ flake8 six ]; + meta = { homepage = https://github.com/xZise/flake8-future-import; description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; From 1c84ac797d84b6f2eb086dcc8aeb48f07143b038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Apr 2018 17:26:17 +0200 Subject: [PATCH 070/369] python: pip-tools: 1.11.0 -> 2.0.1 --- pkgs/development/python-modules/pip-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 752047d04f7e..abe2dff6441b 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "1.11.0"; + version = "2.0.1"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3"; + sha256 = "81abea4ba206051ddaf90854b7302849002fdd0084450d2dd7f5c44a6d0ddf16"; }; LC_ALL = "en_US.UTF-8"; @@ -22,6 +22,8 @@ buildPythonPackage rec { "test_generate_hashes_without_interfering_with_each_other" "test_realistic_complex_sub_dependencies" "test_generate_hashes_with_editable" + "test_filter_pip_markes" + "test_get_hashes_local_repository_cache_miss" # Expect specific version of "six": "test_editable_package" "test_input_file_without_extension" From ee1778de783a4ad24656b6901ad447a979d4061c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 20 Apr 2018 23:39:08 -0300 Subject: [PATCH 071/369] mesa_drivers: fix drirc install path This will install drirc to the location where mesa expects to find it. You can test with: LIBGL_DEBUG=1 glxgears An error message will be printed if drirc can't be found. --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e77a4e1414e9..fae83a95f3ca 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -160,7 +160,7 @@ let self = stdenv.mkDerivation { doCheck = false; installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=\${drivers}/etc" "localstatedir=\${TMPDIR}" "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" ]; From 50953c3cbcbe26498a5c9f13e3a49946803f7801 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Apr 2018 00:17:26 +0200 Subject: [PATCH 072/369] =?UTF-8?q?gdk=5Fpixbuf:=202.36.7=20=E2=86=92=202.?= =?UTF-8?q?36.12=20(#39026)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gdk-pixbuf/default.nix | 47 ++++++++++++------- .../gdk-pixbuf/no-mime-sniffing.patch | 18 +++++++ 2 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6bfa6bdc2fb9..aa415d097ca2 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,40 +1,50 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, gobjectIntrospection, doCheck ? false }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: let pname = "gdk-pixbuf"; - version = "2.36.7"; - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared-mime-info files during runtime. + version = "2.36.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; + sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; }; - outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which requires access to shared-mime-info files during runtime. + # For now, we are patching the build script to avoid the dependency. + ./no-mime-sniffing.patch + ]; + + outputs = [ "out" "dev" "man" "devdoc" ]; setupHook = ./setup-hook.sh; - enableParallelBuilding = true; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 gobjectIntrospection ]; + buildInputs = [ libX11 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + gtk-doc gobjectIntrospection makeWrapper + ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - configureFlags = "--with-libjasper --with-x11" - + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" - ; + mesonFlags = [ + "-Ddocs=true" + "-Djasper=true" + "-Dx11=true" + "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" + ]; - # on darwin, tests don't link - preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' - substituteInPlace Makefile --replace "docs tests" "docs" + postPatch = '' + chmod +x build-aux/* # patchShebangs only applies to executables + patchShebangs build-aux ''; postInstall = @@ -42,6 +52,9 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ + $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch new file mode 100644 index 000000000000..9896e25acda1 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch @@ -0,0 +1,18 @@ +--- a/meson.build ++++ b/meson.build +@@ -186,13 +186,8 @@ + gmodule_dep = dependency('gmodule-no-export-2.0') + gio_dep = dependency('gio-2.0') + +-# On non-Windows/macOS systems we always required shared-mime-info and GIO +-if host_system != 'windows' and host_system != 'darwin' +- shared_mime_dep = dependency('shared-mime-info') +- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) +-else +- shared_mime_dep = [] +-endif ++# No MIME sniffing for now ++shared_mime_dep = [] + + gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] + From c70a245bb314250271c0fa1b6bcc78f80f867dfe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Apr 2018 00:18:56 +0200 Subject: [PATCH 073/369] =?UTF-8?q?Revert=20"gdk=5Fpixbuf:=202.36.7=20?= =?UTF-8?q?=E2=86=92=202.36.12=20(#39026)"=20(#39316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 50953c3cbcbe26498a5c9f13e3a49946803f7801. --- .../libraries/gdk-pixbuf/default.nix | 49 +++++++------------ .../gdk-pixbuf/no-mime-sniffing.patch | 18 ------- 2 files changed, 18 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index aa415d097ca2..6bfa6bdc2fb9 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,50 +1,40 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl -, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, gobjectIntrospection, doCheck ? false }: let pname = "gdk-pixbuf"; - version = "2.36.12"; + version = "2.36.7"; + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; + sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; - patches = [ - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which requires access to shared-mime-info files during runtime. - # For now, we are patching the build script to avoid the dependency. - ./no-mime-sniffing.patch - ]; - - outputs = [ "out" "dev" "man" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; setupHook = ./setup-hook.sh; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; + enableParallelBuilding = true; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobjectIntrospection makeWrapper - ]; + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. + buildInputs = [ libX11 gobjectIntrospection ]; + + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - mesonFlags = [ - "-Ddocs=true" - "-Djasper=true" - "-Dx11=true" - "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" - ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; - postPatch = '' - chmod +x build-aux/* # patchShebangs only applies to executables - patchShebangs build-aux + # on darwin, tests don't link + preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' + substituteInPlace Makefile --replace "docs tests" "docs" ''; postInstall = @@ -52,9 +42,6 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - - # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch deleted file mode 100644 index 9896e25acda1..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -186,13 +186,8 @@ - gmodule_dep = dependency('gmodule-no-export-2.0') - gio_dep = dependency('gio-2.0') - --# On non-Windows/macOS systems we always required shared-mime-info and GIO --if host_system != 'windows' and host_system != 'darwin' -- shared_mime_dep = dependency('shared-mime-info') -- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) --else -- shared_mime_dep = [] --endif -+# No MIME sniffing for now -+shared_mime_dep = [] - - gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] - From 14eeba83fa62db164b7f3fe114d32fc2ed62417a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 11:06:01 -0700 Subject: [PATCH 074/369] parallel: 20180322 -> 20180422 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/parallel/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/niceload -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/niceload --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped -h’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped --help’ got 0 exit code - ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped help’ got 0 exit code - found 20180422 with grep in /nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422 - directory tree listing: https://gist.github.com/1d25708a872478041161c30dc54e53fb --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 093633e21142..9bb09d227c4c 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180322"; + name = "parallel-20180422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"; + sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx"; }; nativeBuildInputs = [ makeWrapper perl ]; From fa1d1eec6e5ef9f248416bec9df10ee2c9ed0e15 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 09:19:45 -0500 Subject: [PATCH 075/369] nixos/nix-daemon: optionally (on by default) check nix.conf can be read * checks using package providing the nix-daemon that we'll be using * made optional (unlike some other config checks) "just in case": since this requires running the new Nix on the builder, this won't work in a few (AFAIK very uncommon) situations such as cross-compiling NixOS or using `include` directives in nix.conf This does rely on Nix2 but not by the builder. Since we only offer Nix2+ in-tree this should be fine, and may otherwise be required anyway. --- nixos/modules/services/misc/nix-daemon.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f2d34560a718..9c428d7a422d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,7 +33,7 @@ let sh = pkgs.runtimeShell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ('' ${optionalString (!isNix20) '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} @@ -62,7 +62,11 @@ let ''} $extraOptions END - ''; + '' + optionalString cfg.checkConfig '' + echo "Checking that Nix can read nix.conf..." + ln -s $out ./nix.conf + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null + ''); in @@ -349,6 +353,13 @@ in ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + If enabled (the default), checks that Nix can parse the generated nix.conf. + ''; + }; }; }; From bc26105522dd71b0fc3b1035a53b26dba9ac8646 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:32:19 -0700 Subject: [PATCH 076/369] libwebp: 0.6.1 -> 1.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwebp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/dwebp -h’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/cwebp -h’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/gif2webp -h’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp -h’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp --help’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpmux -h’ got 0 exit code - ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpinfo -h’ got 0 exit code - found 1.0.0 with grep in /nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0 - directory tree listing: https://gist.github.com/a09e2cd5f3d318ac588ecdf308cc9898 --- pkgs/development/libraries/libwebp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index f7d4fc3b3675..8cd0536e2946 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.6.1"; + version = "1.0.0"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06"; + sha256 = "0nr2hd4iv61fphdbx49g96a56jkmdm9n2qss7jpkg1pii11rq9c4"; }; configureFlags = [ From d0a7664cc360989750909dd8ad7d500fd0a1bcd2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 12:42:18 -0700 Subject: [PATCH 077/369] kexectools: 2.0.16 -> 2.0.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kexec-tools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec -h’ got 0 exit code - ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec --help’ got 0 exit code - ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec -v’ and found version 2.0.17 - ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec --version’ and found version 2.0.17 - found 2.0.17 with grep in /nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17 - directory tree listing: https://gist.github.com/892a831f872f6ec59c936b89b0bd6aa6 --- pkgs/os-specific/linux/kexectools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 26f3d89c6628..f5f0916b90a6 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.16"; + version = "2.0.17"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v"; + sha256 = "1ac20jws8iys9w6dpn4q3hihyx73zkabdwv3gcb779cxfrmq2k2h"; }; hardeningDisable = [ "format" "pic" "relro" ]; From 092a4fff400a06d2b82b8fb9722bcc05c9e89566 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Apr 2018 13:56:08 -0500 Subject: [PATCH 078/369] tcp-wrappers: rename conflicting variable instead of clearing it --- pkgs/os-specific/linux/tcp-wrappers/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 7da4e39ca6c0..667189009ccb 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -20,11 +20,14 @@ in stdenv.mkDerivation rec { prePatch = '' tar -xaf $debian patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches" + + substituteInPlace Makefile --replace STRINGS STRINGDEFS + substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS ''; buildInputs = [ libnsl ]; - makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; installPhase = '' mkdir -p "$out/bin" From 40be5dd2df4e57237a44fee596e8c2df232686d2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Apr 2018 13:47:32 -0500 Subject: [PATCH 079/369] tcp-wrappers: patch up crufty code, fix w/musl --- .../linux/tcp-wrappers/cdecls.patch | 31 ++ .../linux/tcp-wrappers/default.nix | 8 + .../tcp-wrappers-7.6-headers.patch | 295 ++++++++++++++++++ 3 files changed, 334 insertions(+) create mode 100644 pkgs/os-specific/linux/tcp-wrappers/cdecls.patch create mode 100644 pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch new file mode 100644 index 000000000000..eee640e8a824 --- /dev/null +++ b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch @@ -0,0 +1,31 @@ +__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl +glibc and uclibc had sys/cdefs.h doing it. + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: tcp_wrappers_7.6/tcpd.h +=================================================================== +--- tcp_wrappers_7.6.orig/tcpd.h ++++ tcp_wrappers_7.6/tcpd.h +@@ -11,7 +11,9 @@ + #include + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /* Structure to describe one communications endpoint. */ + +@@ -252,6 +254,8 @@ extern char *fix_strtok(); + extern char *my_strtok(); + #endif + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 667189009ccb..e3aae30babca 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -25,6 +25,14 @@ in stdenv.mkDerivation rec { substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS ''; + # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) + patches = [ ./cdecls.patch ]; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace Makefile \ + --replace '-DNETGROUP' '-DUSE_GETDOMAIN' + ''; + buildInputs = [ libnsl ]; makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch new file mode 100644 index 000000000000..328a4a102618 --- /dev/null +++ b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch @@ -0,0 +1,295 @@ +--- a/options.c ++++ b/options.c +@@ -34,6 +34,8 @@ + + /* System libraries. */ + ++#include ++#include + #include + #include + #include +--- a/safe_finger.c ++++ b/safe_finger.c +@@ -20,6 +20,11 @@ + + /* System libraries */ + ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -27,7 +31,7 @@ + #include + #include + +-extern void exit(); ++int pipe_stdin(char **argv); + + /* Local stuff */ + +--- a/scaffold.c ++++ b/scaffold.c +@@ -10,6 +10,7 @@ + + /* System libraries. */ + ++#include + #include + #include + #include +@@ -27,7 +27,4 @@ + #endif + +-#ifndef INET6 +-extern char *malloc(); +-#endif + + /* Application-specific. */ +--- a/shell_cmd.c ++++ b/shell_cmd.c +@@ -14,6 +14,10 @@ + + /* System libraries. */ + ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -25,8 +25,6 @@ + #include + #include + +-extern void exit(); +- + /* Local stuff. */ + + #include "tcpd.h" +--- a/tcpdchk.c ++++ b/tcpdchk.c +@@ -20,6 +20,8 @@ + + /* System libraries. */ + ++#include ++#include + #include + #include + #ifdef INET6 +@@ -35,10 +36,7 @@ + #include + #include + +-extern int errno; +-extern void exit(); +-extern int optind; +-extern char *optarg; ++int cidr_mask_addr(char *str); + + #ifndef INADDR_NONE + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ +--- a/clean_exit.c ++++ b/clean_exit.c +@@ -13,8 +13,8 @@ + #endif + + #include +- +-extern void exit(); ++#include ++#include + + #include "tcpd.h" + +--- a/hosts_access.c ++++ b/hosts_access.c +@@ -23,6 +23,7 @@ + + /* System libraries. */ + ++#include + #include + #ifdef INT32_T + typedef uint32_t u_int32_t; +@@ -43,8 +44,8 @@ + #include + #endif + +-extern char *fgets(); +-extern int errno; ++static int match_pattern_ylo(const char *s, const char *pattern); ++int cidr_mask_addr(char *str); + + #ifndef INADDR_NONE + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ +--- a/inetcf.c ++++ b/inetcf.c +@@ -9,15 +9,14 @@ + static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23"; + #endif + ++#include + #include + #include + #include + #include + #include + +-extern int errno; +-extern void exit(); +- ++#include "scaffold.h" + #include "tcpd.h" + #include "inetcf.h" + +--- a/percent_x.c ++++ b/percent_x.c +@@ -16,12 +16,12 @@ + + /* System libraries. */ + ++#include ++#include + #include + #include + #include + +-extern void exit(); +- + /* Local stuff. */ + + #include "tcpd.h" +--- a/rfc931.c ++++ b/rfc931.c +@@ -15,6 +15,7 @@ + + /* System libraries. */ + ++#include + #include + #include + #include +--- a/tcpd.c ++++ b/tcpd.c +@@ -16,6 +16,7 @@ + + /* System libraries. */ + ++#include + #include + #include + #include +@@ -39,6 +39,8 @@ + #include "patchlevel.h" + #include "tcpd.h" + ++void fix_options(struct request_info *request); ++ + int allow_severity = SEVERITY; /* run-time adjustable */ + int deny_severity = LOG_WARNING; /* ditto */ + +--- a/tcpdmatch.c ++++ b/tcpdmatch.c +@@ -19,6 +19,8 @@ + + /* System libraries. */ + ++#include ++#include + #include + #include + #include +@@ -30,9 +32,6 @@ + #include + #include + +-extern void exit(); +-extern int optind; +-extern char *optarg; + + #ifndef INADDR_NONE + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ +--- a/update.c ++++ b/update.c +@@ -19,6 +19,7 @@ + + /* System libraries */ + ++#include + #include + #include + #include +--- a/misc.c ++++ b/misc.c +@@ -14,11 +14,10 @@ + #include + #include + #include ++#include + + #include "tcpd.h" + +-extern char *fgets(); +- + #ifndef INADDR_NONE + #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ + #endif +--- a/fix_options.c ++++ b/fix_options.c +@@ -32,6 +32,7 @@ + + /* fix_options - get rid of IP-level socket options */ + ++void + fix_options(request) + struct request_info *request; + { +@@ -38,11 +38,8 @@ + #ifdef IP_OPTIONS + unsigned char optbuf[BUFFER_SIZE / 3], *cp; + char lbuf[BUFFER_SIZE], *lp; +-#ifdef __GLIBC__ +- size_t optsize = sizeof(optbuf), ipproto; +-#else +- int optsize = sizeof(optbuf), ipproto; +-#endif ++ socklen_t optsize = sizeof(optbuf); ++ int ipproto; + struct protoent *ip; + int fd = request->fd; + unsigned int opt; +--- a/socket.c ++++ b/socket.c +@@ -95,11 +95,7 @@ + static struct sockaddr_in client; + static struct sockaddr_in server; + #endif +-#ifdef __GLIBC__ +- size_t len; +-#else +- int len; +-#endif ++ socklen_t len; + char buf[BUFSIZ]; + int fd = request->fd; + +@@ -430,11 +426,7 @@ + #else + struct sockaddr_in sin; + #endif +-#ifdef __GLIBC__ +- size_t size = sizeof(sin); +-#else +- int size = sizeof(sin); +-#endif ++ socklen_t size; + + /* + * Eat up the not-yet received datagram. Some systems insist on a From d6a6dcc1f8a2ace2fefce826886f584c92514c37 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 22 Apr 2018 22:25:35 -0500 Subject: [PATCH 080/369] libnfsidmap: add missing include, fix w/musl --- pkgs/development/libraries/libnfsidmap/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix index 74562ebe1326..ce21cda4a5d4 100644 --- a/pkgs/development/libraries/libnfsidmap/default.nix +++ b/pkgs/development/libraries/libnfsidmap/default.nix @@ -2,12 +2,16 @@ stdenv.mkDerivation rec { name = "libnfsidmap-0.25"; - + src = fetchurl { url = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz"; sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5"; }; + postPatch = '' + sed -i '1i#include ' cfg.h + ''; + preConfigure = '' configureFlags="--with-pluginpath=$out/lib/libnfsidmap" From 3e1f698acdef470ba557bbda902a890bdec962e9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Apr 2018 14:24:55 -0500 Subject: [PATCH 081/369] nfs-utils: patch to fix w/musl --- pkgs/os-specific/linux/nfs-utils/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 904dae55c9cb..359d18690843 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap +{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , buildEnv }: @@ -39,6 +39,18 @@ in stdenv.mkDerivation rec { ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; + patches = lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; + sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; + }) + # http://openwall.com/lists/musl/2015/08/18/10 + (fetchpatch { + url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch"; + sha256 = "1fqws9dz8n1d9a418c54r11y3w330qgy2652dpwcy96cm44sqyhf"; + }) + ]; + postPatch = '' patchShebangs tests From 4b2f3971981272b79da7f87b639ca8854a6ea89c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Mar 2018 22:06:08 +0100 Subject: [PATCH 082/369] =?UTF-8?q?gdk=5Fpixbuf:=202.36.7=20=E2=86=92=202.?= =?UTF-8?q?36.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gdk-pixbuf/default.nix | 54 +++++++++++++------ .../gdk-pixbuf/installed-tests-path.patch | 13 +++++ .../gdk-pixbuf/no-mime-sniffing.patch | 18 +++++++ 3 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6bfa6bdc2fb9..a3a6f1ff480c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, gobjectIntrospection, doCheck ? false }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: let pname = "gdk-pixbuf"; - version = "2.36.7"; - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared-mime-info files during runtime. + version = "2.36.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; + sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; }; - outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which requires access to shared-mime-info files during runtime. + # For now, we are patching the build script to avoid the dependency. + ./no-mime-sniffing.patch + + # Move installed tests to a separate output + # They are not usable at the moment, though: + # https://bugzilla.gnome.org/show_bug.cgi?id=795527 + ./installed-tests-path.patch + ]; + + outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; setupHook = ./setup-hook.sh; - enableParallelBuilding = true; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 gobjectIntrospection ]; + buildInputs = [ libX11 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + gtk-doc gobjectIntrospection makeWrapper + ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - configureFlags = "--with-libjasper --with-x11" - + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" - ; + mesonFlags = [ + "-Ddocs=true" + "-Djasper=true" + "-Dx11=true" + "-Dgir=${if gobjectIntrospection != null then "true" else "false"}" + ]; - # on darwin, tests don't link - preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' - substituteInPlace Makefile --replace "docs tests" "docs" + postPatch = '' + chmod +x build-aux/* # patchShebangs only applies to executables + patchShebangs build-aux + + substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; postInstall = @@ -42,6 +59,9 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ + $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch new file mode 100644 index 000000000000..fb3c04cf80af --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch @@ -0,0 +1,13 @@ +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -82,8 +82,8 @@ + 'aero.gif', + ] + +-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', gdk_pixbuf_api_name) +-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', gdk_pixbuf_api_name) ++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', gdk_pixbuf_api_name) ++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', gdk_pixbuf_api_name) + + install_data(test_data, install_dir: installed_test_bindir) + diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch new file mode 100644 index 000000000000..9896e25acda1 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch @@ -0,0 +1,18 @@ +--- a/meson.build ++++ b/meson.build +@@ -186,13 +186,8 @@ + gmodule_dep = dependency('gmodule-no-export-2.0') + gio_dep = dependency('gio-2.0') + +-# On non-Windows/macOS systems we always required shared-mime-info and GIO +-if host_system != 'windows' and host_system != 'darwin' +- shared_mime_dep = dependency('shared-mime-info') +- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) +-else +- shared_mime_dep = [] +-endif ++# No MIME sniffing for now ++shared_mime_dep = [] + + gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] + From 2afd3c901e4d1038ae0ba93bd3765002b997e815 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 15 Apr 2018 00:00:00 +0000 Subject: [PATCH 083/369] gcc: prepend `crossNameAddon` instead of appending it (like binutils does) --- pkgs/development/compilers/gcc/4.8/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.9/default.nix | 4 ++-- pkgs/development/compilers/gcc/5/default.nix | 4 ++-- pkgs/development/compilers/gcc/6/default.nix | 4 ++-- pkgs/development/compilers/gcc/7/default.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0a6ea59e5ac4..ff2fb0d7ff02 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -170,7 +170,7 @@ let version = "4.8.5"; "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; bootstrap = targetPlatform == hostPlatform; @@ -180,7 +180,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5dfdbd02cbfd..d0729e78e48e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -164,7 +164,7 @@ let version = "4.9.4"; "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; bootstrap = targetPlatform == hostPlatform; @@ -174,7 +174,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e42bb736676d..2990ea1cd4a4 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -168,7 +168,7 @@ let version = "5.5.0"; "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; bootstrap = targetPlatform == hostPlatform; @@ -178,7 +178,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cf71f51627c9..f8708495c82c 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -167,7 +167,7 @@ let version = "6.4.0"; "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; bootstrap = targetPlatform == hostPlatform; @@ -177,7 +177,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0b19aa95effe..74210bdcb6de 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -172,7 +172,7 @@ let version = "7.3.0"; "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; bootstrap = targetPlatform == hostPlatform; @@ -182,7 +182,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; From 97372a1104fd404c5b21e7cc0e83af0898891013 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 20:19:22 -0500 Subject: [PATCH 084/369] git: 2.16.3 -> 2.17.0... again! --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fe9f3136e58f..7f1b7305836b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.16.3"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; From 6dda53ad223686ae39d8e073f92b129a4aa688c1 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 13 Apr 2018 23:55:26 +0200 Subject: [PATCH 085/369] git: add install checks (cherry picked from commit f57873f674ebc2f6ae874407aafb98a1350ab525) --- .../git-and-tools/git/default.nix | 69 ++++++++++++++++--- .../git-and-tools/git/installCheck-path.patch | 12 ++++ 2 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7f1b7305836b..21e9a805c108 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -34,12 +34,17 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + + ## Patch + patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch ./git-send-email-honor-PATH.patch + ./installCheck-path.patch ]; postPatch = '' @@ -47,6 +52,10 @@ stdenv.mkDerivation { substituteInPlace "$x" \ --subst-var-by ssh "${openssh}/bin/ssh" done + + # Fix references to gettext introduced by ./git-sh-i18n.patch + substituteInPlace git-sh-i18n.sh \ + --subst-var-by gettext ${gettext} ''; nativeBuildInputs = [ gettext perl ] @@ -58,7 +67,6 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals withpcre2 [ pcre2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; - # required to support pthread_cancel() NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; @@ -90,15 +98,17 @@ stdenv.mkDerivation { popd ''; - # FIXME: "make check" requires Sparse; the Makefile must be tweaked - # so that `SPARSE_FLAGS' corresponds to the current architecture... - #doCheck = true; + + ## Install + + # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead. + # We need many of these files during the installCheckPhase. installFlags = "NO_INSTALL_HARDLINKS=1"; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin - mv $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin + cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin ''; postInstall = @@ -116,7 +126,7 @@ stdenv.mkDerivation { # Install contrib stuff. mkdir -p $out/share/git - mv contrib $out/share/git/ + cp -a contrib $out/share/git/ ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/ mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ @@ -149,9 +159,6 @@ stdenv.mkDerivation { perl -0777 -i -pe "$SCRIPT" \ $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse} - # Fix references to gettext. - substituteInPlace $out/libexec/git-core/git-sh-i18n \ - --subst-var-by gettext ${gettext} # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing @@ -229,7 +236,49 @@ EOF ''; - enableParallelBuilding = true; + ## InstallCheck + + doInstallCheck = true; + + installCheckTarget = "test"; + + # see also installCheckFlagsArray + installCheckFlags = "DEFAULT_TEST_TARGET=prove"; + + preInstallCheck = '' + installCheckFlagsArray+=( + GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" + GIT_TEST_INSTALLED=$out/bin + ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} + ) + + function disable_test { + local test=$1 pattern=$2 + if [ $# -eq 1 ]; then + mv t/{,skip-}$test.sh || true + else + sed -i t/$test.sh \ + -e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}" + fi + } + + # Shared permissions are forbidden in sandbox builds. + disable_test t0001-init shared + disable_test t1301-shared-repo + + # Our patched gettext never fallbacks + disable_test t0201-gettext-fallbacks + + ${stdenv.lib.optionalString (!sendEmailSupport) '' + # Disable sendmail tests + disable_test t9001-send-email + ''} + + # XXX: I failed to understand why this one fails. + # Could someone try to re-enable it on the next release ? + disable_test t1700-split-index "null sha1" + ''; + meta = { homepage = https://git-scm.com/; diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch new file mode 100644 index 000000000000..8c68fb9f186b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch @@ -0,0 +1,12 @@ +diff --git a/t/test-lib.sh b/t/test-lib.sh +--- a/t/test-lib.sh ++++ b/t/test-lib.sh +@@ -923,7 +923,7 @@ + then + GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || + error "Cannot run git from $GIT_TEST_INSTALLED." +- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH ++ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH + GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} + else # normal case, use ../bin-wrappers only unless $with_dashes: + git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" From 7438083a4d9d7b60b915d59e118f19398f177fe3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 03:20:18 +0000 Subject: [PATCH 086/369] tree-wide: disable `doCheck` and `doInstallCheck` where it fails (the trivial part) --- pkgs/applications/altcoins/bitcoin.nix | 4 ++++ pkgs/applications/audio/easytag/default.nix | 2 ++ .../graphics/ImageMagick/default.nix | 2 ++ .../networking/browsers/firefox/common.nix | 1 + .../p2p/transmission-remote-gtk/default.nix | 17 +++++++------ .../version-management/cvs/default.nix | 2 ++ .../version-management/subversion/default.nix | 2 ++ .../virtualization/qemu/default.nix | 2 ++ pkgs/data/misc/tzdata/default.nix | 2 ++ .../gnome-2/desktop/gtksourceview/default.nix | 3 +++ .../gnome-2/desktop/zenity/default.nix | 2 ++ .../gnome-2/platform/gnome-vfs/default.nix | 2 ++ pkgs/desktops/gnome-3/core/dconf/default.nix | 2 ++ pkgs/desktops/xfce/core/xfconf.nix | 3 ++- .../development/compilers/gcc/4.8/default.nix | 2 ++ .../development/compilers/gcc/4.9/default.nix | 2 ++ pkgs/development/compilers/gcc/5/default.nix | 2 ++ pkgs/development/compilers/gcc/6/default.nix | 2 ++ pkgs/development/compilers/gcc/7/default.nix | 2 ++ pkgs/development/compilers/ghc/8.2.2.nix | 1 + pkgs/development/compilers/openjdk/8.nix | 2 ++ pkgs/development/interpreters/guile/1.8.nix | 1 + pkgs/development/interpreters/guile/2.0.nix | 1 + .../interpreters/guile/default.nix | 1 + .../development/interpreters/perl/default.nix | 2 ++ .../python/cpython/2.7/default.nix | 2 ++ .../python/cpython/3.4/default.nix | 2 ++ .../python/cpython/3.5/default.nix | 2 ++ .../python/cpython/3.6/default.nix | 2 ++ .../development/interpreters/ruby/default.nix | 2 ++ .../libraries/appstream-glib/default.nix | 2 ++ .../libraries/at-spi2-atk/default.nix | 2 ++ .../libraries/at-spi2-core/default.nix | 2 ++ pkgs/development/libraries/cairo/default.nix | 2 ++ pkgs/development/libraries/celt/generic.nix | 2 ++ pkgs/development/libraries/ctpp2/default.nix | 2 ++ pkgs/development/libraries/eigen/default.nix | 8 ++++--- pkgs/development/libraries/enchant/2.x.nix | 2 ++ pkgs/development/libraries/epoxy/default.nix | 2 ++ pkgs/development/libraries/ffmpeg/generic.nix | 3 ++- .../libraries/gdk-pixbuf/default.nix | 2 +- pkgs/development/libraries/gegl/default.nix | 2 ++ pkgs/development/libraries/git2/0.25.nix | 2 ++ pkgs/development/libraries/git2/default.nix | 2 ++ pkgs/development/libraries/glibc/common.nix | 2 ++ .../gobject-introspection/default.nix | 2 ++ .../libraries/grantlee/5/default.nix | 2 ++ .../libraries/gstreamer/bad/default.nix | 3 +++ pkgs/development/libraries/gtk+/2.x.nix | 2 ++ pkgs/development/libraries/gtk+/3.x.nix | 2 ++ pkgs/development/libraries/gts/default.nix | 2 ++ pkgs/development/libraries/id3lib/default.nix | 4 +++- pkgs/development/libraries/jasper/default.nix | 2 ++ pkgs/development/libraries/kerberos/krb5.nix | 1 + pkgs/development/libraries/lcms/default.nix | 2 ++ .../libraries/libarchive/default.nix | 2 ++ .../development/libraries/libcddb/default.nix | 2 ++ pkgs/development/libraries/libcue/default.nix | 2 ++ .../libraries/libevent/default.nix | 2 ++ .../development/libraries/libical/default.nix | 2 ++ pkgs/development/libraries/libidn/default.nix | 2 ++ .../libraries/libindicator/default.nix | 2 ++ pkgs/development/libraries/liblo/default.nix | 4 +++- pkgs/development/libraries/libnih/default.nix | 4 +++- .../libraries/libomxil-bellagio/default.nix | 2 ++ .../libraries/libproxy/default.nix | 2 ++ .../development/libraries/librsvg/default.nix | 2 ++ .../development/libraries/libsoup/default.nix | 2 ++ .../libtorrent-rasterbar/generic.nix | 2 ++ .../libraries/libtoxcore/default.nix | 7 +++--- .../libraries/libuchardet/default.nix | 2 ++ .../libraries/libunwind/default.nix | 2 ++ .../libraries/libvdpau-va-gl/default.nix | 2 ++ .../libraries/libxkbcommon/default.nix | 2 ++ .../development/libraries/openexr/default.nix | 1 + .../libraries/openldap/default.nix | 2 ++ .../development/libraries/p11-kit/default.nix | 2 ++ pkgs/development/libraries/pcre2/default.nix | 2 ++ pkgs/development/libraries/popt/default.nix | 6 +++-- .../libraries/qt-4.x/4.8/default.nix | 2 ++ .../libraries/sqlcipher/default.nix | 2 ++ pkgs/development/libraries/tk/8.5.nix | 1 - pkgs/development/libraries/tk/8.6.nix | 1 - pkgs/development/libraries/tk/generic.nix | 2 ++ pkgs/development/libraries/zeromq/3.x.nix | 2 ++ pkgs/development/libraries/zeromq/4.x.nix | 2 ++ .../tools/analysis/valgrind/default.nix | 2 ++ .../tools/build-managers/cmake/default.nix | 1 + pkgs/development/tools/dcadec/default.nix | 4 +++- .../tools/documentation/doxygen/default.nix | 1 + .../tools/documentation/gtk-doc/default.nix | 3 +++ pkgs/development/tools/go2nix/default.nix | 2 ++ pkgs/development/tools/govers/default.nix | 5 +++- pkgs/development/tools/misc/autoconf/2.64.nix | 10 ++++---- .../tools/misc/autoconf/default.nix | 10 ++++---- .../tools/misc/binutils/default.nix | 2 ++ .../tools/misc/libtool/libtool2.nix | 1 + .../tools/misc/pkgconfig/default.nix | 2 +- pkgs/development/tools/parsing/bison/3.x.nix | 3 +++ pkgs/misc/cups/filters.nix | 1 + pkgs/misc/emulators/wine/winetricks.nix | 2 ++ pkgs/os-specific/linux/apparmor/default.nix | 24 +++++++++++++++---- pkgs/os-specific/linux/busybox/default.nix | 2 ++ pkgs/os-specific/linux/hwdata/default.nix | 2 ++ pkgs/os-specific/linux/kernel/perf.nix | 3 +++ pkgs/os-specific/linux/lvm2/default.nix | 2 ++ pkgs/os-specific/linux/pam/default.nix | 2 ++ pkgs/os-specific/linux/systemd/default.nix | 2 ++ pkgs/os-specific/linux/udisks/2-default.nix | 2 ++ pkgs/os-specific/linux/upower/default.nix | 2 ++ pkgs/servers/dns/bind/default.nix | 2 ++ pkgs/servers/monitoring/net-snmp/default.nix | 1 + pkgs/servers/sql/postgresql/default.nix | 2 ++ pkgs/servers/x11/xorg/overrides.nix | 4 ++++ pkgs/tools/archivers/gnutar/default.nix | 3 +++ pkgs/tools/compression/gzip/default.nix | 2 ++ pkgs/tools/filesystems/curlftpfs/default.nix | 2 ++ pkgs/tools/graphics/graphviz/base.nix | 7 ++++++ pkgs/tools/inputmethods/ibus/default.nix | 1 + pkgs/tools/misc/bogofilter/default.nix | 2 ++ pkgs/tools/misc/fontforge/default.nix | 4 +++- pkgs/tools/networking/atftp/default.nix | 2 ++ pkgs/tools/networking/curl/default.nix | 2 ++ pkgs/tools/networking/maildrop/default.nix | 2 ++ .../networking/network-manager/default.nix | 2 ++ pkgs/tools/networking/telnet/default.nix | 2 ++ pkgs/tools/security/nmap/default.nix | 2 ++ pkgs/tools/security/rhash/default.nix | 2 ++ pkgs/tools/security/sudo/default.nix | 2 ++ pkgs/tools/system/at/default.nix | 15 +++++++----- pkgs/tools/text/patchutils/default.nix | 2 ++ pkgs/tools/text/sgml/opensp/default.nix | 2 ++ pkgs/tools/typesetting/docbook2x/default.nix | 14 ++++++----- pkgs/tools/typesetting/tex/texlive/bin.nix | 2 ++ pkgs/top-level/lua-packages.nix | 2 ++ 135 files changed, 326 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 0acd616eeaff..30bbcb2c8393 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec{ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # Fails with "This application failed to start because it could not + # find or load the Qt platform plugin "minimal"" + doCheck = false; + meta = { description = "Peer-to-peer electronic cash system"; longDescription= '' diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e3263c944f45..f3bcff7a2c51 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -22,6 +22,8 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas gnome3.defaultIconTheme ]; + doCheck = false; # fails 1 out of 9 tests + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4bbc34bb7bb6..4b8d2ab291b7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { [ libX11 libXext libXt libwebp ] ; + doCheck = false; # fails 6 out of 76 tests + postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) moveToOutput "bin/*-config" "$dev" diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8e1862d7f83..5b88a61afce6 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -213,6 +213,7 @@ stdenv.mkDerivation (rec { ++ extraMakeFlags; enableParallelBuilding = true; + doCheck = false; # "--disable-tests" above preInstall = '' # The following is needed for startup cache creation on grsecurity kernels. diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index eb88d1c24c20..3ddbe9be4fc6 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -21,13 +21,16 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; + buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; - meta = with stdenv.lib; - { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = https://github.com/ajf8/transmission-remote-gtk; - license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; - }; + doCheck = false; # fails with style validation error + + meta = with stdenv.lib; { + description = "GTK remote control for the Transmission BitTorrent client"; + homepage = https://github.com/ajf8/transmission-remote-gtk; + license = licenses.gpl2; + maintainers = [ maintainers.ehmry ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 8a729c28da9a..71fb7612b339 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation { buildInputs = [ nano ]; + doCheck = false; # fails 1 of 1 tests + meta = { homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e069c39f059f..6b8ef7b88e8e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -88,6 +88,8 @@ let enableParallelBuilding = true; + doCheck = false; # fails 10 out of ~2300 tests + meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a10687141615..4463a70398ca 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer"; + doCheck = false; # tries to access /dev + postFixup = '' for exe in $out/bin/qemu-system-* ; do diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 6c8fd6229a3f..2c22bfe93b95 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; + doCheck = false; # needs more tools + installFlags = [ "ZIC=./zic-native" ]; preInstall = '' diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 9efca75e8f87..6feaf13d88ec 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -40,4 +40,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + doCheck = false; # requires X11 daemon + } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 014255785ddf..a9b692aadf51 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -13,4 +13,6 @@ stdenv.mkDerivation { buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; + + doCheck = false; # fails, tries to access the net } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4ca0e791a2a9..9d71b999d11c 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -21,4 +21,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GConf glib ]; postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; + + doCheck = false; # needs dbus daemon } diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9b1adeb953d6..400b3ea9a9b0 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ]; buildInputs = [ glib dbus-glib ]; + doCheck = false; # fails 2 out of 9 tests, maybe needs dbus daemon? + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 9aa66a1343f6..9af365c6f14d 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib libxfce4util ]; propagatedBuildInputs = [ dbus-glib ]; + doCheck = false; # requires dbus daemon + meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; @@ -26,4 +28,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0a6ea59e5ac4..c69d5fdb7160 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -375,6 +375,8 @@ stdenv.mkDerivation ({ (if profiledCompiler then "profiledbootstrap" else "bootstrap") else ""; + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv + installTargets = if stripped then "install-strip" diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5dfdbd02cbfd..a2be6e2201a6 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -383,6 +383,8 @@ stdenv.mkDerivation ({ (if profiledCompiler then "profiledbootstrap" else "bootstrap") else ""; + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv + installTargets = if stripped then "install-strip" diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e42bb736676d..7ca049f45f96 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -400,6 +400,8 @@ stdenv.mkDerivation ({ (if profiledCompiler then "profiledbootstrap" else "bootstrap") else ""; + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv + installTargets = if stripped then "install-strip" diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cf71f51627c9..0bc6094d2ec8 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -403,6 +403,8 @@ stdenv.mkDerivation ({ buildFlags = optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv + installTargets = if stripped then "install-strip" diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0b19aa95effe..7a3214f25fec 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -409,6 +409,8 @@ stdenv.mkDerivation ({ buildFlags = optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv + installTargets = if stripped then "install-strip" diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6520daa4d42c..6c19392876d1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -170,6 +170,7 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; + doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 705898a74f37..82220e3a5f5d 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -133,6 +133,8 @@ let buildFlags = [ "all" ]; + doCheck = false; # fails with "No rule to make target 'y'." + installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index cf42c9a7b683..03326f7a7592 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { # This is fixed here: # . doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 2c9aec5b6952..e670f145a5d3 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -89,6 +89,7 @@ # make check doesn't work on darwin # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook-2.0.sh; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 3d5c51dc420b..f3b36ecd9403 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -85,6 +85,7 @@ # make check doesn't work on darwin # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook-2.2.sh; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 0fd55bd8d71b..d1978c9c78e6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -105,6 +105,8 @@ let passthru.libPrefix = "lib/perl5/site_perl"; + doCheck = false; # some tests fail, expensive + # TODO: it seems like absolute paths to some coreutils is required. postInstall = '' diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 98e5b4b1da0e..5c12d7cec55c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -241,6 +241,8 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + doCheck = false; # expensive, and fails + meta = { homepage = http://python.org; description = "A high-level dynamically-typed programming language"; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 797a5be40ff3..0946f8743fbe 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -176,6 +176,8 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + doCheck = false; # expensive, and fails + meta = { homepage = http://python.org; description = "A high-level dynamically-typed programming language"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 6dbf9a09cf56..22c55d302625 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -169,6 +169,8 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + doCheck = false; # expensive, and fails + meta = { homepage = http://python.org; description = "A high-level dynamically-typed programming language"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index cc8f6228f623..950a165a2f4a 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -193,6 +193,8 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + doCheck = false; # expensive, and fails + meta = { homepage = http://python.org; description = "A high-level dynamically-typed programming language"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 0df7ec0a7959..a96320f45ae4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -136,6 +136,8 @@ let ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; + doCheck = false; # expensive, fails + preInstall = '' # Ruby installs gems here itself now. mkdir -pv "$out/${passthru.gemPath}" diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 6ad6b158826f..b09f5f67f563 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { "-Ddep11=false" ]; + doCheck = false; # fails at least 1 test + postInstall = '' moveToOutput "share/installed-tests" "$installedTests" ''; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 86f35d7f578e..1e5d003654ce 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi dbus-glib at-spi2-core libSM ]; + doCheck = false; # needs dbus daemon + meta = with stdenv.lib; { platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 6715a59579b5..b7547c293928 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; + doCheck = false; # needs dbus daemon + meta = with stdenv.lib; { platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6d7b79c0b20a..74ae4abaedf9 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -72,6 +72,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # fails + postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 9d861f2c4328..6bf7975034b5 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional liboggSupport libogg; + doCheck = false; # fails + meta = with stdenv.lib; { description = "Ultra-low delay audio codec"; homepage = http://www.celt-codec.org/; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index bb1d4458f50c..bf57bab2f222 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp ''; + doCheck = false; # fails + meta = { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 5869276a7977..4e1559e5c738 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -5,19 +5,21 @@ let in stdenv.mkDerivation { name = "eigen-${version}"; - + src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; }; - + nativeBuildInputs = [ cmake ]; + doCheck = false; # a couple of tests fail with "Child aborted" + postInstall = '' sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc ''; - + meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 458b23c33e94..8b559bd03c82 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -17,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ glib hunspell ]; propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file + doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory" + meta = with stdenv.lib; { description = "Generic spell checking library"; homepage = https://abiword.github.io/enchant/; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index e0f8e9ff8c76..d44e2650db0a 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; + doCheck = false; # needs X11 + meta = { description = "A library for handling OpenGL function pointer management"; homepage = https://github.com/anholt/libepoxy; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 985f328a22dd..87bc0a7dfb94 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -160,9 +160,10 @@ stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); - enableParallelBuilding = true; + doCheck = false; # fails + postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index a3a6f1ff480c..f9f041e955b0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). - inherit (doCheck); + inherit doCheck; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 8c93428a0780..d2987be6a3d5 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + doCheck = false; # fails 3 out of 19 tests + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix index 9743b82a14ab..6bb1de2cf348 100644 --- a/pkgs/development/libraries/git2/0.25.nix +++ b/pkgs/development/libraries/git2/0.25.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # hangs. or very expensive? + meta = { description = "The Git linkable library"; homepage = https://libgit2.github.com/; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index c0659a79fd34..2da1a9ba2a64 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; + doCheck = false; # hangs. or very expensive? + meta = with stdenv.lib; { description = "The Git linkable library"; homepage = https://libgit2.github.com/; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 31567f0049dd..01544c79b2ea 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -191,6 +191,8 @@ stdenv.mkDerivation ({ preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; + doCheck = false; # fails + meta = { homepage = http://www.gnu.org/software/libc/; description = "The GNU C Library"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f79511897fbe..f5ab5005bad4 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { cairoLib = "${getLib cairo}/lib"; }); + doCheck = false; # fails + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 3eed4f0c2e29..aa670cd4c86b 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -31,6 +31,8 @@ mkDerivation rec { setupHook = ./setup-hook.sh; + doCheck = false; # fails all the tests (ctest) + meta = with lib; { description = "Qt5 port of Django template system"; longDescription = '' diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 73cbaa0f8070..38a8260473d2 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -77,4 +77,7 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) mjpegtools; enableParallelBuilding = true; + + doCheck = false; # fails 20 out of 58 tests, expensive + } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index d35e47f312f9..9731280dedd0 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { "--disable-visibility" ]; + doCheck = false; # needs X11 + postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" # The updater is needed for nixos env and it's tiny. diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index dc6a519dfade..0a9513b0fc48 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { "--enable-wayland-backend" ]; + doCheck = false; # needs X11 + postInstall = optionalString (!stdenv.isDarwin) '' substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 770f743fd260..d0da7f8cef61 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gettext ]; + doCheck = false; # fails with "permission denied" + meta = { homepage = http://gts.sourceforge.net/; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 199ac7c902b0..dda1435c1dac 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation { ]; buildInputs = [ zlib ]; - + src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; + doCheck = false; # fails to compile + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index d374c935a2a4..bc18a13884b5 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # fails + postInstall = '' moveToOutput bin "$bin" ''; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 98073b7bbdc4..d705aa3388fd 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + doCheck = false; # fails with "No suitable file for testing purposes" meta = { description = "MIT Kerberos 5"; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 3e4f0d4265f2..63c81822ddf8 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; + doCheck = false; # fails with "Error in Linear interpolation (2p): Must be i=8000, But is n=8001" + meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index e0242802fd34..9a9c3b1fa64d 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { echo "#include " >> config.h '' else null; + doCheck = false; # fails + preFixup = '' sed -i $lib/lib/libarchive.la \ -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 6a164ef90553..591369df83f1 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + doCheck = false; # fails 3 of 5 tests with locale errors + meta = with stdenv.lib; { description = "C library to access data on a CDDB server (freedb.org)"; homepage = http://libcddb.sourceforge.net/; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index fb0f0d3d3f9c..683a5bee4c7c 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; + doCheck = false; # fails all the tests (ctest) + meta = with stdenv.lib; { description = "CUE Sheet Parser Library"; longDescription = '' diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 871437f19082..b74e64aa8490 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; + doCheck = false; # needs the net + postInstall = stdenv.lib.optionalString sslSupport '' moveToOutput "lib/libevent_openssl*" "$openssl" substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \ diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 5ba8bb667845..fd9c8dc9a5e3 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ./respect-env-tzdir.patch ]; + doCheck = false; # fails all the tests (ctest) + meta = with stdenv.lib; { homepage = https://github.com/libical/libical; description = "An Open Source implementation of the iCalendar protocols"; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 185cd2ede84c..b6f08a9206ee 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + doCheck = false; # fails + meta = { homepage = http://www.gnu.org/software/libidn/; description = "Library for internationalized domain names"; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 67936fecdf4e..a6eb0bed2bb8 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + doCheck = false; # fails 8 out of 8 tests + meta = { description = "A set of symbols and convenience functions for Ayatana indicators"; homepage = https://launchpad.net/libindicator; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index ae1d458b0d52..c72b9723dc52 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc"; }; - meta = { + doCheck = false; # fails 1 out of 3 tests + + meta = { description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = https://sourceforge.net/projects/liblo; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 4903d54b4a31..22eb8ed64dd8 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -4,7 +4,7 @@ let version = "1.0.3"; in stdenv.mkDerivation rec { name = "libnih-${version}"; - + src = fetchurl { url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus expat ]; + doCheck = false; # fails 1 of 17 test + meta = { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 28c8a915c635..68302acac29f 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patches = [ ./fedora-fixes.patch ]; + doCheck = false; # fails + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/omxil/; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index bf9e2d079cd6..02e634b22a34 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ) ''; + doCheck = false; # fails 1 out of 10 tests + meta = with stdenv.lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7ee1733f34d2..dfd45f8e4ff2 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; + doCheck = false; # fails 20 of 145 tests, very likely to be buggy + # Merge gdkpixbuf and librsvg loaders postInstall = '' mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 92e9c3662c9f..75898852a095 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "--with-gnome=${if gnomeSupport then "yes" else "no"}" ]; + doCheck = false; # fails with "no: command not found" + passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 8c85864f87a5..c112ab65a20d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # fails to link + meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d39..5967d2f4c319 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - checkInputs = [ check ]; - - checkPhase = "ctest"; + doCheck = false; # hangs, tries to access the net? # for some reason the tests are not running - it says "No tests found!!" - doCheck = true; + checkInputs = [ check ]; + checkPhase = "ctest"; meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index ea411d73b318..52bc0ac5cfd4 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; + doCheck = false; # fails all the tests (ctest) + meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = https://www.byvoid.com/zht/project/uchardet; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index b901d352808e..dbf1d7a3756f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { done ''; + doCheck = false; # fails + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 3ea0155b4f42..50b995a03568 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; + doCheck = false; # fails. needs DRI access + meta = with stdenv.lib; { homepage = https://github.com/i-rinat/libvdpau-va-gl; description = "VDPAU driver with OpenGL/VAAPI backend"; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index faeed680f3d6..3e0a2872c005 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "-Dx-locale-root=${libX11.out}/share/X11/locale" ]; + doCheck = false; # fails, needs unicode locale + meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; homepage = https://xkbcommon.org; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 8d5a6bb65a91..60ee30177c02 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; + doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 56118c9bbb2c..93ba3f15a09c 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + doCheck = false; # needs a running LDAP server + installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ]; # 1. Fixup broken libtool diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index a3d4857d57a9..9c6631862879 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + doInstallCheck = false; # probably a bug in this derivation + meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 9603e45a8b44..2e1ed060acac 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; + doCheck = false; # fails 1 of 3 tests + postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 441da25836d3..edec0b7f0699 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; - patches = if stdenv.isCygwin then [ + patches = stdenv.lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch - ] else null; + ]; + + doCheck = false; # fails meta = { description = "Command line option parsing library"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 10f892bc4d00..c37c59997f64 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -192,6 +192,8 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; + doCheck = false; # qwebframe test fails with fontconfig errors + postInstall = '' rm -rf $out/tests ''; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index ed19814be34a..fbf7d8df53e3 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ]; LDFLAGS = lib.optional (readline != null) "-lncurses"; + doCheck = false; # fails. requires tcl? + meta = with stdenv.lib; { homepage = http://sqlcipher.net/; description = "Full Database Encryption for SQLite"; diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index c3396dcdad22..141f6da14ce4 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -8,4 +8,3 @@ callPackage ./generic.nix (args // rec { }; }) - diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 666332d45fb8..cd8d42faa914 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -10,4 +10,3 @@ callPackage ./generic.nix (args // rec { patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; }) - diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 843c6157479e..34024b23e270 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + doCheck = false; # fails. can't find itself + inherit tcl; passthru = rec { diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 2252f8fe43cc..009826eef476 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; + doCheck = false; # fails all the tests (ctest) + meta = with stdenv.lib; { branch = "3"; homepage = http://www.zeromq.org; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index eea0fb727b01..333a37ba85d9 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in ''; + doCheck = false; # fails all the tests (ctest) + meta = with stdenv.lib; { branch = "4"; homepage = http://www.zeromq.org; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 875feea84d47..131533896ff9 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit"; + doCheck = false; # fails + postInstall = '' for i in $out/lib/valgrind/*.supp; do substituteInPlace $i \ diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 97c02cd9cc12..70ea1623f89c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { # CMAKE_SYSTEM_NAME, etc. configurePlatforms = [ ]; + doCheck = false; # fails meta = with stdenv.lib; { homepage = http://www.cmake.org/; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 95f992e490f4..f9ca826cd620 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { installPhase = "make PREFIX=/ DESTDIR=$out install"; + doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first." + meta = with stdenv.lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; @@ -21,4 +23,4 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 05418aa39a8c..d25f00276f62 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; enableParallelBuilding = true; + doCheck = false; # fails meta = { license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index a52afd6c39ad..5bd989a4da88 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { configureFlags = "--disable-scrollkeeper"; + doCheck = false; # requires a lot of stuff + doInstallCheck = false; # fails + passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 9a3ff192ba93..5ef12d88c06c 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -33,6 +33,8 @@ buildGoPackage rec { allowGoReference = true; + doCheck = false; # tries to access the net + meta = with stdenv.lib; { description = "Go apps packaging for Nix"; homepage = https://github.com/kamilchm/go2nix; diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index bd4dd28f599b..a80f1569329c 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "govers-${version}"; version = "20150109-${stdenv.lib.strings.substring 0 7 rev}"; rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; - + goPackagePath = "github.com/rogpeppe/govers"; src = fetchgit { @@ -14,4 +14,7 @@ buildGoPackage rec { }; dontRenameImports = true; + + doCheck = false; # fails, silently + } diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 9e70833e008f..31df050d5f80 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -23,10 +23,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preCheck = - # Make the Autotest test suite run in parallel. - '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" - ''; + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + doInstallCheck = false; # fails meta = { homepage = http://www.gnu.org/software/autoconf/; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 579dea33df47..e9ea0ea1ea4f 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -24,10 +24,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preCheck = - # Make the Autotest test suite run in parallel. - '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" - ''; + # Make the Autotest test suite run in parallel. + preCheck ='' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + doInstallCheck = false; # fails meta = { homepage = http://www.gnu.org/software/autoconf/; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0829139595d7..25f78923e9c2 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { "--enable-fix-loongson2f-nop" ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; + doCheck = false; # fails + enableParallelBuilding = true; passthru = { diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 85821ee2089d..d1d35d9a4824 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { # XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which # leads to the failure of a number of tests. doCheck = false; + doInstallCheck = false; # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 15d00b0a2a52..219281f4ec17 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { "ac_cv_func_posix_getgrgid_r=yes" ]; + doCheck = false; # fails postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file @@ -42,4 +43,3 @@ stdenv.mkDerivation rec { }; } - diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 2b0c14ea8321..9c75e93bb1c1 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; + doCheck = false; # fails + doInstallCheck = false; # fails + meta = { homepage = http://www.gnu.org/software/bison/; description = "Yacc-compatible parser generator"; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 02a7ce219c4b..2195cf7d2a39 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + doCheck = false; # fails 4 out of 6 tests meta = { homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index f5f8d6a5f107..76606edf53c3 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + doCheck = false; # requires "bashate" + postInstall = '' sed -i \ -e '2i PATH="${pathAdd}:$PATH"' \ diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index c8e58dfbf6fb..cbbe4d5ca462 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -36,9 +36,7 @@ let substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; - # use 'if c then x else null' to avoid rebuilding - # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - patches = if stdenv.hostPlatform.isMusl then [ + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch"; @@ -55,7 +53,11 @@ let sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) - ] else null; + ]; + + # Set to `true` after the next FIXME gets fixed or this gets some + # common derivation infra. Too much copy-paste to fix one by one. + doCheck = false; # FIXME: convert these to a single multiple-outputs package? @@ -99,6 +101,8 @@ let mv $out/lib/python* $python/lib/ ''; + inherit doCheck; + meta = apparmor-meta "library"; }; @@ -131,6 +135,8 @@ let done ''; + inherit doCheck; + meta = apparmor-meta "user-land utilities"; }; @@ -154,6 +160,8 @@ let makeFlags = ''LANGS= USE_SYSTEM=1''; installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin''; + inherit doCheck; + meta = apparmor-meta "binary user-land utilities"; }; @@ -177,6 +185,8 @@ let makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include''; installFlags = ''DESTDIR=$(out) DISTRO=unknown''; + inherit doCheck; + meta = apparmor-meta "rule parser"; }; @@ -192,6 +202,8 @@ let makeFlags = ''USE_SYSTEM=1''; installFlags = ''DESTDIR=$(out)''; + inherit doCheck; + meta = apparmor-meta "PAM service"; }; @@ -204,6 +216,8 @@ let postPatch = "cd ./profiles"; installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles''; + inherit doCheck; + meta = apparmor-meta "profiles"; }; @@ -218,6 +232,8 @@ let cp -R ./kernel-patches/* "$out" ''; + inherit doCheck; + meta = apparmor-meta "kernel patches"; }; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b844bf72d82a..ab75d38ba716 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -98,6 +98,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # tries to access the net + meta = with stdenv.lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = https://busybox.net/; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 15b3903ddd1a..54a92d784e2a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { configureFlags = "--datadir=$(prefix)/data"; + doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) + meta = { homepage = https://github.com/vcrhonek/hwdata; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a6f399c0fba4..bbef2bd19aea 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation { "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" ]; + doCheck = false; # requires "sparse" + doInstallCheck = false; # same + separateDebugInfo = true; installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index bd84e121a7d6..8cda636e987d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation { }) ]; + doCheck = false; # requires root + # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 5f92dfcc8390..1d380063f884 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -70,6 +70,8 @@ stdenv.mkDerivation rec { sed -e 's/pam_rhosts//g' -i modules/Makefile.in ''; + doCheck = false; # fails + meta = { homepage = http://ftp.kernel.org/pub/linux/libs/pam/; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c9514883093..63ed5a5cbb3f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -170,6 +170,8 @@ in stdenv.mkDerivation rec { "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" ]; + doCheck = false; # fails a bunch of tests + postInstall = '' # sysinit.target: Don't depend on # systemd-tmpfiles-setup.service. This interferes with NixOps's diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 1c8e429c9455..a057cb3c101e 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + doCheck = false; # fails + meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 713ef974f9fb..d62038c7b0b0 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lgcc_s"; + doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" + installFlags = "historydir=$(TMPDIR)/foo"; meta = { diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4002c6b3542f..1aa487055e27 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { done ''; + doCheck = false; # requires root and the net + meta = { homepage = http://www.isc.org/software/bind; description = "Domain name server"; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 77dcfa43c43f..a6b738270a9a 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ file perl unzip openssl ]; enableParallelBuilding = true; + doCheck = false; # fails postInstall = '' for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a2093962ea93..5d348c129437 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -75,6 +75,8 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; + doInstallCheck = false; # needs a running daemon? + disallowedReferences = [ stdenv.cc ]; passthru = { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5efa4bfcfd5d..5d4c528bb0b7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -582,6 +582,10 @@ in nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; }; + xauth = attrs: attrs // { + doCheck = false; # fails + }; + xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; configureFlags = "--with-cursordir=$(out)/share/icons"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 4677ee45afb2..7532cd899cc6 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { sed -i gnu/fpending.h -e 's,include ,,' '' else null; + doCheck = false; # fails + doInstallCheck = false; # fails + meta = { homepage = http://www.gnu.org/software/tar/; description = "GNU implementation of the `tar' archiver"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cfe41d3dfe7a..c39216f1e0cc 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # In stdenv-linux, prevent a dependency on bootstrap-tools. makeFlags = "SHELL=/bin/sh GREP=grep"; + doCheck = false; # fails + meta = { homepage = https://www.gnu.org/software/gzip/; description = "GNU zip compression program"; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 8797c21aa235..4af7c9fb8c26 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [fuse curl glib zlib]; + doCheck = false; # fails, doesn't work well too, btw + meta = { platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index b360f9a34503..2fa4bb90a8ea 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -43,6 +43,13 @@ stdenv.mkDerivation rec { done ''; + # '' + # substituteInPlace rtest/rtest.sh \ + # --replace "/bin/ksh" "${mksh}/bin/mksh" + # ''; + + doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs + preAutoreconf = "./autogen.sh"; postFixup = optionalString (xorg != null) '' diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 59ddab7294f5..d3507b57cbd0 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # requires X11 daemon doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index c192e9f42ab1..f86d44c580de 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ flex db ]; + doCheck = false; # needs "y" tool + meta = { homepage = http://bogofilter.sourceforge.net/; longDescription = '' diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index c7fd29da8ac4..0f6fb38ef3bc 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation rec { ./bootstrap --skip-git --gnulib-srcdir=./gnulib ''; + doCheck = false; # tries to wget some fonts + doInstallCheck = doCheck; + postInstall = # get rid of the runtime dependency on python lib.optionalString (!withPython) '' @@ -72,4 +75,3 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; }; } - diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 23355d61bea8..068e68875468 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; + doCheck = false; # fails + meta = { description = "Advanced tftp tools"; maintainers = [ lib.maintainers.raskin ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 32a8a7888484..4a1ff7f1798a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { CXX = "c++"; CXXCPP = "c++ -E"; + doCheck = false; # expensive, fails + postInstall = '' moveToOutput bin/curl-config "$dev" sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 950a6e310ebd..134e9b6df76d 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot + doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)" + meta = with stdenv.lib; { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ebe40c6192cd..9a129f522134 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -85,6 +85,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; + doCheck = false; # requires /sys, the net + preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) ''; diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index 3a5117653c83..fc907777324c 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { buildInputs = [ncurses]; + doInstallCheck = false; # fails + meta = { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index a81fffa20357..4c6df817a72d 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -53,6 +53,8 @@ in stdenv.mkDerivation rec { libX11 gtk2 pygtk pysqlite pygobject2 pycairo ]; + doCheck = false; # fails 3 tests, probably needs the net + meta = { description = "A free and open source utility for network discovery and security auditing"; homepage = http://www.nmap.org; diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 485b34cff88d..22d7e93fe476 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # configure script is not autotools-based, doesn't support these options configurePlatforms = [ ]; + doCheck = false; # fails + installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ]; postInstall = "make -C librhash install-headers"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 85dba08255da..bcafefb72c95 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = false; # needs root + postInstall = '' rm -f $out/share/doc/sudo/ChangeLog diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index eda2197b9f61..baac00bfa763 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -33,12 +33,15 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "test -d /var/run" "true" ''; - configureFlags = - '' - --with-etcdir=/etc/at - --with-jobdir=/var/spool/atjobs --with-atspool=/var/spool/atspool - --with-daemon_username=atd --with-daemon_groupname=atd - ''; + configureFlags = [ + "--with-etcdir=/etc/at" + "--with-jobdir=/var/spool/atjobs" + "--with-atspool=/var/spool/atspool" + "--with-daemon_username=atd" + "--with-daemon_groupname=atd" + ]; + + doCheck = false; # need "prove" tool # Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or # else we get permission errors (on NixOS). "batch" is a shell script, so diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index 75922a6c830c..238676020e8b 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + doCheck = false; # fails + meta = with stdenv.lib; { description = "Tools to manipulate patch files"; homepage = http://cyberelk.net/tim/software/patchutils; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index bfd150eefdaf..27fa7bb91a8f 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ] ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; + doCheck = false; # fails + meta = { description = "A suite of SGML/XML processing tools"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 9c802a1187a8..e38e4a1f0596 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "docbook2X-0.8.8"; - + src = fetchurl { url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { --replace '${"\$" + "{prefix}"}' "$out" ''; + doCheck = false; # fails a lot of tests + postInstall = '' perlPrograms="db2x_manxml db2x_texixml db2x_xsltproc docbook2man docbook2texi"; @@ -34,12 +36,12 @@ stdenv.mkDerivation rec { do # XXX: We work around the fact that `wrapProgram' doesn't support # spaces below by inserting escaped backslashes. - wrapProgram $out/bin/$i --prefix PERL5LIB : \ + wrapProgram $out/bin/$i --prefix PERL5LIB : \ "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \ - --prefix PERL5LIB : \ - "${XMLNamespaceSupport}/lib/perl5/site_perl" \ - --prefix XML_CATALOG_FILES "\ " \ - "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" + --prefix PERL5LIB : \ + "${XMLNamespaceSupport}/lib/perl5/site_perl" \ + --prefix XML_CATALOG_FILES "\ " \ + "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" done wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \ diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 92778c5eed1c..6555c999d7f2 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -204,6 +204,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2018 is out? enableParallelBuilding = true; + doCheck = false; # fails + # now distribute stuff into outputs, roughly as upstream TL # (uninteresting stuff remains in $out, typically duplicates from `core`) outputs = [ "out" "metafont" "metapost" "luatex" "xetex" ]; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3da443098037..97424a10160b 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -438,6 +438,8 @@ let ); ''; + doCheck = false; # fails to find itself + installTargets = [ "install" "install-unix" ]; meta = with stdenv.lib; { From 70a5ba0ac9b4f9a2bd73bafe954f2bc070ee14ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 17:12:06 +0200 Subject: [PATCH 087/369] gdk_pixbuf: fix installedTests --- .../libraries/gdk-pixbuf/default.nix | 29 +++++++++++++++---- .../gdk-pixbuf/installed-tests-path.patch | 12 ++++---- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f9f041e955b0..97a979945c1d 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: @@ -9,9 +9,15 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; + # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball + # src = fetchurl { + # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; + # }; + src = fetchgit { + url = https://git.gnome.org/browse/gdk-pixbuf; + rev = version; + sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv"; }; patches = [ @@ -20,9 +26,20 @@ stdenv.mkDerivation rec { # For now, we are patching the build script to avoid the dependency. ./no-mime-sniffing.patch - # Move installed tests to a separate output - # They are not usable at the moment, though: + # Fix installed tests with meson # https://bugzilla.gnome.org/show_bug.cgi?id=795527 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371381; + sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn"; + }) + + # Add missing test file bug753605-atsize.jpg + (fetchpatch { + url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7; + sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; + }) + + # Move installed tests to a separate output ./installed-tests-path.patch ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch index fb3c04cf80af..1da2b0a10dcd 100644 --- a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch +++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch @@ -1,13 +1,13 @@ --- a/tests/meson.build +++ b/tests/meson.build -@@ -82,8 +82,8 @@ +@@ -85,8 +85,8 @@ 'aero.gif', ] --installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', gdk_pixbuf_api_name) --installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', gdk_pixbuf_api_name) -+installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', gdk_pixbuf_api_name) -+installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', gdk_pixbuf_api_name) +-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) +-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name()) ++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name()) ++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name()) install_data(test_data, install_dir: installed_test_bindir) - + install_subdir('test-images', install_dir: installed_test_bindir) From ad589329e71cde816a7ec8f2779ff368ce51a622 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 18:35:33 +0200 Subject: [PATCH 088/369] nixos/release.nix: add tests.gdk-pixbuf --- nixos/release.nix | 1 + nixos/tests/gdk-pixbuf.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nixos/tests/gdk-pixbuf.nix diff --git a/nixos/release.nix b/nixos/release.nix index 5d3c3de08dac..a54443f92cf1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -285,6 +285,7 @@ in rec { tests.firewall = callTest tests/firewall.nix {}; tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; + tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gjs = callTest tests/gjs.nix {}; diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix new file mode 100644 index 000000000000..b20f61b5ffe2 --- /dev/null +++ b/nixos/tests/gdk-pixbuf.nix @@ -0,0 +1,19 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: { + name = "gdk-pixbuf"; + + meta = { + maintainers = pkgs.gdk_pixbuf.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ]; + + virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner"); + ''; +}) From a809fdc8e1b0c1d49d40815d9bac0de27ddab5f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 1 Apr 2018 00:00:00 +0000 Subject: [PATCH 089/369] stdenv: linux: stop recompiling `texinfo` This makes stdenv bootstraping a bit more efficient. We don't recompile most of other stuff used in bootstrapping stdenv too. --- pkgs/stdenv/linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b5..5d1201b7f5d5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -351,6 +351,7 @@ in concatMap (p: [ (getBin p) (getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl + texinfo ] # Library dependencies ++ map getLib ( @@ -370,7 +371,7 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre; + attr acl paxctl zlib pcre texinfo; ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. From 3c7f6572cea284ee792dcd31ea5be185734c21b1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 1 Apr 2018 00:00:01 +0000 Subject: [PATCH 090/369] bash: simplify expression, add `withDocs` option --- pkgs/shells/bash/4.4.nix | 53 ++++++------- .../bash/cygwin-bash-4.4.11-2.src.patch | 76 +++++++++---------- pkgs/top-level/all-packages.nix | 10 +-- 3 files changed, 67 insertions(+), 72 deletions(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 04a036982893..72ce29bf3f2b 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,37 +1,33 @@ { stdenv, buildPackages -, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf +, fetchurl, binutils ? null, bison, autoconf , buildPlatform, hostPlatform -, interactive ? false + +# patch for cygwin requires readline support +, interactive ? stdenv.isCygwin, readline70 ? null +, withDocs ? false, texinfo ? null +, self }: +with stdenv.lib; + assert interactive -> readline70 != null; +assert withDocs -> texinfo != null; assert hostPlatform.isDarwin -> binutils != null; let - version = "4.4"; - realName = "bash-${version}"; - shortName = "bash44"; - sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq"; - - upstreamPatches = - let - patch = nr: sha256: - fetchurl { - url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}"; - inherit sha256; - }; - in - import ./bash-4.4-patches.nix patch; - - inherit (stdenv.lib) optional optionals optionalString; + upstreamPatches = import ./bash-4.4-patches.nix (nr: sha256: fetchurl { + url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}"; + inherit sha256; + }); in stdenv.mkDerivation rec { - name = "${realName}-p${toString (builtins.length upstreamPatches)}"; + name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; + version = "4.4"; src = fetchurl { - url = "mirror://gnu/bash/${realName}.tar.gz"; - inherit sha256; + url = "mirror://gnu/bash/bash-${version}.tar.gz"; + sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq"; }; hardeningDisable = [ "format" ]; @@ -50,18 +46,19 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; patches = upstreamPatches + ++ optional hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html - ++ optional (hostPlatform.libc == "musl") (fetchurl { + ++ optional hostPlatform.isMusl (fetchurl { url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch"; sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1"; - }); - - postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}"; + }); configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") ] ++ optionals (hostPlatform != buildPlatform) [ - "bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" + "bash_cv_job_control_missing=nomissing" + "bash_cv_sys_named_pipes=nomissing" + "bash_cv_getcwd_malloc=yes" ] ++ optionals hostPlatform.isCygwin [ "--without-libintl-prefix --without-libiconv-prefix" "--with-installed-readline" @@ -75,8 +72,8 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [bison] - ++ optional (texinfo != null) texinfo + nativeBuildInputs = [ bison ] + ++ optional withDocs texinfo ++ optional hostPlatform.isDarwin binutils ++ optional (hostPlatform.libc == "musl") autoconf; diff --git a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch index c854e8828aea..488373109625 100644 --- a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch +++ b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch @@ -1,5 +1,5 @@ ---- origsrc/bash-4.4/bashline.c 2017-01-23 13:28:06.955247200 -0600 -+++ src/bash-4.4/bashline.c 2017-01-23 13:55:07.992877600 -0600 +--- bashline.c 2017-01-23 13:28:06.955247200 -0600 ++++ bashline.c 2017-01-23 13:55:07.992877600 -0600 @@ -76,6 +76,16 @@ # include "pcomplete.h" #endif @@ -104,8 +104,8 @@ r = file_isdir (fn); free (fn); ---- origsrc/bash-4.4/builtins/read.def 2017-01-23 13:28:07.017686500 -0600 -+++ src/bash-4.4/builtins/read.def 2017-01-23 13:55:07.992877600 -0600 +--- builtins/read.def 2017-01-23 13:28:07.017686500 -0600 ++++ builtins/read.def 2017-01-23 13:55:07.992877600 -0600 @@ -85,7 +85,6 @@ $END #ifdef __CYGWIN__ @@ -140,8 +140,8 @@ if ((skip_ctlesc == 0 && c == CTLESC) || (skip_ctlnul == 0 && c == CTLNUL)) { saw_escape++; ---- origsrc/bash-4.4/builtins/set.def 2016-06-02 19:10:10.000000000 -0500 -+++ src/bash-4.4/builtins/set.def 2017-01-23 13:55:07.992877600 -0600 +--- builtins/set.def 2016-06-02 19:10:10.000000000 -0500 ++++ builtins/set.def 2017-01-23 13:55:07.992877600 -0600 @@ -56,6 +56,13 @@ extern int dont_save_function_defs; #if defined (READLINE) extern int no_line_editing; @@ -258,8 +258,8 @@ free (vname); } } ---- origsrc/bash-4.4/builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500 -+++ src/bash-4.4/builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600 +--- builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500 ++++ builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600 @@ -92,6 +92,10 @@ extern int glob_asciirange; extern int lastpipe_opt; extern int inherit_errexit; @@ -281,8 +281,8 @@ #if defined (READLINE) { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, ---- origsrc/bash-4.4/config-top.h 2016-05-19 13:34:02.000000000 -0500 -+++ src/bash-4.4/config-top.h 2017-01-23 13:55:07.992877600 -0600 +--- config-top.h 2016-05-19 13:34:02.000000000 -0500 ++++ config-top.h 2017-01-23 13:55:07.992877600 -0600 @@ -87,10 +87,10 @@ #define DEFAULT_BASHRC "~/.bashrc" @@ -305,8 +305,8 @@ /* Define if you want the case-capitalizing operators (~[~]) and the `capcase' variable attribute (declare -c). */ ---- origsrc/bash-4.4/doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600 -+++ src/bash-4.4/doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600 +--- doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600 ++++ doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600 @@ -189,7 +189,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) $(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi @@ -329,8 +329,8 @@ -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info # run install-info if it is present to update the info directory ---- origsrc/bash-4.4/doc/bash.1 2016-08-26 08:45:17.000000000 -0500 -+++ src/bash-4.4/doc/bash.1 2017-01-23 13:55:08.008447700 -0600 +--- doc/bash.1 2016-08-26 08:45:17.000000000 -0500 ++++ doc/bash.1 2017-01-23 13:55:08.008447700 -0600 @@ -9607,6 +9607,10 @@ filenames. This variable is set by default, which is the default bash behavior in versions through 4.2. @@ -342,8 +342,8 @@ .B direxpand If set, .B bash ---- origsrc/bash-4.4/doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500 -+++ src/bash-4.4/doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600 +--- doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500 ++++ doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600 @@ -5123,6 +5123,10 @@ filenames. This variable is set by default, which is the default Bash behavior in versions through 4.2. @@ -355,8 +355,8 @@ @item direxpand If set, Bash replaces directory names with the results of word expansion when performing ---- origsrc/bash-4.4/doc/builtins.1 2012-02-21 13:32:05.000000000 -0600 -+++ src/bash-4.4/doc/builtins.1 2017-01-23 13:55:08.008447700 -0600 +--- doc/builtins.1 2012-02-21 13:32:05.000000000 -0600 ++++ doc/builtins.1 2017-01-23 13:55:08.008447700 -0600 @@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) .SH BASH BUILTIN COMMANDS @@ -365,8 +365,8 @@ +.so man1/bash.1 .SH SEE ALSO bash(1), sh(1) ---- origsrc/bash-4.4/general.c 2016-08-11 10:16:56.000000000 -0500 -+++ src/bash-4.4/general.c 2017-01-23 13:55:08.008447700 -0600 +--- general.c 2016-08-11 10:16:56.000000000 -0500 ++++ general.c 2017-01-23 13:55:08.008447700 -0600 @@ -48,6 +48,10 @@ #include @@ -388,8 +388,8 @@ result = savestring (pathbuf); } #else ---- origsrc/bash-4.4/input.c 2015-09-24 18:49:23.000000000 -0500 -+++ src/bash-4.4/input.c 2017-01-23 13:55:08.008447700 -0600 +--- input.c 2015-09-24 18:49:23.000000000 -0500 ++++ input.c 2017-01-23 13:55:08.008447700 -0600 @@ -44,6 +44,10 @@ #include "quit.h" #include "trap.h" @@ -421,8 +421,8 @@ #if !defined (DJGPP) return (bufstream_getc (buffers[bash_input.location.buffered_fd])); #else ---- origsrc/bash-4.4/lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500 -+++ src/bash-4.4/lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600 +--- lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500 ++++ lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600 @@ -35,6 +35,7 @@ #include #include @@ -453,8 +453,8 @@ double_slash_path = DOUBLE_SLASH (workpath); qbase += double_slash_path; ---- origsrc/bash-4.4/lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500 -+++ src/bash-4.4/lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600 +--- lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500 ++++ lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600 @@ -101,7 +101,7 @@ get_tmpdir (flags) if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) tdir = 0; @@ -464,8 +464,8 @@ tdir = get_sys_tmpdir (); #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) ---- origsrc/bash-4.4/mksyntax.c 2012-07-29 18:48:38.000000000 -0500 -+++ src/bash-4.4/mksyntax.c 2017-01-23 13:55:08.008447700 -0600 +--- mksyntax.c 2012-07-29 18:48:38.000000000 -0500 ++++ mksyntax.c 2017-01-23 13:55:08.008447700 -0600 @@ -29,13 +29,13 @@ #ifdef HAVE_UNISTD_H @@ -483,8 +483,8 @@ #ifndef errno extern int errno; #endif ---- origsrc/bash-4.4/parse.y 2016-09-11 10:31:46.000000000 -0500 -+++ src/bash-4.4/parse.y 2017-01-23 13:55:08.008447700 -0600 +--- parse.y 2016-09-11 10:31:46.000000000 -0500 ++++ parse.y 2017-01-23 13:55:08.008447700 -0600 @@ -1539,14 +1539,20 @@ yy_string_get () string = bash_input.location.string; @@ -509,8 +509,8 @@ } static int ---- origsrc/bash-4.4/subst.c 2017-01-23 13:28:06.955247200 -0600 -+++ src/bash-4.4/subst.c 2017-01-23 13:55:08.008447700 -0600 +--- subst.c 2017-01-23 13:28:06.955247200 -0600 ++++ subst.c 2017-01-23 13:55:08.008447700 -0600 @@ -43,6 +43,7 @@ #include "posixstat.h" #include "bashintl.h" @@ -562,8 +562,8 @@ old_pid = last_made_pid; #if defined (JOB_CONTROL) old_pipeline_pgrp = pipeline_pgrp; ---- origsrc/bash-4.4/support/bashversion.c 2008-09-09 08:31:53.000000000 -0500 -+++ src/bash-4.4/support/bashversion.c 2017-01-23 13:55:08.024037200 -0600 +--- support/bashversion.c 2008-09-09 08:31:53.000000000 -0500 ++++ support/bashversion.c 2017-01-23 13:55:08.024037200 -0600 @@ -26,6 +26,9 @@ #if defined (HAVE_UNISTD_H) @@ -584,8 +584,8 @@ extern char *dist_version; extern int patch_level; ---- origsrc/bash-4.4/support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500 -+++ src/bash-4.4/support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600 +--- support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500 ++++ support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600 @@ -29,7 +29,7 @@ source_dir="." while [ $# -gt 0 ]; do case "$1" in @@ -595,8 +595,8 @@ -s) shift; rel_status=$1; shift ;; -p) shift; patch_level=$1; shift ;; -d) shift; dist_version=$1; shift ;; ---- origsrc/bash-4.4/variables.c 2016-06-15 15:05:52.000000000 -0500 -+++ src/bash-4.4/variables.c 2017-01-23 13:55:08.024037200 -0600 +--- variables.c 2016-06-15 15:05:52.000000000 -0500 ++++ variables.c 2017-01-23 13:55:08.024037200 -0600 @@ -5239,6 +5239,7 @@ sv_winsize (name) /* Update the value of HOME in the export environment so tilde expansion will work on cygwin. */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92927bbf9d91..550e76a14589 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5841,15 +5841,13 @@ with pkgs; runtimeShell = "${runtimeShellPackage}/bin/bash"; runtimeShellPackage = bash; - bash = lowPrio (callPackage ../shells/bash/4.4.nix { - texinfo = null; - interactive = stdenv.isCygwin; # patch for cygwin requires readline support - }); + bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix { + bashInteractive = callPackage ../shells/bash/4.4.nix { interactive = true; - }); + withDocs = true; + }; bash-completion = callPackage ../shells/bash/bash-completion { }; From d531a1e96784cc64d17cef1892d1f747c7c02b10 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 1 Apr 2018 00:00:02 +0000 Subject: [PATCH 091/369] texinfo: merge expressions for 5.2 and 6.5 Also add me as a maintainer. --- pkgs/development/tools/misc/texinfo/4.13a.nix | 33 ++-------- pkgs/development/tools/misc/texinfo/5.2.nix | 56 +--------------- pkgs/development/tools/misc/texinfo/6.5.nix | 58 +---------------- .../development/tools/misc/texinfo/common.nix | 64 +++++++++++++++++++ 4 files changed, 75 insertions(+), 136 deletions(-) create mode 100644 pkgs/development/tools/misc/texinfo/common.nix diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 2e0d020688ea..63e5bea19d74 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, ncurses, lzma }: +{ stdenv, fetchurl, texinfo, ncurses, lzma }: stdenv.mkDerivation rec { - name = "texinfo-4.13a"; + name = "texinfo-${version}"; + version = "4.13a"; src = fetchurl { - url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma"; + url = "mirror://gnu/texinfo/${name}.tar.lzma"; sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; }; @@ -14,29 +15,5 @@ stdenv.mkDerivation rec { # Disabled because we don't have zdiff in the stdenv bootstrap. #doCheck = true; - meta = { - description = "The GNU documentation system"; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; - - license = stdenv.lib.licenses.gpl3Plus; - - homepage = http://www.gnu.org/software/texinfo/; - branch = "4.13"; - platforms = stdenv.lib.platforms.unix; - }; + meta = texinfo.meta // { branch = version; }; } diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 0feb4b943df3..d395494984d5 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,54 +1,4 @@ -{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "texinfo-5.2"; - - src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; - }; - - # We need a native compiler to build perl XS extensions - # when cross-compiling. - depsBuildBuild = [ buildPackages.stdenv.cc perl ]; - - buildInputs = [ perl xz.bin ] - ++ optional interactive ncurses - ++ optional doCheck procps; # for tests - - configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] - ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; - - doCheck = !stdenv.isDarwin; - - meta = { - homepage = http://www.gnu.org/software/texinfo/; - description = "The GNU documentation system"; - license = licenses.gpl3Plus; - platforms = platforms.all; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; - branch = "5.2"; - }; +import ./common.nix { + version = "5.2"; + sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; } diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix index afa7e9a0a206..34596f306581 100644 --- a/pkgs/development/tools/misc/texinfo/6.5.nix +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -1,56 +1,4 @@ -{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "texinfo-6.5"; - - src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; - }; - - # We need a native compiler to build perl XS extensions - # when cross-compiling. - depsBuildBuild = [ buildPackages.stdenv.cc perl ]; - - buildInputs = [ xz ] - ++ optionals stdenv.isSunOS [ libiconv gawk ] - ++ optional interactive ncurses - ++ optional doCheck procps; # for tests - - configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] - ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; - - doCheck = interactive # simplify bootstrapping - && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; - - meta = with stdenv.lib; { - homepage = http://www.gnu.org/software/texinfo/; - description = "The GNU documentation system"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; - }; +import ./common.nix { + version = "6.5"; + sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; } diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix new file mode 100644 index 000000000000..12534297ff3d --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -0,0 +1,64 @@ +{ version, sha256 }: + +{ stdenv, buildPackages, fetchurl, perl, xz + +# we are a dependency of gcc, this simplifies bootstraping +, interactive ? false, ncurses, procps +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "texinfo-${optionalString interactive "interactive-"}${version}"; + inherit version; + + src = fetchurl { + url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz"; + inherit sha256; + }; + + # We need a native compiler to build perl XS extensions + # when cross-compiling. + depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + + buildInputs = [ xz.bin ] + ++ optionals stdenv.isSunOS [ libiconv gawk ] + ++ optionals interactive [ ncurses procps ]; + + configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + + preInstall = '' + installFlags="TEXMF=$out/texmf-dist"; + installTargets="install install-tex"; + ''; + + doCheck = interactive + && !stdenv.isDarwin + && !stdenv.isSunOS; # flaky + + meta = { + homepage = http://www.gnu.org/software/texinfo/; + description = "The GNU documentation system"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ vrthra oxij ]; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + branch = version; + }; +} From ad98c36f1b1b681db433a6cb798e7ec21e8da33c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:01 +0000 Subject: [PATCH 092/369] stdenv: generic/setup.sh: simplify buildPhase Makefile check --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d7a4781448ae..17aaa5b798ff 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -968,7 +968,7 @@ buildPhase() { # set to empty if unset : ${makeFlags=} - if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 From e9e06888edc0f79055e0f4e59867a1426d960895 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:02 +0000 Subject: [PATCH 093/369] stdenv: generic/setup.sh: cleanup installPhase --- pkgs/stdenv/generic/setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 17aaa5b798ff..bb9e32486674 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1018,14 +1018,12 @@ installPhase() { mkdir -p "$prefix" fi - installTargets="${installTargets:-install}" - # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $installTargets $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} + ${installTargets:-install} ) echoCmd 'install flags' "${flagsArray[@]}" From 50af975d8595c7fce05bc8bbd9db93e3c4cece25 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:04 +0000 Subject: [PATCH 094/369] stdenv: implement `checkTarget` and `installCheckTarget` autodetection --- pkgs/stdenv/generic/setup.sh | 74 +++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index bb9e32486674..c85f05d9a919 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -971,6 +971,8 @@ buildPhase() { if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else + foundMakefile=1 + # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 makeFlags="SHELL=$SHELL $makeFlags" @@ -994,18 +996,38 @@ buildPhase() { checkPhase() { runHook preCheck - # Old bash empty array hack - # shellcheck disable=SC2086 - local flagsArray=( - ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} - ${checkTarget:-check} - ) + if [[ -z "${foundMakefile:-}" ]]; then + echo "no Makefile or custom buildPhase, doing nothing" + runHook postCheck + return + fi - echoCmd 'check flags' "${flagsArray[@]}" - make ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray + if [[ -z "${checkTarget:-}" ]]; then + #TODO(@oxij): should flagsArray influence make -n? + if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then + checkTarget=check + elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then + checkTarget=test + fi + fi + + if [[ -z "${checkTarget:-}" ]]; then + echo "no check/test target in ${makefile:-Makefile}, doing nothing" + else + # Old bash empty array hack + # shellcheck disable=SC2086 + local flagsArray=( + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} + ${checkTarget} + ) + + echoCmd 'check flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + + unset flagsArray + fi runHook postCheck } @@ -1104,18 +1126,26 @@ fixupPhase() { installCheckPhase() { runHook preInstallCheck - # Old bash empty array hack - # shellcheck disable=SC2086 - local flagsArray=( - ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} - ${installCheckTarget:-installcheck} - ) + if [[ -z "${foundMakefile:-}" ]]; then + echo "no Makefile or custom buildPhase, doing nothing" + #TODO(@oxij): should flagsArray influence make -n? + elif [[ -z "${installCheckTarget:-}" ]] \ + && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then + echo "no installcheck target in ${makefile:-Makefile}, doing nothing" + else + # Old bash empty array hack + # shellcheck disable=SC2086 + local flagsArray=( + ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} + ${installCheckTarget:-installcheck} + ) - echoCmd 'installcheck flags' "${flagsArray[@]}" - make ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray + echoCmd 'installcheck flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray + fi runHook postInstallCheck } From b11f3bc8e33232f0adbf3489ceae1b739b8699ba Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 19:42:35 -0500 Subject: [PATCH 095/369] cpython: don't use lchmod() on Linux, fix w/musl upstream issue: https://bugs.python.org/issue31940 There are two PR's proposed to fix this, but both seem to be stalling waiting for review. I previously used what appears to be the favored of the two approaches[1] to fix this, with plan of keeping it musl-only until PR was merged. However, while writing up a commit message explaining the problem and why it needed fixing... I investigated a bit and found it increasingly hard to justify anything other than ... simply not using lchmod. Here's what I found: * lchmod is non-POSIX, seems BSD-only these days * Functionality of lchmod isn't supported on Linux * best scenario on Linux would be an error * POSIX does provide lchmod-esque functionality with fchmodat(), which AFAICT is generally preferred. * Python intentionally overlooks fchmodat()[2] electing instead to use lchmod() behavior as a proxy for whether fchmodat() "works". I'm not sure I follow their reasoning... * both glibc and musl provide lchmod impls: * glibc returns ENOSYS "not implemented" * musl implements lchmod with fchmodat(), and so returns EOPNOTSUPP "op not supported" * Python doesn't expect EOPNOTSUPP from lchmod, since it's not valid on BSD's lchmod. * "configure" doesn't actually check lchmod usefully, instead checks for glibc preprocessor defines to indicate if the function is just a stub[3]; somewhat fittingly, if the magic macros are defined then the next line of the C source is "choke me", causing the compiler to trip, fall, and point a finger at whatever is near where it ends up. (somewhat amusing, but AFAIK effective way to get an error :P) I'm leaving out links to threads on mailing lists and such, but for now I hope I've convinced you (or to those reading commit history: explained my reasons) that this is a bit of a mess[4]. And so instead of making a big mess messier, and with hopes of never thinking about this again, I propose we simply tell Python "don't use lchmod" on Linux. [1] https://github.com/python/cpython/pull/4783 [2] https://github.com/python/cpython/blob/28453feaa8d88bbcbf6d834b1d5ca396d17265f2/Lib/os.py#L144 [3] https://github.com/python/cpython/blob/28453feaa8d88bbcbf6d834b1d5ca396d17265f2/configure#L2198 [4] Messes happen, no good intention goes unpunished :). --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 5 ++++- pkgs/development/interpreters/python/cpython/3.4/default.nix | 5 ++++- pkgs/development/interpreters/python/cpython/3.5/default.nix | 5 ++++- pkgs/development/interpreters/python/cpython/3.6/default.nix | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5c12d7cec55c..9d89e96383f5 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -140,7 +140,10 @@ let "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no"; postConfigure = if hostPlatform.isCygwin then '' sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),' diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 0946f8743fbe..85c45a9d396f 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -96,7 +96,10 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 22c55d302625..d67cc7286942 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -90,7 +90,10 @@ in stdenv.mkDerivation { "--without-ensurepip" "--with-system-expat" "--with-system-ffi" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 950a165a2f4a..ee9a0df9a8c4 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -113,7 +113,10 @@ in stdenv.mkDerivation { "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" - ]; + ] + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity From b07201882481eedc3c09669c2c14c620d293537c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 08:14:35 +0200 Subject: [PATCH 096/369] python: docker-pycreds: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/docker-pycreds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 9cc510bf9af3..dd20400ea4f4 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299"; + sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d"; }; # require docker-credential-helpers binaries From df7efec99533e5c21530051a174e0a5ad19f8856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 08:11:30 +0200 Subject: [PATCH 097/369] python: docker: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index c290c6bd177b..2ae56b7dc5a7 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43"; + sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a"; }; propagatedBuildInputs = [ From 95d1d753dc874faa88a32f3c851afcd8a88cdff7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:25:47 -0700 Subject: [PATCH 098/369] poppler_data: 0.4.8 -> 0.4.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poppler-data/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.4.9 with grep in /nix/store/vcpqkfixqx9gdd3mf07lqil5q7kivlfm-poppler-data-0.4.9 - directory tree listing: https://gist.github.com/d2d3458239d6b4ca15b241ba36a9309e --- pkgs/data/misc/poppler-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 5c8e0970518b..d7a5ce33bd26 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.8"; + name = "poppler-data-0.4.9"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh"; + sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; }; nativeBuildInputs = [ cmake ninja ]; From e04a4d3c9ebc5e6725091238f7b530b6e55a77fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 08:46:54 +0200 Subject: [PATCH 099/369] python.pkgs.tweepy: move expression --- .../python-modules/tweepy/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/tweepy/default.nix diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix new file mode 100644 index 000000000000..562edf3d15ab --- /dev/null +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: + +buildPythonPackage rec { + pname = "tweepy"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; + }; + + doCheck = false; + propagatedBuildInputs = [ requests six requests_oauthlib ]; + + meta = with lib; { + homepage = https://github.com/tweepy/tweepy; + description = "Twitter library for python"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fee2dcd65b8..8d899f94abd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14387,25 +14387,7 @@ in { TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - tweepy = buildPythonPackage (rec { - name = "tweepy-3.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tweepy/${name}.tar.gz"; - sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; - }; - - doCheck = false; - propagatedBuildInputs = with self; [ requests six requests_oauthlib ]; - - meta = { - homepage = "https://github.com/tweepy/tweepy"; - description = "Twitter library for python"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; - }; - }); + tweepy = callPackage ../development/python-modules/tweepy { }; twiggy = buildPythonPackage rec { name = "Twiggy-${version}"; From 4d0989fe046bdca41f07bbf3d6fa86d7a3cdf792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 08:53:00 +0200 Subject: [PATCH 100/369] python: tweepy: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 562edf3d15ab..3020ef80aa41 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; + sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c"; }; doCheck = false; From c63a32357a807a6e967c5853220293b86c439549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 08:53:27 +0200 Subject: [PATCH 101/369] python.pkgs.tweepy: fix build with pip 10 This applies https://github.com/tweepy/tweepy/pull/1030. --- pkgs/development/python-modules/tweepy/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 3020ef80aa41..c0c74743044d 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }: buildPythonPackage rec { pname = "tweepy"; @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c"; }; + # Fix build with pip 10 + # https://github.com/tweepy/tweepy/pull/1030 + patches = fetchpatch { + url = "${meta.homepage}/commit/778bd7a31d2f5fae98652735e7844533589ca221.patch"; + sha256 = "1sqmjn0ngiynhfkdkcs33qmvl49ysfp8522hvxjk8bx252y9qw2h"; + }; + doCheck = false; propagatedBuildInputs = [ requests six requests_oauthlib ]; From 4b0638394d9fb0c4ce505b1187cc4ff3c5f54a10 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:10:42 +0300 Subject: [PATCH 102/369] db: split outputs --- pkgs/development/libraries/db/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 4a11c2b98935..d4398692a4e6 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation (rec { patches = extraPatches; + outputs = [ "out" "lib" ]; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") From 8460769e88eb2807ecfc89ffc67ed9857a2ebe4e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:11:01 +0300 Subject: [PATCH 103/369] pam: build with userdb support --- pkgs/os-specific/linux/pam/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1d380063f884..1db1a493ae2f 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }: +{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib, db4 }: stdenv.mkDerivation rec { name = "linux-pam-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ flex ]; - buildInputs = [ cracklib ]; + buildInputs = [ cracklib db4 ]; enableParallelBuilding = true; @@ -72,9 +72,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { - homepage = http://ftp.kernel.org/pub/linux/libs/pam/; + meta = with stdenv.lib; { + homepage = http://www.linux-pam.org/; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.bsd3; }; } From 38ef327aec2d59e484438c36851c0c3ac930ca7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Apr 2018 09:21:58 -0500 Subject: [PATCH 104/369] procps-ng: Use official release tarballs, fix version. Also no need to re-generate config bits, which is good since we encountered an error when trying to do so. Fixes #39538. --- pkgs/os-specific/linux/procps-ng/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index d164af63315f..08420e36c65b 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,22 +1,17 @@ -{ lib, stdenv, fetchurl, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchurl, ncurses, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; version = "3.3.14"; + # The project's releases are on SF, but git repo on gitlab. src = fetchurl { - url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2"; - sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf"; + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy"; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; - - # autoreconfHook doesn't quite get, what procps-ng buildprocss does - # with po/Makefile.in.in and stuff. - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ pkgconfig ]; makeFlags = "usrbin_execdir=$(out)/bin"; From 82dd4501f405800202b0485c1bab5575f30be80a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 15 Apr 2018 00:00:01 +0000 Subject: [PATCH 105/369] bintools-wrapper, cc-wrapper: don't add `targetPrefix` the second time ... binutils and gcc add it already anyway. Without this it's easy to get cross-toolchain paths longer than 256 chars and nix-daemon will then fail to commit them to /nix/store on XFS. --- pkgs/build-support/bintools-wrapper/default.nix | 2 +- pkgs/build-support/cc-wrapper/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5c0436b73ddf..a4e2ecb63b81 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else "${bintoolsName}-wrapper") + + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper") + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}"); preferLocalBuild = true; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..700e7547b7ae 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -71,7 +71,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else "${ccName}-wrapper") + + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; From 43dbc268cbe74b68e504a0a03087514cbd2f2cdf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 26 Apr 2018 14:50:36 +0000 Subject: [PATCH 106/369] gccCrossStageStatic: don't override name --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79d42d12c827..77450f1fe84e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6128,7 +6128,6 @@ with pkgs; libc = libcCross1; }; in wrapCCWith { - name = "gcc-cross-wrapper"; cc = gccFun { # copy-pasted inherit noSysDirs; From f31b147f638a9b98cee3fcb6a686bbf3ff979265 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Apr 2018 10:19:52 -0500 Subject: [PATCH 107/369] linux bootstrap: remove assertion failure from dev, fixes 'nix eval' As in: $ nix eval -f . bash Also remove the glibc propagation inherit that made these necessary, stages handle propagating libc themselves (apparently) and AFAICT no hashes are changed as a result of this. --- pkgs/stdenv/linux/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b5..15d3fde965f1 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,11 +107,6 @@ let # Having the proper 'platform' in all the stdenvs allows getting proper # linuxHeaders for example. inherit platform; - - # stdenv.glibc is used by GCC build to figure out the system-level - # /usr/include directory. - # TODO: Remove this! - inherit (prevStage) glibc; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -129,8 +124,6 @@ in __raw = true; gcc-unwrapped = null; - glibc = assert false; null; - musl = assert false; null; binutils = null; coreutils = null; gnugrep = null; From c53c7a02fe68eb1bd92b3ec73cf9370e42e1b794 Mon Sep 17 00:00:00 2001 From: Sergej Leibenzon Date: Thu, 26 Apr 2018 17:35:06 +0200 Subject: [PATCH 108/369] libuv: 1.20.0 -> 1.20.2 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e6b29a6c36be..ed4397c88f0d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.20.2"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz"; + sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48"; }; postPatch = let From 2119545865c4b5ef65b2b5433147c884f2cfb1b2 Mon Sep 17 00:00:00 2001 From: Sergej Leibenzon Date: Thu, 26 Apr 2018 12:01:14 +0200 Subject: [PATCH 109/369] nodejs: init at v10.0.0 --- pkgs/development/web/nodejs/v10.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/web/nodejs/v10.nix diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix new file mode 100644 index 000000000000..68d7f1b4ff11 --- /dev/null +++ b/pkgs/development/web/nodejs/v10.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, lib, openssl, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; +in + buildNodejs { + inherit enableNpm; + version = "10.0.0"; + sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470fe7c98187..5a45730c8315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3390,6 +3390,14 @@ with pkgs; nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {}; nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + openssl = openssl_1_1_0; + }; + nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { + enableNpm = false; + openssl = openssl_1_1_0; + }; + nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { nodejs = pkgs.nodejs-8_x; }; From d834ba6654fc5fa79c6cc8b0d5cdaa5d8f85fd0e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:04 +0000 Subject: [PATCH 110/369] stdenv: introduce and use `config.doCheckByDefault` option --- pkgs/stdenv/generic/make-derivation.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7b5f9f7d6b0b..c7a991572e9c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -46,11 +46,13 @@ rec { (stdenv.hostPlatform != stdenv.buildPlatform) [ "build" "host" ] + # TODO(@Ericson2314): Make unconditional / resolve #33599 # Check phase - , doCheck ? false + , doCheck ? config.doCheckByDefault or false + # TODO(@Ericson2314): Make unconditional / resolve #33599 # InstallCheck phase - , doInstallCheck ? false + , doInstallCheck ? config.doCheckByDefault or false , crossConfig ? null , meta ? {} @@ -120,6 +122,11 @@ rec { ] ]; + # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when + # no package has `doCheck = true`. + doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; + outputs' = outputs ++ (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); @@ -127,6 +134,7 @@ rec { derivationArg = (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" + "doCheck" "doInstallCheck" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (let @@ -202,12 +210,10 @@ rec { __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; } // lib.optionalAttrs (outputs' != [ "out" ]) { outputs = outputs'; - } // lib.optionalAttrs (attrs ? doCheck) { - # TODO(@Ericson2314): Make unconditional / resolve #33599 - doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform); - } // lib.optionalAttrs (attrs ? doInstallCheck) { - # TODO(@Ericson2314): Make unconditional / resolve #33599 - doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform); + } // lib.optionalAttrs doCheck' { + doCheck = true; + } // lib.optionalAttrs doInstallCheck' { + doInstallCheck = true; }); validity = import ./check-meta.nix { From 845fa5692164d0bbe2a1857ba27d1bbb4ae0c0e7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 18:49:44 +0000 Subject: [PATCH 111/369] stdenv: cleanup things a little bit --- pkgs/stdenv/generic/make-derivation.nix | 55 +++++++++++++------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index c7a991572e9c..96e40a78e518 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -131,31 +131,33 @@ rec { outputs ++ (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) + (stdenv.extraNativeBuildInputs + ++ stdenv.extraBuildInputs + ++ lib.concatLists dependencies); + + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) + (lib.concatLists propagatedDependencies); + + computedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + (stdenv.extraNativeBuildInputs + ++ stdenv.extraBuildInputs + ++ lib.concatLists dependencies)); + + computedPropagatedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + (lib.concatLists propagatedDependencies)); + derivationArg = (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" "doCheck" "doInstallCheck" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) - // (let - computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (stdenv.extraNativeBuildInputs - ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies); - computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (lib.concatLists propagatedDependencies); - computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (stdenv.extraNativeBuildInputs - ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies)); - computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (lib.concatLists propagatedDependencies)); - in - { + // { # A hack to make `nix-env -qa` and `nix search` ignore broken packages. # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix. name = assert validity.handled; name + lib.optionalString @@ -194,6 +196,13 @@ rec { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; + } // lib.optionalAttrs (outputs' != [ "out" ]) { + outputs = outputs'; + } // lib.optionalAttrs doCheck' { + doCheck = true; + } // lib.optionalAttrs doInstallCheck' { + doInstallCheck = true; + } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = @@ -208,13 +217,7 @@ rec { "/bin/sh" ]; __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - } // lib.optionalAttrs (outputs' != [ "out" ]) { - outputs = outputs'; - } // lib.optionalAttrs doCheck' { - doCheck = true; - } // lib.optionalAttrs doInstallCheck' { - doInstallCheck = true; - }); + }; validity = import ./check-meta.nix { inherit lib config meta; From 912cfb8aaaaeff60c25a685dc41b143952cfb4d3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 17:15:48 +0000 Subject: [PATCH 112/369] buildPythonPackage: use `config.doCheckByDefault` --- pkgs/development/interpreters/python/build-python-package.nix | 3 ++- pkgs/development/interpreters/python/mk-python-derivation.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 6a07a006c6b5..b55d6d874bbb 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -2,6 +2,7 @@ # and can build packages that use distutils, setuptools or flit. { lib +, config , python , wrapPython , setuptools @@ -19,7 +20,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; + inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 96a9cdf0c615..9835ba32d170 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -1,6 +1,7 @@ # Generic builder. { lib +, config , python , wrapPython , setuptools @@ -53,7 +54,7 @@ , passthru ? {} -, doCheck ? false +, doCheck ? config.doCheckByDefault or false , ... } @ attrs: From 9345fc51d111bb4a35afa86fb1617855bcade43d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:00 +0000 Subject: [PATCH 113/369] haskell-generic-builder: be explicit about `doCheck`, cleanup --- pkgs/development/haskell-modules/generic-builder.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 52d596da701a..09cbab13930e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -20,7 +20,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , description ? "" -, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) +, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null @@ -172,7 +172,7 @@ let buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ + allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -314,6 +314,8 @@ stdenv.mkDerivation ({ runHook postBuild ''; + inherit doCheck; + checkPhase = '' runHook preCheck ${setupCommand} test ${testTarget} @@ -428,7 +430,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doCheck) { inherit doCheck; } // optionalAttrs (doBenchmark) { inherit doBenchmark; } // optionalAttrs (checkPhase != "") { inherit checkPhase; } // optionalAttrs (preCheck != "") { inherit preCheck; } From 87651b32fe44b9cdeb5dc55d6197d5c5158ce42a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Mar 2018 00:00:04 +0000 Subject: [PATCH 114/369] stdenv: steal `checkInputs` from buildPythonPackage Note that a bunch of non-python packages use this attribute already. Some of those are clearly unaware of the fact that this attribute does not exists in stdenv because they define it but don't to add it to their `bulidInputs` :) Also note that I use `buildInputs` here and only handle regular builds because python and haskell builders do it this way and I'm not sure how to properly handle the cross-compilation case. --- doc/stdenv.xml | 14 ++++++++++++++ .../interpreters/python/mk-python-derivation.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 2a3316b8d018..31d3d0ca3c4e 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1005,6 +1005,13 @@ but only if the doCheck variable is enabled. + + checkInputs + + A list of dependencies used by the phase. This gets included in buildInputs when doCheck is set. + + + makeFlags / makeFlagsArray / @@ -1291,6 +1298,13 @@ installcheck. + + installCheckInputs + + A list of dependencies used by the phase. This gets included in buildInputs when doInstallCheck is set. + + + preInstallCheck Hook executed at the start of the installCheck diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 9835ba32d170..63ffdbb8c0ac 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -75,7 +75,6 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ buildInputs = [ wrapPython ] ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip - ++ lib.optionals doCheck checkInputs ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs ++ pythonPath; @@ -86,6 +85,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; + installCheckInputs = checkInputs; postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 96e40a78e518..b523374454fc 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -36,6 +36,9 @@ rec { , depsTargetTarget ? [] # 1 -> 1 , depsTargetTargetPropagated ? [] # 1 -> 1 + , checkInputs ? [] + , installCheckInputs ? [] + # Configure Phase , configureFlags ? [] , # Target is not included by default because most programs don't care. @@ -101,7 +104,9 @@ rec { ] [ (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) buildInputs) + (map (drv: drv.crossDrv or drv) (buildInputs + ++ lib.optionals doCheck' checkInputs + ++ lib.optionals doInstallCheck' installCheckInputs)) ] [ (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) @@ -155,6 +160,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" "doCheck" "doInstallCheck" + "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // { From 7390e007635c347257a4daba4c5e9f5355f7c4ab Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Apr 2018 00:10:52 +0200 Subject: [PATCH 115/369] mpfi: 1.5.1 -> 1.5.3 --- pkgs/development/libraries/mpfi/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index c88c8da63784..6b607e94bd49 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,15 +1,20 @@ {stdenv, fetchurl, mpfr}: stdenv.mkDerivation rec { name = "mpfi-${version}"; - version = "1.5.1"; + version = "1.5.3"; + file_nr = "37331"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/30129/mpfi-${version}.tar.bz2"; - sha256 = "0vk9jfcfiqda0zksg1ffy36pdznpng9b4nl7pfzpz9hps4v6bk1z"; + # NOTE: the file_nr is whats important here. The actual package name (including the version) + # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/ + # and click on Download in the section "Latest File Releases". + url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2"; + sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3"; }; buildInputs = [mpfr]; meta = { inherit version; description = ''A multiple precision interval arithmetic library based on MPFR''; + homepage = https://gforge.inria.fr/projects/mpfi/; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; From ec7502946f940e986381d94de9d272ba74d919b0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 26 Apr 2018 23:12:35 +0200 Subject: [PATCH 116/369] mpfr: 3.1.6 -> 4.0.1 --- pkgs/development/libraries/mpfr/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 4aac5a927092..d75d9d6b9d90 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "mpfr-3.1.6"; + version = "4.0.1"; + name = "mpfr-${version}"; src = fetchurl { url = "mirror://gnu/mpfr/${name}.tar.xz"; - sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks"; + sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7"; }; outputs = [ "out" "dev" "doc" "info" ]; From 31010e0f89a43985122a94728b7dce14ec27739e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 17:54:25 -0400 Subject: [PATCH 117/369] python3: add C++ compiler support for distutils This implements 095095c4 ('python: add C++ compiler support for distutils') for python3. Should fix various problems with python packages on darwin. --- .../interpreters/python/cpython/3.4/default.nix | 16 ++++++++++++++-- .../interpreters/python/cpython/3.5/default.nix | 14 +++++++++++++- .../interpreters/python/cpython/3.6/default.nix | 14 +++++++++++++- .../development/python-modules/numpy/default.nix | 5 +++-- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 85c45a9d396f..7da2cfdd1527 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , bzip2 , expat , libffi @@ -39,6 +39,8 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -69,6 +71,16 @@ in stdenv.mkDerivation { ./ld_library_path.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; + sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; + extraPrefix = ""; + }) ]; postPatch = '' @@ -166,7 +178,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index d67cc7286942..5a5179df6f51 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -39,6 +39,8 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -69,6 +71,16 @@ in stdenv.mkDerivation { ./ld_library_path.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; + sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; + extraPrefix = ""; + }) ]; postPatch = '' @@ -160,7 +172,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index ee9a0df9a8c4..a2e979518734 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -42,6 +42,8 @@ let nativeBuildInputs = optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -71,6 +73,16 @@ in stdenv.mkDerivation { ./no-ldconfig.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; + sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; + extraPrefix = ""; + }) ]; postPatch = '' @@ -183,7 +195,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4022115e9a0e..ec727994b09c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -14,8 +14,9 @@ buildPythonPackage rec { buildInputs = [ gfortran nose blas ]; patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ - # See cpython 2.7 patches. - # numpy.distutils is used by cython during it's check phase + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. ./numpy-distutils-C++.patch ]; From c56c0ac945f0db2cbb4fcc1dcf4764d6b7f493f2 Mon Sep 17 00:00:00 2001 From: Benjamin Smith Date: Wed, 21 Mar 2018 21:42:20 -0700 Subject: [PATCH 118/369] bundler: 1.14.6 -> 1.16.1 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 6ba1d5f10ec1..0c754fcfe3bc 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.14.6"; - source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; + version = "1.16.1"; + source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8"; dontPatchShebangs = true; postFixup = '' From abbf9656830f7f77210770a86b6044be4abb89e8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 27 Apr 2018 16:35:02 +0200 Subject: [PATCH 119/369] nodejs: use xcodebuild patch for Node.js 10.x so that modules with native dependencies on darwin will build properly --- pkgs/development/web/nodejs/v10.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 68d7f1b4ff11..9f5f18809897 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -7,5 +7,5 @@ in inherit enableNpm; version = "10.0.0"; sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } From b8917dc0f3d8e66c1fac0ea84440c05330f99f5a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 17:37:44 -0400 Subject: [PATCH 120/369] python35, python36: fix reading large files on darwin --- .../development/interpreters/python/cpython/3.5/default.nix | 6 ++++++ .../development/interpreters/python/cpython/3.6/default.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index d67cc7286942..c6d572aca164 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -67,6 +67,12 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals stdenv.isDarwin [ + # Fix for https://bugs.python.org/issue24658 + (fetchpatch { + url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; + sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ]; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index ee9a0df9a8c4..e5e05c0ac7a3 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -69,6 +69,12 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ] ++ optionals stdenv.isDarwin [ + # Fix for https://bugs.python.org/issue24658 + (fetchpatch { + url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; + sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ]; From 0a973b9985d7bf41622d2048d5e261c24db6f635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 10:50:46 +0100 Subject: [PATCH 121/369] vagrant: 2.0.2 -> 2.0.4 --- pkgs/development/tools/vagrant/Gemfile | 2 +- pkgs/development/tools/vagrant/Gemfile.lock | 73 +++----- pkgs/development/tools/vagrant/default.nix | 25 +-- pkgs/development/tools/vagrant/gemset.nix | 183 +++++--------------- 4 files changed, 71 insertions(+), 212 deletions(-) diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile index d32951f1c054..f25a77c9398c 100644 --- a/pkgs/development/tools/vagrant/Gemfile +++ b/pkgs/development/tools/vagrant/Gemfile @@ -1,2 +1,2 @@ source "https://rubygems.org" -gem 'vagrant' +gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4" diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock index 2c63b57443ad..fd5cb8dbee9e 100644 --- a/pkgs/development/tools/vagrant/Gemfile.lock +++ b/pkgs/development/tools/vagrant/Gemfile.lock @@ -1,17 +1,9 @@ GIT - remote: https://github.com/mitchellh/vagrant-spec.git - revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1 + remote: https://github.com/hashicorp/vagrant.git + revision: 6a6805f284dff05207e359acdfb1ca8443b78751 + tag: v2.0.4 specs: - vagrant-spec (0.0.1) - childprocess (~> 0.6.0) - log4r (~> 1.1.9) - rspec (~> 3.5.0) - thor (~> 0.18.1) - -PATH - remote: . - specs: - vagrant (2.0.2) + vagrant (2.0.4) childprocess (~> 0.6.0) erubis (~> 2.7.0) hashicorp-checkpoint (~> 0.1.5) @@ -25,6 +17,8 @@ PATH rest-client (>= 1.6.0, < 3.0) ruby_dep (<= 1.3.1) wdm (~> 0.1.0) + win32-file (~> 0.8.1) + win32-file-security (~> 1.0.10) winrm (~> 2.1) winrm-elevated (~> 1.1) winrm-fs (~> 1.0) @@ -32,24 +26,19 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) builder (3.2.3) childprocess (0.6.3) ffi (~> 1.0, >= 1.0.11) - crack (0.4.3) - safe_yaml (~> 1.0.0) - diff-lcs (1.3) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - fake_ftp (0.1.1) - ffi (1.9.18) + ffi (1.9.23) + ffi-win32-extensions (1.0.3) + ffi gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashdiff (0.3.7) hashicorp-checkpoint (0.1.5) http-cookie (1.0.3) domain_name (~> 0.5) @@ -75,8 +64,6 @@ GEM net-ssh (4.2.0) netrc (0.11.0) nori (2.6.0) - public_suffix (3.0.1) - rake (12.0.0) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -86,35 +73,23 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-its (1.2.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) ruby_dep (1.3.1) rubyntlm (0.6.2) rubyzip (1.2.1) - safe_yaml (1.0.4) - thor (0.18.1) unf (0.1.4) unf_ext unf_ext (0.0.7.5) wdm (0.1.1) - webmock (2.3.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff + win32-file (0.8.1) + ffi + ffi-win32-extensions + win32-file-stat (>= 1.4.0) + win32-file-security (1.0.10) + ffi + ffi-win32-extensions + win32-file-stat (1.5.5) + ffi + ffi-win32-extensions winrm (2.2.3) builder (>= 2.1.2) erubis (~> 2.7) @@ -137,13 +112,7 @@ PLATFORMS ruby DEPENDENCIES - fake_ftp (~> 0.1.1) - rake (~> 12.0.0) - rspec (~> 3.5.0) - rspec-its (~> 1.2.0) vagrant! - vagrant-spec! - webmock (~> 2.3.1) BUNDLED WITH - 1.14.6 + 1.16.1 diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3b055d38d03f..11ca6014b2de 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,36 +1,29 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: +{ lib, buildRubyGem, bundlerEnv, ruby, libarchive }: + + +# To update vagrant, visit the Gemfile and re-run bundix. let - version = "2.0.2"; - url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir"; + gemset = import ./gemset.nix; + inherit (gemset.vagrant) version; deps = bundlerEnv rec { - name = "${pname}-${version}"; + name = "vagrant-${version}"; pname = "vagrant"; inherit version; inherit ruby; gemdir = ./.; - gemset = lib.recursiveUpdate (import ./gemset.nix) { - vagrant = { - source = { - type = "url"; - inherit url sha256; - }; - inherit version; - }; - }; }; in buildRubyGem rec { name = "${gemName}-${version}"; gemName = "vagrant"; - inherit version; doInstallCheck = true; dontBuild = false; - src = fetchurl { inherit url sha256; }; + + inherit (deps.gems.vagrant) src; patches = [ ./unofficial-installation-nowarn.patch diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 5d3d2693d013..7a432d302172 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -1,13 +1,4 @@ { - addressable = { - dependencies = ["public_suffix"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; - type = "gem"; - }; - version = "2.5.2"; - }; builder = { source = { remotes = ["https://rubygems.org"]; @@ -25,31 +16,14 @@ }; version = "0.6.3"; }; - crack = { - dependencies = ["safe_yaml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; - diff-lcs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; - type = "gem"; - }; - version = "1.3"; - }; domain_name = { dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; type = "gem"; }; - version = "0.5.20170404"; + version = "0.5.20180417"; }; erubis = { source = { @@ -59,21 +33,22 @@ }; version = "2.7.0"; }; - fake_ftp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7"; - type = "gem"; - }; - version = "0.1.1"; - }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; type = "gem"; }; - version = "1.9.18"; + version = "1.9.23"; + }; + ffi-win32-extensions = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l"; + type = "gem"; + }; + version = "1.0.3"; }; gssapi = { dependencies = ["ffi"]; @@ -93,14 +68,6 @@ }; version = "1.3.1"; }; - hashdiff = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; - type = "gem"; - }; - version = "0.3.7"; - }; hashicorp-checkpoint = { source = { remotes = ["https://rubygems.org"]; @@ -235,22 +202,6 @@ }; version = "2.6.0"; }; - public_suffix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; - type = "gem"; - }; - version = "3.0.1"; - }; - rake = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; - type = "gem"; - }; - version = "12.0.0"; - }; rb-fsevent = { source = { remotes = ["https://rubygems.org"]; @@ -286,59 +237,6 @@ }; version = "2.0.2"; }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; - type = "gem"; - }; - version = "3.5.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i"; - type = "gem"; - }; - version = "3.5.4"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; - type = "gem"; - }; - version = "3.5.0"; - }; - rspec-its = { - dependencies = ["rspec-core" "rspec-expectations"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; - type = "gem"; - }; - version = "1.2.0"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; - type = "gem"; - }; - version = "3.5.0"; - }; - rspec-support = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; - type = "gem"; - }; - version = "3.5.0"; - }; ruby_dep = { source = { remotes = ["https://rubygems.org"]; @@ -363,22 +261,6 @@ }; version = "1.2.1"; }; - safe_yaml = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; - type = "gem"; - }; - version = "0.18.1"; - }; unf = { dependencies = ["unf_ext"]; source = { @@ -397,18 +279,15 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; - }; - vagrant-spec = { - dependencies = ["childprocess" "log4r" "rspec" "thor"]; + dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"]; source = { fetchSubmodules = false; - rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1"; - sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h"; + rev = "6a6805f284dff05207e359acdfb1ca8443b78751"; + sha256 = "07c7r4xk0md9hkbcnij0kp7acxz0li9ak1ah7lmh52j10gq4cjmw"; type = "git"; - url = "https://github.com/mitchellh/vagrant-spec.git"; + url = "https://github.com/hashicorp/vagrant.git"; }; - version = "0.0.1"; + version = "2.0.4"; }; wdm = { source = { @@ -418,14 +297,32 @@ }; version = "0.1.1"; }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; + win32-file = { + dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0"; type = "gem"; }; - version = "2.3.2"; + version = "0.8.1"; + }; + win32-file-security = { + dependencies = ["ffi" "ffi-win32-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r"; + type = "gem"; + }; + version = "1.0.10"; + }; + win32-file-stat = { + dependencies = ["ffi" "ffi-win32-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468"; + type = "gem"; + }; + version = "1.5.5"; }; winrm = { dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; From b341529a354774894306f3890437ec9930fcc265 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 29 Apr 2018 16:46:36 -0500 Subject: [PATCH 122/369] systemd: use upstream patch to fix building with util-linux 2.32 See linked PR. --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bb9f509b38a..ef4b8ec5dfca 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -151,6 +151,14 @@ in stdenv.mkDerivation rec { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; + patches = [ + # https://github.com/systemd/systemd/pull/8580 + (fetchpatch { + url = https://github.com/systemd/systemd/pull/8580.patch; + sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn"; + }) + ]; + hardeningDisable = [ "stackprotector" ]; NIX_CFLAGS_COMPILE = From 04380e713c20377b5346d026040a01621aae8935 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 29 Apr 2018 17:09:52 -0500 Subject: [PATCH 123/369] libepoxy: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/epoxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index d44e2650db0a..cc62b2776ede 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "epoxy-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "anholt"; repo = "libepoxy"; rev = "${version}"; - sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0"; + sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci"; }; outputs = [ "out" "dev" ]; From dadf22293478749bfffa25f9201168c6e9fac016 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 29 Apr 2018 20:24:04 -0500 Subject: [PATCH 124/369] systemd: add pcre2 as build dep for searching in journalctl --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 63ed5a5cbb3f..3d8b7cb33227 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, kexectools, libmicrohttpd +, audit, lz4, bzip2, kexectools, libmicrohttpd, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , libseccomp, iptables, gnu-efi , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ linuxHeaders libcap kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 - libmicrohttpd ] ++ + libmicrohttpd pcre2 ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++ stdenv.lib.meta.enableIfAvailable libseccomp ++ [ libffi audit lz4 bzip2 libapparmor From 910ad133b44b4e4a9fa058b2c4a83870d8e1b7a3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 11:08:03 -0500 Subject: [PATCH 125/369] mesa: 17.3.8 -> 17.3.9 https://www.mesa3d.org/relnotes/17.3.9.html --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1033c87b54c3..71121e28a2ec 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.3.8"; + version = "17.3.9"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"; + sha256 = "0yg4nvagg5y2fxyl3jjdgbi6gjqqw4z3j6pyzsac5q7h0pybbgn5"; }; prePatch = "patchShebangs ."; From 3dfe97c62d15d812e422b3e3e469fe9a862a0069 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Apr 2018 11:53:17 -0700 Subject: [PATCH 126/369] poppler_utils: 0.63.0 -> 0.64.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poppler-utils/versions. These checks were done: - built on NixOS - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite --help’ got 0 exit code - found 0.64.0 with grep in /nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0 - directory tree listing: https://gist.github.com/c3d0cef388a4d423d47e26ff96c1ffd0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 11dd8ec32910..a96de20ccfeb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.63.0"; + version = "0.64.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; + sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj"; }; outputs = [ "out" "dev" ]; From 9395d05b65fb6eeb4062455dc91c7ea634230f1e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 09:37:57 -0500 Subject: [PATCH 127/369] unix-tools: install man pages --- pkgs/top-level/unix-tools.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 9946bb1c4dc4..9b8fefaf8bab 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -13,18 +13,22 @@ let singleBinary = cmd: providers: let - provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; + provider = lib.getBin providers.${hostPlatform.parsed.kernel.name}; in runCommand cmd { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share/man/man1 - if ! [ -x "${provider}" ]; then + if ! [ -x "${provider}/bin/${cmd}" ]; then echo "Cannot find command ${cmd}" exit 1 fi - cp "${provider}" "$out/bin/${cmd}" + cp "${provider}/bin/${cmd}" "$out/bin/${cmd}" + + if [ -f "${provider}/share/man/man1/${cmd}.1.gz" ]; then + cp "${provider}/share/man/man1/${cmd}.1.gz" "$out/share/man/man1/${cmd}.1.gz" + fi ''; in rec { From 0433c35eef91dc53018b81fff4a7165866a90482 Mon Sep 17 00:00:00 2001 From: nschoe Date: Tue, 1 May 2018 20:29:23 +0200 Subject: [PATCH 128/369] Add libopus as dependencies to gstreamer base plugins --- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 39cf57ec5258..dfd3383cdbad 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, meson, ninja, gettext, gobjectIntrospection , python, gstreamer, orc, pango, libtheora, libvisual -, libintl +, libintl, libopus , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland , enableAlsa ? stdenv.isLinux, alsaLib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Introspection fails on my MacBook currently ++ lib.optional stdenv.isDarwin "--disable-introspection"; - buildInputs = [ orc libtheora libintl ] + buildInputs = [ orc libtheora libintl libopus ] ++ lib.optional enableAlsa alsaLib ++ lib.optionals enableX11 [ libXv pango ] ++ lib.optional enableWayland wayland From 218d81bc9db409a72a572336a4dadc40a9088cde Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Apr 2018 19:55:18 -0500 Subject: [PATCH 129/369] all-packages: move aliases to aliases.nix Lots of aliases have been left over. This is a massive edit that changes many random lines. --- pkgs/top-level/aliases.nix | 112 +++++++++++++++++++++++------ pkgs/top-level/all-packages.nix | 122 +------------------------------- 2 files changed, 95 insertions(+), 139 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b4dd2bf915d..cf39970fb926 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,10 +24,15 @@ in ### Deprecated aliases - for backward compatibility mapAliases (rec { + PPSSPP = ppsspp; # added 2017-10-01 + QmidiNet = qmidinet; # added 2016-05-22 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; # added 2013-11-04 + ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 + apacheAnt = ant; # added 2018-04-25 + apacheAnt_1_9 = ant_1_9; # added 2018-04-25 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 @@ -48,50 +53,68 @@ mapAliases (rec { cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cv = progress; # added 2015-09-06 + d1x_rebirth = dxx-rebirth; # added 2018-04-25 + d2x_rebirth = dxx-rebirth; # added 2018-04-25 + dbus_daemon = dbus.daemon; # added 2018-04-25 dbus_glib = dbus-glib; # added 2018-02-25 + dbus_libs = dbus; # added 2018-04-25 + dbus_tools = dbus.out; # added 2018-04-25 deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 + deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 desktop_file_utils = desktop-file-utils; # added 2018-02-25 + devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 + dmtx = dmtx-utils; # added 2018-04-25 + docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 + docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 + etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 + fam = gamin; # added 2018-04-25 + fftwFloat = fftwSinglePrec; # 2018-04-25 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 + flameGraph = flamegraph; # added 2018-04-25 font-awesome-ttf = font-awesome_4; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 - gettextWithExpat = gettext; # 2016-02-19 + fuseki = apache-jena-fuseki; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 + gettextWithExpat = gettext; # 2016-02-19 + gflags = google-gflags; # added 2018-04-25 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 + gmock = gtest; # added 2018-04-25 + gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 + gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnustep-make = gnustep.make; # added 2016-7-6 go-pup = pup; # added 2017-12-19 googleAuthenticator = google-authenticator; # added 2016-10-16 - gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gst_ffmpeg = gst-ffmpeg; # added 2017-02 + gst_plugins_bad = gst-plugins-bad; # added 2017-02 gst_plugins_base = gst-plugins-base; # added 2017-02 gst_plugins_good = gst-plugins-good; # added 2017-02 - gst_plugins_bad = gst-plugins-bad; # added 2017-02 gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 gst_python = gst-python; # added 2017-02 gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 - guile_lib = guile-lib; # added 2017-09-24 guileLint = guile-lint; # added 2017-09-27 + guile_lib = guile-lib; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24 gupnp_av = gupnp-av; # added 2018-02-25 gupnp_dlna = gupnp-dlna; # added 2018-02-25 gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 - gnustep-make = gnustep.make; # added 2016-7-6 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 @@ -100,43 +123,55 @@ mapAliases (rec { joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 - keepassx2-http = keepassx-reboot; # added 2016-10-17 - keepassx-reboot = keepassx-community; # added 2017-02-01 + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 + keepassx-reboot = keepassx-community; # added 2017-02-01 + keepassx2-http = keepassx-reboot; # added 2016-10-17 + kerberos = libkrb5; # added 2018-04-25 keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 + kvm = qemu_kvm; # added 2018-04-25 letsencrypt = certbot; # added 2016-05-16 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 + libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 + libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 + liblrdf = librdf; # added 2018-04-25 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient + librecad2 = librecad; # backwards compatibility alias, added 2015-10 + libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 + libudev = udev; # added 2018-04-25 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 - lua5_sec = luaPackages.luasec; # added 2017-05-02 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02 + lua5_sec = luaPackages.luasec; # added 2017-05-02 + lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 - manpages = man-pages; # added 2015-12-06 + gnum4 = m4; # added 2018-04-25 man_db = man-db; # added 2016-05 - piwik = matomo; # added 2018-01-16 + manpages = man-pages; # added 2015-12-06 midoriWrapper = midori; # added 2015-01 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 module_init_tools = kmod; # added 2016-04-22 + msf = metasploit; # added 2018-04-25 mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 + mysql = mariadb; # added 2018-04-25 mysqlWorkbench = mysql-workbench; # added 2017-01-19 + nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 @@ -144,33 +179,42 @@ mapAliases (rec { networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - nmap_graphical = nmap-graphical; # added 2017-01-19 nfsUtils = nfs-utils; # added 2014-12-06 + nginxUnstable = nginxMainline; # added 2018-04-25 + nilfs_utils = nilfs-utils; # added 2018-04-25 + nmap_graphical = nmap-graphical; # added 2017-01-19 + nologin = shadow; # added 2018-04-25 + openal = openalSoft; # added 2018-04-25 + opencascade_oce = opencascade; # added 2018-04-25 opencl-icd = ocl-icd; # added 2017-01-20 + openexr_ctl = ctl; # added 2018-04-25 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatexSF = pidgin-latex; # added 2014-11-02 pidginlatex = pidgin-latex; # added 2018-01-08 + pidginlatexSF = pidgin-latex; # added 2014-11-02 pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 - pidginotr = pidgin-otr; # added 2018-01-08 pidginosd = pidgin-osd; # added 2018-01-08 + pidginotr = pidgin-otr; # added 2018-01-08 pidginsipe = pidgin-sipe; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 - postage = pgmanage; # added 2017-11-03 + piwik = matomo; # added 2018-01-16 + pltScheme = racket; # just to be sure + polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - PPSSPP = ppsspp; # added 2017-10-01 + postage = pgmanage; # added 2017-11-03 + procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - QmidiNet = qmidinet; # added 2016-05-22 qt_gstreamer = qt-gstreamer; # added 2017-02 qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + redland = librdf_redland; # added 2018-04-25 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -181,15 +225,21 @@ mapAliases (rec { ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 scim = sc-im; # added 2016-01-22 + scollector = bosun; # added 2018-04-25 shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 skype = skypeforlinux; # added 2017-07-27 + slurm-llnl = slurm; # renamed July 2017 + slurm-llnl-full = slurm-full; # renamed July 2017 + smbclient = samba; # added 2018-04-25 spaceOrbit = space-orbit; # addewd 2016-05-23 + speech_tools = speech-tools; # added 2018-04-25 speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 @@ -197,8 +247,9 @@ mapAliases (rec { sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 - tahoelafs = tahoe-lafs; # added 2018-03-26 system_config_printer = system-config-printer; # added 2016-01-03 + systool = sysfsutils; # added 2018-04-25 + tahoelafs = tahoe-lafs; # added 2018-03-26 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 telepathy_glib = telepathy-glib; # added 2018-02-25 @@ -214,9 +265,12 @@ mapAliases (rec { tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03 + trang = jing-trang; # added 2018-04-25 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 + tshark = wireshark-cli; # added 2018-04-25 ucsFonts = ucs-fonts; # added 2016-07-15 + udev = systemd; # added 2018-04-25 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 @@ -226,8 +280,12 @@ mapAliases (rec { wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 x11 = xlibsWrapper; # added 2015-09 + xbmc = kodi; # added 2018-04-25 + xbmcPlain = kodiPlain; # added 2018-04-25 + xbmcPlugins = kodiPlugins; # added 2018-04-25 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 + yacc = bison; # added 2018-04-25 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 @@ -245,6 +303,20 @@ mapAliases (rec { ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; + + gst_all = { # added 2018-04-25 + inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer; + gstPluginsBase = pkgs.gst-plugins-base; + gstPluginsBad = pkgs.gst-plugins-bad; + gstPluginsGood = pkgs.gst-plugins-good; + gstPluginsUgly = pkgs.gst-plugins-ugly; + gstFfmpeg = pkgs.gst-ffmpeg; + gst-plugins-base = pkgs.gst-plugins-base; + gst-plugins-bad = pkgs.gst-plugins-bad; + gst-plugins-good = pkgs.gst-plugins-good; + gst-plugins-ugly = pkgs.gst-plugins-ugly; + gst-ffmpeg = pkgs.gst-ffmpeg; + }; } // (with ocaml-ng; { # added 2016-09-14 ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08aad6e41c9c..0cd7366c7170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2330,9 +2330,6 @@ with pkgs; flamegraph = callPackage ../development/tools/flamegraph { }; - # Awkward historical capitalization for flamegraph. Remove eventually - flameGraph = flamegraph; - flvtool2 = callPackage ../tools/video/flvtool2 { }; fmbt = callPackage ../development/tools/fmbt { @@ -2735,7 +2732,6 @@ with pkgs; gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; - gmock = gtest; gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -3408,9 +3404,6 @@ with pkgs; nodePackages = nodePackages_6_x; - # Can be used as a user shell - nologin = shadow; - npm2nix = nodePackages.npm2nix; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -3571,8 +3564,6 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; - lzma = xz; - xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -3784,7 +3775,6 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; metasploit = callPackage ../tools/security/metasploit { }; - msf = metasploit; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -3963,7 +3953,6 @@ with pkgs; nifskope = callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nilfs_utils = nilfs-utils; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -4861,7 +4850,6 @@ with pkgs; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; - ag = self.silver-searcher; simpleproxy = callPackage ../tools/networking/simpleproxy { }; @@ -5495,8 +5483,6 @@ with pkgs; tradcpp = callPackage ../development/tools/tradcpp { }; - trang = self.jing-trang; - tre = callPackage ../development/libraries/tre { }; ts = callPackage ../tools/system/ts { }; @@ -7202,8 +7188,6 @@ with pkgs; picolisp = callPackage ../development/interpreters/picolisp {}; - pltScheme = racket; # just to be sure - polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; @@ -7489,11 +7473,9 @@ with pkgs; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4 = antlr4_7; - ant = apacheAnt; + ant = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - - apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; apacheKafka = apacheKafka_1_0; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; @@ -7857,8 +7839,6 @@ with pkgs; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; - m4 = gnum4; - geis = callPackage ../development/libraries/geis { inherit (xorg) libX11 libXext libXi libXtst; }; @@ -7873,7 +7853,7 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - gnum4 = callPackage ../development/tools/misc/gnum4 { }; + m4 = callPackage ../development/tools/misc/gnum4 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; @@ -8363,8 +8343,6 @@ with pkgs; }; xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; - yacc = bison; - yaml2json = callPackage ../development/tools/yaml2json { }; ycmd = callPackage ../development/tools/misc/ycmd { @@ -8687,11 +8665,6 @@ with pkgs; dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - # FIXME: deprecate these. - dbus_tools = dbus.out; - dbus_libs = dbus; - dbus_daemon = dbus.daemon; - makeDBusConf = { suidHelper, serviceDirectories }: callPackage ../development/libraries/dbus/make-dbus-conf.nix { inherit suidHelper serviceDirectories; @@ -8914,8 +8887,6 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; - fam = gamin; - gamin = callPackage ../development/libraries/gamin { }; ganv = callPackage ../development/libraries/ganv { }; @@ -8963,8 +8934,6 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gflags = google-gflags; - gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { @@ -9123,22 +9092,6 @@ with pkgs; callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); - gst_all = { - inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer; - gstPluginsBase = pkgs.gst-plugins-base; - gstPluginsBad = pkgs.gst-plugins-bad; - gstPluginsGood = pkgs.gst-plugins-good; - gstPluginsUgly = pkgs.gst-plugins-ugly; - gstFfmpeg = pkgs.gst-ffmpeg; - - # aliases with the dashed naming, same as in gst_all_1 - gst-plugins-base = pkgs.gst-plugins-base; - gst-plugins-bad = pkgs.gst-plugins-bad; - gst-plugins-good = pkgs.gst-plugins-good; - gst-plugins-ugly = pkgs.gst-plugins-ugly; - gst-ffmpeg = pkgs.gst-ffmpeg; - }; - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { bison = bison2; }; @@ -9338,10 +9291,6 @@ with pkgs; hamlib = callPackage ../development/libraries/hamlib { }; - # TODO : Let admin choose. - # We are using mit-krb5 because it is better maintained - kerberos = libkrb5; - heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; libheimdal = heimdalFull.override { type = "lib"; }; @@ -9863,8 +9812,6 @@ with pkgs; liblo = callPackage ../development/libraries/liblo { }; - liblrdf = librdf; - liblscp = callPackage ../development/libraries/liblscp { }; libe-book = callPackage ../development/libraries/libe-book {}; @@ -10794,8 +10741,6 @@ with pkgs; oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; - openal = self.openalSoft; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -10804,8 +10749,6 @@ with pkgs; opencascade = callPackage ../development/libraries/opencascade { }; - opencascade_oce = opencascade; - opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; opencl-headers_1_2 = opencl-headersGen "12"; opencl-headers_2_2 = opencl-headersGen "22"; @@ -10834,9 +10777,6 @@ with pkgs; enableCuda = false; }; - # this ctl version is needed by openexr_viewers - openexr_ctl = ctl; - openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -10982,8 +10922,6 @@ with pkgs; poker-eval = callPackage ../development/libraries/poker-eval { }; - polarssl = mbedtls; - polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; @@ -11342,8 +11280,6 @@ with pkgs; qrupdate = callPackage ../development/libraries/qrupdate { }; - redland = pkgs.librdf_redland; - resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -11490,7 +11426,6 @@ with pkgs; speechd = callPackage ../development/libraries/speechd { }; speech-tools = callPackage ../development/libraries/speech-tools {}; - speech_tools = speech-tools; speex = callPackage ../development/libraries/speex { fftw = fftwFloat; @@ -12263,8 +12198,6 @@ with pkgs; java = jdk; }; - fuseki = apache-jena-fuseki; - apcupsd = callPackage ../servers/apcupsd { }; asterisk = asterisk-stable; @@ -12286,7 +12219,6 @@ with pkgs; bird bird6 bird2; bosun = callPackage ../servers/monitoring/bosun { }; - scollector = bosun; cayley = callPackage ../servers/cayley { }; @@ -12359,8 +12291,6 @@ with pkgs; v8 = v8_6_x; }; - etcdctl = etcd; - exim = callPackage ../servers/mail/exim { }; fcgiwrap = callPackage ../servers/fcgiwrap { }; @@ -12487,8 +12417,6 @@ with pkgs; modules = [ nginxModules.dav nginxModules.moreheaders ]; }; - nginxUnstable = nginxMainline; - nginxModules = callPackage ../servers/http/nginx/modules.nix { }; # We should move to dynmaic modules and create a nginxFull package with all modules @@ -12565,7 +12493,6 @@ with pkgs; }; # libpulse implementations - libpulseaudio-vanilla = callPackage ../servers/pulseaudio { libOnly = true; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; @@ -12630,8 +12557,6 @@ with pkgs; boost = boost159; }; - mysql = mariadb; - mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -12639,7 +12564,6 @@ with pkgs; munin = callPackage ../servers/monitoring/munin { }; monitoring-plugins = callPackage ../servers/monitoring/plugins { }; - nagiosPluginsOfficial = monitoring-plugins; inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; }) check-nwc-health @@ -12795,7 +12719,6 @@ with pkgs; deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; deadpixi-sam = deadpixi-sam-unstable; - sam = deadpixi-sam; samba3 = callPackage ../servers/samba/3.x.nix { }; @@ -12807,8 +12730,6 @@ with pkgs; samba = samba4; - smbclient = samba; - # A lightweight Samba 3, useful for non-Linux-based OSes. samba3_light = lowPrio (samba3.override { pam = null; @@ -12872,10 +12793,8 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; - slurm-llnl = slurm; # renamed July 2017 slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); - slurm-llnl-full = slurm-full; # renamed July 2017 slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; @@ -13013,7 +12932,6 @@ with pkgs; atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -13079,8 +12997,6 @@ with pkgs; # `.override` clobbered. C.F. `llvmPackages` which does the same. darwin = callPackage ./darwin-packages.nix { }; - devicemapper = lvm2; - disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; displaylink = callPackage ../os-specific/linux/displaylink { @@ -13708,8 +13624,6 @@ with pkgs; kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; - kvm = qemu_kvm; - libcap = callPackage ../os-specific/linux/libcap { }; libcap_ng = callPackage ../os-specific/linux/libcap-ng { @@ -13883,8 +13797,6 @@ with pkgs; prayer = callPackage ../servers/prayer { }; - procps = procps-ng; - procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -13975,10 +13887,6 @@ with pkgs; inherit (gnome2) libglade; }; - # Provided with sysfsutils. - libsysfs = sysfsutils; - systool = sysfsutils; - sysklogd = callPackage ../os-specific/linux/sysklogd { }; syslinux = callPackage ../os-specific/linux/syslinux { }; @@ -14055,9 +13963,6 @@ with pkgs; cross = assert targetPlatform != buildPlatform; targetPlatform; }); - udev = systemd; - libudev = udev; - eudev = callPackage ../os-specific/linux/eudev {}; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; @@ -14265,10 +14170,6 @@ with pkgs; docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = docbook_xsl; - - docbook5_xsl = docbook_xsl_ns; - documentation-highlighter = callPackage ../misc/documentation-highlighter { }; cabin = callPackage ../data/fonts/cabin { }; @@ -15223,8 +15124,6 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; - dmtx = dmtx-utils; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -15354,9 +15253,6 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - # for backwards compatibility - emacs25Macport_25_1 = emacs25Macport; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -15589,7 +15485,6 @@ with pkgs; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 exrdisplay = callPackage ../applications/graphics/exrdisplay { }; @@ -15752,9 +15647,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; - # the cli binary is actually called tshark and often packaged under this name - tshark = wireshark-cli; - # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; @@ -16532,7 +16424,6 @@ with pkgs; libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = librecad; # backwards compatibility alias, added 2015-10 libreoffice = hiPrio libreoffice-still; @@ -18578,15 +18469,12 @@ with pkgs; }; kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); - xbmcPlugins = kodiPlugins; kodi = wrapKodi { kodi = kodiPlain; }; - xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { @@ -18981,10 +18869,6 @@ with pkgs; physfs = physfs_2; }; - # these are here for compatibility - d1x_rebirth = dxx-rebirth; - d2x_rebirth = dxx-rebirth; - inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets descent2-assets; From 2911ece39281c0401d271545164ebd5ec22edf9a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 17:43:38 -0500 Subject: [PATCH 130/369] aliases: add gccApple --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cf39970fb926..74beaa81ea07 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,7 @@ mapAliases (rec { foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 + gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gettextWithExpat = gettext; # 2016-02-19 gflags = google-gflags; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cd7366c7170..e4cc1db32bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6093,8 +6093,6 @@ with pkgs; stripped = false; })); - gccApple = throw "gccApple is no longer supported"; - libstdcxxHook = makeSetupHook { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; From 9d7c57afc4ed9b73c8dfcc09caf503ed9513fde1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 17:44:18 -0500 Subject: [PATCH 131/369] aliases: add check if alias still exists in all-packages.nix If an alias is already defined in all-packages.nix, we want to throw an error to make it obvious that something is wrong. Otherwise there is no way to realize that the alias is shadowing the real definition. --- pkgs/top-level/aliases.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 74beaa81ea07..6f2ebeddb2d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -17,8 +17,17 @@ let dontDistribute alias else alias; + # Make sure that we are not shadowing something from + # all-packages.nix. + checkInPkgs = n: alias: if builtins.hasAttr n self + then throw "Alias ${n} is still in all-packages.nix" + else alias; + mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases; + lib.mapAttrs (n: alias: removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; in ### Deprecated aliases - for backward compatibility From ffe4b64205debbbdbc087277c4c8615c1591ac59 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 17:47:57 -0500 Subject: [PATCH 132/369] aliases: add skip aliases config You can turn on this config option if you want to find references to aliases in Nixpkgs. Ideally these can be removed from Nixpkgs and eventually we can remove the alias altogether. --- pkgs/top-level/stage.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index de676c5a4210..e38f5442d3aa 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -97,7 +97,8 @@ let res self; in res; - aliases = self: super: import ./aliases.nix super; + aliases = self: super: if config.skipAliases or false then {} + else import ./aliases.nix super; # stdenvOverrides is used to avoid having multiple of versions # of certain dependencies that were used in bootstrapping the From 4654643266b91c9cff8a162f96a1c98f38ee4d23 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 10:36:29 -0500 Subject: [PATCH 133/369] =?UTF-8?q?mysql=20=E2=86=92=20mariadb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3ea873cdc7ff..58c00cd84d33 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -43,7 +43,7 @@ let jobs.ghc.x86_64-darwin jobs.git.x86_64-darwin jobs.go.x86_64-darwin - jobs.mysql.x86_64-darwin + jobs.mariadb.x86_64-darwin jobs.nix-repl.x86_64-darwin jobs.nix.x86_64-darwin jobs.nox.x86_64-darwin @@ -99,7 +99,7 @@ let jobs.thunderbird.x86_64-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin - jobs.mysql.x86_64-darwin + jobs.mariadb.x86_64-darwin jobs.vim.x86_64-darwin # Ensure that UI stuff works on darwin jobs.inkscape.x86_64-darwin From 48a1345eaa1c57727f980fcdca0650a1311a485f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 29 Apr 2018 16:37:26 -0500 Subject: [PATCH 134/369] all-packages: normalize overrides Overrides should only be on the "default" package not the other way around. --- pkgs/top-level/all-packages.nix | 71 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4cc1db32bc7..f654e1aa8e35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2700,11 +2700,11 @@ with pkgs; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2_full.override { + grub2_efi = grub2.override { efiSupport = true; }; - grub2_light = grub2_full.override { + grub2_light = grub2.override { zfsSupport = false; }; @@ -3721,12 +3721,14 @@ with pkgs; mitmproxy = callPackage ../tools/networking/mitmproxy { }; - mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; - - mjpegtools = self.mjpegtoolsFull.override { + mjpegtools = callPackage ../tools/video/mjpegtools { withMinimal = true; }; + mjpegtoolsFull = mjpegtools.override { + withMinimal = false; + }; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); @@ -4310,28 +4312,27 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; - pinentry = pinentry_ncurses.override { - inherit gtk2; + pinentry = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = callPackage ../tools/security/pinentry { - libcap = if stdenv.isDarwin then null else libcap; + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = pinentry_ncurses.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = pinentry_ncurses.override { + pinentry_gnome = pinentry.override { gcr = gnome3.gcr; }; - pinentry_qt4 = pinentry_ncurses.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = pinentry_ncurses.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -4354,7 +4355,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = callPackage ../development/arduino/platformio { }; - platformio = platformioPackages.platformio-chrootenv.override {}; + platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -9293,7 +9294,7 @@ with pkgs; libheimdal = heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; - harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + harfbuzz-icu = harfbuzz.override { withIcu = true; withGraphite2 = true; }; @@ -9480,10 +9481,11 @@ with pkgs; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; - krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5Full.override { + krb5Full = krb5; + libkrb5 = krb5.override { fetchurl = fetchurlBoot; type = "lib"; }; @@ -9675,14 +9677,12 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; - libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { + libdbiDriversBase = libdbiDrivers.override { mysql = null; sqlite = null; }; - libdbiDrivers = libdbiDriversBase.override { - inherit sqlite mysql; - }; + libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; @@ -15639,16 +15639,16 @@ with pkgs; welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; - wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { - withQt = false; + wireshark = callPackage ../applications/networking/sniffers/wireshark { + withQt = true; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; + wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = wireshark-cli.override { withGtk = true; }; - wireshark-qt = wireshark-cli.override { withQt = true; }; - wireshark = wireshark-qt; + wireshark-gtk = wireshark.override { withGtk = true; }; + wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; fbida = callPackage ../applications/graphics/fbida { }; @@ -16166,13 +16166,12 @@ with pkgs; libwebp = null; }; - imagemagick = imagemagickBig.override { + imagemagick = callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = callPackage ../applications/graphics/ImageMagick { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + imagemagickBig = imagemagick.override { inherit ghostscript; }; imagemagick7_light = lowPrio (imagemagick7.override { bzip2 = null; @@ -19750,12 +19749,12 @@ with pkgs; # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. - liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = liblapackWithAtlas; - liblapack_3_5_0 = liblapack_3_5_0WithAtlas; + liblapack = callPackage ../development/libraries/science/math/liblapack {}; + liblapackWithAtlas = liblapack; + liblapackWithoutAtlas = liblapack.override { atlas = null; }; + liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; + liblapack_3_5_0WithAtlas = liblapack_3_5_0; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; From 7ab8c886a45673b69185bb25f19ccb6c4ac0a2f0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 13:46:05 -0500 Subject: [PATCH 135/369] all-packages: more overrides normalizing --- .../libraries/libindicate/default.nix | 2 +- .../libraries/libindicator/default.nix | 2 +- .../development/libraries/ncurses/default.nix | 2 +- pkgs/top-level/aliases.nix | 10 +- pkgs/top-level/all-packages.nix | 283 ++++++++---------- 5 files changed, 144 insertions(+), 155 deletions(-) diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 445a505b68c8..1bde9336c66d 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf , glib, dbus-glib, libdbusmenu-glib -, gtkVersion, gtk2 ? null, gtk3 ? null +, gtkVersion ? "3", gtk2 ? null, gtk3 ? null , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index a6eb0bed2bb8..33691f79a4c8 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig -, gtkVersion, gtk2 ? null, gtk3 ? null }: +, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }: with lib; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index abb3020e5fba..6a8867264dfd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig -, abiVersion +, abiVersion ? "6" , mouseSupport ? false , unicode ? true , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6f2ebeddb2d7..7576a7a07577 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,7 @@ mapAliases (rec { etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 fam = gamin; # added 2018-04-25 + ffadoFull = ffado; # added 2018-05-01 fftwFloat = fftwSinglePrec; # 2018-04-25 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 @@ -125,11 +126,13 @@ mapAliases (rec { gupnp_dlna = gupnp-dlna; # added 2018-02-25 gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 + heimdalFull = heimdal; # added 2018-05-01 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; + jack2Full = jack2; # added 2018-04-25 joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdiff3-qt5 = kdiff3; # added 2017-02-18 @@ -149,6 +152,7 @@ mapAliases (rec { libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 + libdbusmenu-glib = libdbusmenu; # added 2018-05-01 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 @@ -217,6 +221,7 @@ mapAliases (rec { postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 + pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 qt_gstreamer1 = qt-gstreamer1; # added 2017-02 @@ -247,6 +252,7 @@ mapAliases (rec { skype = skypeforlinux; # added 2017-07-27 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 + slurm-full = slurm; # added 2018-05-1 smbclient = samba; # added 2018-04-25 spaceOrbit = space-orbit; # addewd 2016-05-23 speech_tools = speech-tools; # added 2018-04-25 @@ -256,6 +262,7 @@ mapAliases (rec { sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 + suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 systool = sysfsutils; # added 2018-04-25 @@ -293,6 +300,7 @@ mapAliases (rec { xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 + xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 yacc = bison; # added 2018-04-25 @@ -328,7 +336,7 @@ mapAliases (rec { gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; +p ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f654e1aa8e35..db72b9b42b38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -946,7 +946,6 @@ with pkgs; calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; }; capstone = callPackage ../development/libraries/capstone { }; @@ -1615,13 +1614,13 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = hiPrio citrix_receiver_13_9_0; - citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; }; - citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; }; - citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; - citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; - citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; - citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; }; + citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; + citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; }; + citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; }; + citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; }; + citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; }; + citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; }; + citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; }; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2339,7 +2338,7 @@ with pkgs; fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); - fontforge-gtk = callPackage ../tools/misc/fontforge { + fontforge-gtk = fontforge.override { withSpiro = true; withGTK = true; gtk2 = gtk2-x11; @@ -2454,7 +2453,7 @@ with pkgs; gazebo7 = callPackage ../applications/science/robotics/gazebo { }; - gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; + gazebo7-headless = gazebo7.override { withHeadless = true; }; }; @@ -3494,7 +3493,7 @@ with pkgs; libiberty = callPackage ../development/libraries/libiberty { }; - libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; }; + libiberty_static = libiberty.override { staticBuild = true; }; libibverbs = callPackage ../development/libraries/libibverbs { }; @@ -3970,7 +3969,7 @@ with pkgs; nmap = callPackage ../tools/security/nmap { }; - nmap-graphical = callPackage ../tools/security/nmap { + nmap-graphical = nmap.override { graphicalSupport = true; }; @@ -5030,8 +5029,8 @@ with pkgs; }); strongswan = callPackage ../tools/networking/strongswan { }; - strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; }; - strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; }; + strongswanTNC = strongswan.override { enableTNC = true; }; + strongswanNM = strongswan.override { enableNetworkManager = true; }; su = shadow.su; @@ -6442,18 +6441,19 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; + bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; + bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; openjdk10 = callPackage ../development/compilers/openjdk/10.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; inherit (gnome2) GConf gnome_vfs; }; @@ -6676,7 +6676,7 @@ with pkgs; xlibsWrapper = null; }; - mitschemeX11 = callPackage ../development/compilers/mit-scheme { + mitschemeX11 = mitscheme.override { texLive = texlive.combine { inherit (texlive) scheme-small; }; texinfo = texinfo5; enableX11 = true; @@ -7031,7 +7031,7 @@ with pkgs; gtk2 = gtk2-x11; }; - lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance { + lxappearance-gtk3 = lxappearance.override { withGtk3 = true; }; @@ -7131,7 +7131,7 @@ with pkgs; octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions); }) octave octaveHg; - octaveFull = (lowPrio (callPackage ../development/interpreters/octave { + octaveFull = (lowPrio (octave.override { qt = qt4; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; openblas = if stdenv.isDarwin then openblasCompat else openblas; @@ -7360,22 +7360,21 @@ with pkgs; amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - amdappsdk26 = callPackage ../development/misc/amdapp-sdk { + amdappsdk26 = amdappsdk.override { version = "2.6"; }; - amdappsdk27 = callPackage ../development/misc/amdapp-sdk { + amdappsdk27 = amdappsdk.override { version = "2.7"; }; - amdappsdk28 = callPackage ../development/misc/amdapp-sdk { + amdappsdk28 = amdappsdk.override { version = "2.8"; }; - amdappsdk = amdappsdk28; + amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - amdappsdkFull = callPackage ../development/misc/amdapp-sdk { - version = "2.8"; + amdappsdkFull = amdappsdk.override { samples = true; }; @@ -7476,11 +7475,11 @@ with pkgs; ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; - apacheKafka = apacheKafka_1_0; - apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; - apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; - apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; - apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; + apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; }; + apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; }; + apacheKafka_0_10 = apacheKafka.override { majorVersion = "0.10"; }; + apacheKafka_0_11 = apacheKafka.override { majorVersion = "0.11"; }; + apacheKafka = callPackage ../servers/apache-kafka { }; kt = callPackage ../tools/misc/kt {}; @@ -8163,7 +8162,7 @@ with pkgs; remake = callPackage ../development/tools/build-managers/remake { }; retdec = callPackage ../development/tools/analysis/retdec { }; - retdec-full = callPackage ../development/tools/analysis/retdec { + retdec-full = retdec.override { withPEPatterns = true; }; @@ -8994,7 +8993,7 @@ with pkgs; stdenv = crossLibcStdenv; }; - muslCross = callPackage ../os-specific/linux/musl { + muslCross = musl.override { stdenv = crossLibcStdenv; }; @@ -9256,11 +9255,13 @@ with pkgs; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { + gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { }; + + gtk-mac-integration-gtk2 = gtk-macintegration.override { gtk = gtk2; }; - gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { + gtk-mac-integration-gtk3 = gtk-mac-integration.override { gtk = gtk3; }; @@ -9290,8 +9291,8 @@ with pkgs; hamlib = callPackage ../development/libraries/hamlib { }; - heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = heimdalFull.override { type = "lib"; }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + libheimdal = heimdal.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = harfbuzz.override { @@ -9344,7 +9345,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc {}; - hwloc-nox = callPackage ../development/libraries/hwloc { + hwloc-nox = hwloc.override { x11Support = false; }; @@ -9544,8 +9545,9 @@ with pkgs; libaom = callPackage ../development/libraries/libaom { }; - libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; }; - libappindicator-gtk3 = callPackage ../development/libraries/libappindicator { gtkVersion = "3"; }; + libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; + libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; + libappindicator = callPackage ../development/libraries/libappindicator { }; libarchive = callPackage ../development/libraries/libarchive { }; @@ -9684,9 +9686,9 @@ with pkgs; libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; - libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; - libdbusmenu-gtk3 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "3"; }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; + libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; + libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; @@ -9765,7 +9767,7 @@ with pkgs; libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { }; - libfm-extra = callPackage ../development/libraries/libfm { + libfm-extra = libfm.override { extraOnly = true; }; @@ -9906,11 +9908,13 @@ with pkgs; libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; - libindicate-gtk2 = callPackage ../development/libraries/libindicate { gtkVersion = "2"; }; - libindicate-gtk3 = callPackage ../development/libraries/libindicate { gtkVersion = "3"; }; + libindicate-gtk2 = libindicate.override { gtkVersion = "2"; }; + libindicate-gtk3 = libindicate.override { gtkVersion = "3"; }; + libindicate = callPackage ../development/libraries/libindicate { }; - libindicator-gtk2 = callPackage ../development/libraries/libindicator { gtkVersion = "2"; }; - libindicator-gtk3 = callPackage ../development/libraries/libindicator { gtkVersion = "3"; }; + libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; + libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; + libindicator = callPackage ../development/libraries/libindicator { }; libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; @@ -10501,7 +10505,7 @@ with pkgs; luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; - luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + luabind_luajit = luabind.override { lua = luajit; }; luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; }; @@ -10659,13 +10663,13 @@ with pkgs; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - ncurses5 = callPackage ../development/libraries/ncurses { + ncurses5 = ncurses.override { abiVersion = "5"; }; - ncurses6 = callPackage ../development/libraries/ncurses { + ncurses6 = ncurses.override { abiVersion = "6"; }; - ncurses = ncurses6; + ncurses = callPackage ../development/libraries/ncurses { }; neardal = callPackage ../development/libraries/neardal { }; @@ -10989,7 +10993,7 @@ with pkgs; qbs = callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; + qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; @@ -11487,17 +11491,16 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil-qt4 = callPackage ../development/libraries/audio/suil { - withQt4 = true; - withQt5 = false; - }; + suil = callPackage ../development/libraries/audio/suil { }; - suil-qt5 = callPackage ../development/libraries/audio/suil { + suil-qt5 = suil.override { withQt4 = false; withQt5 = true; }; - - suil = suil-qt4; + suil-qt4 = suil.override { + withQt4 = true; + withQt5 = false; + }; sundials = callPackage ../development/libraries/sundials { }; @@ -11892,7 +11895,7 @@ with pkgs; zlog = callPackage ../development/libraries/zlog { }; - zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib { + zlibStatic = lowPrio (appendToName "static" (zlib.override { static = true; })); @@ -12300,7 +12303,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; fleet = callPackage ../servers/fleet { }; @@ -12418,7 +12421,7 @@ with pkgs; nginxModules = callPackage ../servers/http/nginx/modules.nix { }; # We should move to dynmaic modules and create a nginxFull package with all modules - nginxShibboleth = callPackage ../servers/http/nginx/stable.nix { + nginxShibboleth = nginxStable.override { modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; }; @@ -12472,13 +12475,11 @@ with pkgs; # PulseAudio daemons - # Name is changed to prevent use in packages; - # please use libpulseaudio instead. - pulseaudioLight = callPackage ../servers/pulseaudio { + pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - pulseaudioFull = callPackage ../servers/pulseaudio { + pulseaudioFull = pulseaudio.override { gconf = gnome3.gconf; x11Support = true; jackaudioSupport = true; @@ -12491,7 +12492,7 @@ with pkgs; }; # libpulse implementations - libpulseaudio-vanilla = callPackage ../servers/pulseaudio { + libpulseaudio-vanilla = pulseaudio.override { libOnly = true; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -12598,8 +12599,8 @@ with pkgs; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; }; - #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; }; + OVMF-CSM = OVMF.override { openssl = null; }; + #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -12792,8 +12793,6 @@ with pkgs; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; - slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); - slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; @@ -13056,10 +13055,10 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffadoFull = callPackage ../os-specific/linux/ffado { + ffado = callPackage ../os-specific/linux/ffado { inherit (python2Packages) python pyqt4 dbus-python; }; - libffado = ffadoFull.override { prefix = "lib"; }; + libffado = ffado.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -13154,7 +13153,7 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; jfbview = callPackage ../os-specific/linux/jfbview { }; - jfbpdf = callPackage ../os-specific/linux/jfbview { + jfbpdf = jfbview.override { imageSupport = false; }; @@ -13908,7 +13907,7 @@ with pkgs; sysvinit = callPackage ../os-specific/linux/sysvinit { }; - sysvtools = callPackage ../os-specific/linux/sysvinit { + sysvtools = sysvinit.override { withoutInitTools = true; }; @@ -15013,7 +15012,7 @@ with pkgs; }; codeblocks = callPackage ../applications/editors/codeblocks { }; - codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; }; + codeblocksFull = codeblocks.override { contribPlugins = true; }; comical = callPackage ../applications/graphics/comical { }; @@ -15504,9 +15503,9 @@ with pkgs; fldigi = callPackage ../applications/audio/fldigi { }; - flink = flink_1_4; - flink_1_3 = callPackage ../applications/networking/cluster/flink { version = "1.3"; }; - flink_1_4 = callPackage ../applications/networking/cluster/flink { version = "1.4"; }; + flink = callPackage ../applications/networking/cluster/flink { }; + flink_1_3 = flink.override { version = "1.3"; }; + flink_1_4 = flink.override { version = "1.4"; }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; @@ -15690,7 +15689,7 @@ with pkgs; desktopName = "Firefox"; }; - firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; @@ -15926,7 +15925,7 @@ with pkgs; }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; - graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; + graphicsmagick_q16 = graphicsmagic.override { quantumdepth = 16; }; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; @@ -16424,54 +16423,36 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix - { libreoffice = callPackage ../applications/office/libreoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13 - stdenv = overrideCC stdenv gcc5; - };}); + libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + fontsConf = makeFontsConf { + fontDirectories = [ + carlito dejavu_fonts + freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13 + stdenv = overrideCC stdenv gcc5; + }; - libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix - { libreoffice = callPackage ../applications/office/libreoffice/still.nix { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped.override { poppler = poppler_0_61; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13; gcc6 is not enough! - stdenv = overrideCC stdenv gcc5; - };}); + }; + }); liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; @@ -16838,7 +16819,7 @@ with pkgs; libsForQt5.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; - mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { + mutt-with-sidebar = mutt.override { withSidebar = true; }; @@ -18285,7 +18266,7 @@ with pkgs; weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; - westonLite = callPackage ../applications/window-managers/weston { + westonLite = weston.override { pango = null; freerdp = null; libunwind = null; @@ -18580,21 +18561,21 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet_gnome2 = xmonad_log_applet.override { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; @@ -18896,13 +18877,13 @@ with pkgs; factorio = callPackage ../games/factorio { releaseType = "alpha"; }; - factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; }; + factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; - factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-headless = factorio.override { releaseType = "headless"; }; - factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; }; + factorio-headless-experimental = factorio.override { releaseType = "headless"; experimental = true; }; - factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; + factorio-demo = factorio.override { releaseType = "demo"; }; factorio-mods = callPackage ../games/factorio/mods.nix { }; @@ -18922,7 +18903,7 @@ with pkgs; freeciv = callPackage ../games/freeciv { }; - freeciv_gtk = callPackage ../games/freeciv { + freeciv_gtk = freeciv.override { gtkClient = true; sdlClient = false; }; @@ -19134,7 +19115,7 @@ with pkgs; pokerth = callPackage ../games/pokerth { }; - pokerth-server = with callPackage ../games/pokerth { }; server; + pokerth-server = pokerth.server; prboom = callPackage ../games/prboom { }; @@ -19401,7 +19382,7 @@ with pkgs; lua = lua5_2; }; - worldofgoo_demo = callPackage ../games/worldofgoo { + worldofgoo_demo = worldofgoo.override { demo = true; }; @@ -19841,21 +19822,21 @@ with pkgs; cmake = cmakeCurses; }; - gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsMpi = lowPrio (gromacs.override { singlePrec = true; mpiEnabled = true; fftw = fftwSinglePrec; cmake = cmakeCurses; }); - gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDouble = lowPrio (gromacs.override { singlePrec = false; mpiEnabled = false; fftw = fftw; cmake = cmakeCurses; }); - gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDoubleMpi = lowPrio (gromacs.override { singlePrec = false; mpiEnabled = true; fftw = fftw; @@ -20136,7 +20117,7 @@ with pkgs; maxima = callPackage ../applications/science/math/maxima { ecl = null; }; - maxima-ecl = callPackage ../applications/science/math/maxima { + maxima-ecl = maxima.override { ecl = ecl_16_1_2; ecl-fasl = true; sbcl = null; @@ -20291,7 +20272,7 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { }; - yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { + yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); @@ -20510,11 +20491,11 @@ with pkgs; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - jack2Full = callPackage ../misc/jackaudio { + jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; - libjack2 = jack2Full.override { prefix = "lib"; }; + libjack2 = jack2.override { prefix = "lib"; }; keynav = callPackage ../tools/X11/keynav { }; @@ -20578,7 +20559,7 @@ with pkgs; nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff; nix-info = callPackage ../tools/nix/info { }; - nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; + nix-info-tested = nix-info.override { doCheck = true; }; nix-index = callPackage ../tools/package-management/nix-index { }; @@ -21105,10 +21086,10 @@ with pkgs; spdlog = callPackage ../development/libraries/spdlog { }; - dart = dart_stable; - dart_old = callPackage ../development/interpreters/dart { version = "1.16.1"; }; - dart_stable = callPackage ../development/interpreters/dart { version = "1.24.3"; }; - dart_dev = callPackage ../development/interpreters/dart { version = "2.0.0-dev.26.0"; }; + dart = callPackage ../development/interpreters/dart { }; + dart_stable = dart.override { version = "1.24.3"; }; + dart_old = dart.override { version = "1.16.1"; }; + dart_dev = dart.override { version = "2.0.0-dev.26.0"; }; httrack = callPackage ../tools/backup/httrack { }; From a7d5c50034c3694590b9dcde689a1575700fa7f0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 13:51:03 -0500 Subject: [PATCH 136/369] all-packages: cleanup from last commit --- .../networking/remote/citrix-receiver/default.nix | 2 +- pkgs/development/interpreters/dart/default.nix | 6 +++--- .../libraries/libappindicator/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index d5982f33e78e..a721900f20a3 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -23,7 +23,7 @@ , alsaLib , libidn , zlib -, version ? null +, version ? "13.9.0" }: let diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 17f124e79890..ae7f8686b781 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version }: +{ stdenv, fetchurl, unzip, version ? "1.24.3" }: let @@ -57,9 +57,9 @@ stdenv.mkDerivation { ''; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; - + dontStrip = true; - + meta = { platforms = [ "i686-linux" "x86_64-linux" ]; homepage = https://www.dartlang.org/; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 6c87588fd3d7..71c388be6ea5 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus-glib, gtkVersion +, glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , python2Packages, gobjectIntrospection, vala diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7576a7a07577..03748be76a1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -336,7 +336,7 @@ mapAliases (rec { gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 -p ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; + ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db72b9b42b38..cf4df5ae360d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9255,15 +9255,15 @@ with pkgs; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { }; + gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { + gtk = gtk3; + }; - gtk-mac-integration-gtk2 = gtk-macintegration.override { + gtk-mac-integration-gtk2 = gtk-mac-integration.override { gtk = gtk2; }; - gtk-mac-integration-gtk3 = gtk-mac-integration.override { - gtk = gtk3; - }; + gtk-mac-integration-gtk3 = gtk-mac-integration; gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; @@ -15925,7 +15925,7 @@ with pkgs; }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; - graphicsmagick_q16 = graphicsmagic.override { quantumdepth = 16; }; + graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; From 485e4a614e8b8d2dec1cb3b479fd23d787105006 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 14:04:35 -0500 Subject: [PATCH 137/369] all-packages: revert 2 name changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I am reverting two name changes that might not be a good idea: - gnum4 → m4 - apacheAnt → ant These are debatable changes & not sure what’s best. I prefered the short version because there are not alternatives- but will not hold off for now. --- pkgs/top-level/aliases.nix | 3 --- pkgs/top-level/all-packages.nix | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 03748be76a1b..38b0e6391bfe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -40,8 +40,6 @@ mapAliases (rec { ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 - apacheAnt = ant; # added 2018-04-25 - apacheAnt_1_9 = ant_1_9; # added 2018-04-25 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 @@ -172,7 +170,6 @@ mapAliases (rec { lua5_sec = luaPackages.luasec; # added 2017-05-02 lzma = xz; # added 2018-04-25 m3d-linux = m33-linux; # added 2016-08-13 - gnum4 = m4; # added 2018-04-25 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 midoriWrapper = midori; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4df5ae360d..1c81cc59d2b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7471,9 +7471,9 @@ with pkgs; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4 = antlr4_7; - ant = callPackage ../development/tools/build-managers/apache-ant { }; - - ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; + apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + ant = apacheAnt; apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; }; apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; }; @@ -7851,7 +7851,8 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - m4 = callPackage ../development/tools/misc/gnum4 { }; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; + m4 = gnum4; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; From b05ca2d84d2b3d56fb6fa4486ae62b88d239a231 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 1 May 2018 16:52:40 -0500 Subject: [PATCH 138/369] aliases: remove fftwFloat I was not seeing this earlier but now getting this error : Alias fftwFloat is still in all-packages.nix --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38b0e6391bfe..71b895c0ef4a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -84,7 +84,6 @@ mapAliases (rec { exfat-utils = exfat; # 2015-09-11 fam = gamin; # added 2018-04-25 ffadoFull = ffado; # added 2018-05-01 - fftwFloat = fftwSinglePrec; # 2018-04-25 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 From 4b3cc9ed87a0c90898950fc1fa94d968acda1bed Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 30 Apr 2018 23:35:21 -0400 Subject: [PATCH 139/369] cctools: Cleanup `useOld` conditions slightly 60771af5b6fc183aa354ed95e4df32c497382414 jumped through some hoops in order to avoid a mass-rebuild. --- pkgs/os-specific/darwin/cctools/port.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d8abdc2c6f84..24f21b498aa5 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -108,17 +108,15 @@ let # include_next "unistd.h" #endif EOF - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh - '' + stdenv.lib.optionalString useOld '' + cd cctools + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh ''; # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather # hairy to handle during bootstrap. Perhaps it could be optional? - preConfigure = stdenv.lib.optionalString (!useOld) '' - cd cctools - '' + '' + preConfigure = '' sh autogen.sh ''; From 62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 30 Apr 2018 23:42:44 -0400 Subject: [PATCH 140/369] darwin.libiconv: Start to fix for cross I think I need postPatch for `autoreconfHook`, it's better anyways, and I'm pairing this with another mass-rebuild so its essentially free. --- .../darwin/apple-source-releases/libiconv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index d9b3dfb74049..a89f9fdf90ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,14 +1,14 @@ -{ stdenv, appleDerivation }: +{ stdenv, appleDerivation, autoreconfHook }: appleDerivation { - preConfigure = "cd libiconv"; + postUnpack = "sourceRoot=$sourceRoot/libiconv"; postInstall = '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs - echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \ + echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib From a0dd9713e31bf2dfbe33ed50f2915d1c654344db Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 16 Apr 2018 17:34:07 +0800 Subject: [PATCH 141/369] vlc: 2.2.8 -> 3.0.1 --- pkgs/applications/video/vlc/default.nix | 105 +++++++++++------------- pkgs/top-level/all-packages.nix | 17 +--- 2 files changed, 54 insertions(+), 68 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 44c4d317d36a..6cc26baf70c0 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,86 +1,81 @@ -{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray +{ stdenv, fetchurl, autoreconfHook +, libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska -, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp +, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image +, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus -, libvdpau, libsamplerate, live555, fluidsynth -, qt4 ? null -, withQt5 ? false, qtbase ? null, qtx11extras ? null +, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus +, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols +, onlyLibVLC ? false +, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , jackSupport ? false , fetchpatch }: with stdenv.lib; -assert (withQt5 -> qtbase != null && qtx11extras != null); -assert (!withQt5 -> qt4 != null); +assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.8"; + version = "3.0.1"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v"; + sha256 = "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f"; }; - # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. - # https://trac.videolan.org/vlc/ticket/16497 - postPatch = if (!withQt5) then null else - "sed '/I78ef29975181ee22429c9bd4b11d96d9e68b7a9c/s/^/: #/' -i configure"; - - buildInputs = - [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt - libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib - libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms - libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 - fluidsynth - ] - ++ [(if withQt5 then qtbase else qt4)] - ++ optional withQt5 qtx11extras + # VLC uses a *ton* of libraries for various pieces of functionality, many of + # which are not included here for no other reason that nobody has mentioned + # needing them + buildInputs = [ + zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror + libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec + systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive + libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full + xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms + libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 + fluidsynth wayland wayland-protocols + ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; - nativeBuildInputs = [ pkgconfig ]; - - LIVE555_PREFIX = live555; - - preConfigure = '' - sed -e "s@/bin/echo@echo@g" -i configure - '' + optionalString withQt5 '' - # Make sure we only *add* "-std=c++11" to CXXFLAGS instead of overriding the - # values figured out by configure (for example "-g -O2"). - sed -i -re '/^ *CXXFLAGS=("[^$"]+")? *$/s/CXXFLAGS="?/&-std=c++11 /' \ - configure - ''; - - configureFlags = - [ "--enable-alsa" - "--with-kde-solid=$out/share/apps/solid/actions" - "--enable-dc1394" - "--enable-ncurses" - "--enable-vdpau" - "--enable-dvdnav" - "--enable-samplerate" - ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; enableParallelBuilding = true; - preBuild = '' - substituteInPlace modules/text_renderer/freetype.c --replace \ - /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \ - ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf + LIVE555_PREFIX = live555; + + # vlc depends on a c11-gcc wrapper script which we don't have so we need to + # set the path to the compiler + BUILDCC = "${stdenv.cc}/bin/gcc"; + + postPatch = '' + substituteInPlace configure \ + --replace /bin/echo echo + + substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ + /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; + # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + postFixup = '' + find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' + $out/lib/vlc/vlc-cache-gen $out/vlc/plugins + ''; + + # Most of the libraries are auto-detected so we don't need to set a bunch of + # "--enable-foo" flags here + configureFlags = [ + "--with-kde-solid=$out/share/apps/solid/actions" + ] ++ optional onlyLibVLC "--disable-vlc"; + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; - platforms = platforms.linux; license = licenses.lgpl21Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c81cc59d2b9..451239b54354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11159,9 +11159,7 @@ with pkgs; withQt5 = true; }; - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { - withQt5 = true; - }; + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; @@ -11196,11 +11194,7 @@ with pkgs; telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = lowPrio (callPackage ../applications/video/vlc { - qt4 = null; - withQt5 = true; - ffmpeg = ffmpeg_2; - }); + vlc = callPackage ../applications/video/vlc {}; qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; @@ -18188,16 +18182,13 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2; - }; + vlc = libsForQt5.vlc; + vlc_qt5 = vlc; vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { gtk = gtk2; }; - vlc_qt5 = libsForQt5.vlc; - vmpk = callPackage ../applications/audio/vmpk { }; vnstat = callPackage ../applications/networking/vnstat { }; From 490e6fc9eb051b93482761ab667697972a259b34 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 16 Apr 2018 17:30:42 +0800 Subject: [PATCH 142/369] vlc_npapi: drop it as firefox no longer support NPAPI --- pkgs/applications/video/vlc/plugin.nix | 34 -------------------------- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/applications/video/vlc/plugin.nix diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix deleted file mode 100644 index 583d978a5514..000000000000 --- a/pkgs/applications/video/vlc/plugin.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk, -libxcb, xlibsWrapper, gtk}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "vlc-plugin-${version}"; - version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4 - - src = fetchgit { - url = "https://code.videolan.org/videolan/npapi-vlc.git"; - rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20"; - sha256 = "0k4s0657kv1mx1md8vj87scs0hz59xy7syqdsxb48w3w8gnfljs0"; - }; - - preConfigure = "sh autogen.sh"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb - xlibsWrapper gtk ]; - - enableParallelBuilding = true; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - description = "Webplugins based on libVLC (for firefox, npapi)"; - homepage = https://code.videolan.org/videolan/npapi-vlc; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 451239b54354..482f2e024844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18183,11 +18183,8 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = libsForQt5.vlc; - vlc_qt5 = vlc; - vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { - gtk = gtk2; - }; + vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; From a3f5c424f7c863062a1020d00c46247c0550c677 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Mon, 16 Apr 2018 14:01:06 +0800 Subject: [PATCH 143/369] phonon-backend-vlc: 0.9.0 -> 0.10.1 --- pkgs/development/libraries/phonon/backends/vlc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 53281ddc6578..643e36ba6cd6 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -7,7 +7,7 @@ with lib; let - v = "0.9.0"; + v = "0.10.1"; pname = "phonon-backend-vlc"; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; - sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0"; + sha256 = "0b87mzkw9fdkrwgnh1kw5i5wnrd05rl42hynlykb7cfymsk6v5h9"; }; buildInputs = From 3107b4f0187d2470b836e89943b229b6c8cdb098 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Wed, 25 Apr 2018 22:44:51 +0800 Subject: [PATCH 144/369] firefox: remove vlc_npapi --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 45917bf65c1e..d56ceff81842 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,7 +7,6 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin -, vlc_npapi , browserpass, chrome-gnome-shell , libudev , kerberos @@ -57,7 +56,6 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin - ++ lib.optional (cfg.enableVLC or false) vlc_npapi ++ extraPlugins ); nativeMessagingHosts = From 14cdf3741838e5a3774ce452dc79b8374f8ec037 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 08:11:36 -0700 Subject: [PATCH 145/369] lzma: 5.2.3 -> 5.2.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xz/versions. These checks were done: - built on NixOS - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep -V’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --version’ and found version 5.2.4 - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz -h’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --help’ got 0 exit code - ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --version’ and found version 5.2.4 - found 5.2.4 with grep in /nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin - directory tree listing: https://gist.github.com/5bf57c36243ce0756cb390f685d22fdf --- pkgs/tools/compression/xz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index da3a537da283..37c0c6d1c7e8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.2.3"; + name = "xz-5.2.4"; src = fetchurl { url = "https://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; + sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; From b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Wed, 2 May 2018 21:53:45 +0200 Subject: [PATCH 146/369] ncurses: Fix shared library extension on darwin This fixes #36898 --- pkgs/development/libraries/ncurses/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index abb3020e5fba..4c93faedccef 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the # wide-character libraries (e.g. libncurses.so to libncursesw.so). - postFixup = '' + postFixup = let + abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in + '' # Determine what suffixes our libraries have suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)" libs="$(ls $dev/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")" @@ -95,12 +97,12 @@ stdenv.mkDerivation rec { for dylibtype in so dll dylib; do if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype - ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion} + ln -svf lib''${library}$suffix.${abiVersion-extension} $out/lib/lib$library$newsuffix.${abiVersion-extension} if [ "ncurses" = "$library" ] then # make libtinfo symlinks ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype - ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion} + ln -svf lib''${library}$suffix.${abiVersion-extension} $out/lib/libtinfo$newsuffix.${abiVersion-extension} fi fi done From 3513034208aac88004e4798020cb66540a77ddad Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 2 May 2018 15:31:37 -0500 Subject: [PATCH 147/369] darwin.libiconv: fix setup hook --- .../darwin/apple-source-releases/libiconv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index a89f9fdf90ed..c67609e96755 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -14,7 +14,7 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; - setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh; + setupHook = ../../../../development/libraries/libiconv/setup-hook.sh; meta = { platforms = stdenv.lib.platforms.darwin; From 8013b38de67a5635b4889c42f1c41a6cb336d1b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 14:00:05 -0700 Subject: [PATCH 148/369] libnetfilter_conntrack: 1.0.6 -> 1.0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libnetfilter_conntrack/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.0.7 with grep in /nix/store/05vjszwxnlqg6vhwm32ahsi1lri60hwq-libnetfilter_conntrack-1.0.7 - directory tree listing: https://gist.github.com/36bdb6f33ffd72101417b81a2251914f --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 1b4c471a2567..41245e6539f4 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libnetfilter_conntrack-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; - sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g"; + sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; }; buildInputs = [ libmnl ]; From e9c38095c620fd03f023d14bd10efab792f348f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 13:33:46 -0700 Subject: [PATCH 149/369] libnftnl: 1.0.9 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libnftnl/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.1.0 with grep in /nix/store/y9gq6j60kx9ya2aj2wgbfc73siq6fhn6-libnftnl-1.1.0 - directory tree listing: https://gist.github.com/c99e0a7414adaa7a40543678fd581602 --- pkgs/development/libraries/libnftnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index ad8c7626661e..6570d1eb3c0e 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.0.9"; + version = "1.1.0"; name = "libnftnl-${version}"; src = fetchurl { url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy"; + sha256 = "0v4gywcjvv2vg4zk632al1zv3ad0lx87nshynv110l8n3fhsq3pc"; }; nativeBuildInputs = [ pkgconfig ]; From 59c22bf3a12f4187169e9c1fcb741cc7556b2b7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 16:04:31 -0700 Subject: [PATCH 150/369] go: 1.10.1 -> 1.10.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/go/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2/bin/.go-wrapped help’ got 0 exit code - ran ‘/nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2/bin/go help’ got 0 exit code - found 1.10.2 with grep in /nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2 - directory tree listing: https://gist.github.com/249bfa4dc4d10281576f20de902e501a --- pkgs/development/compilers/go/1.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 69184744307d..a6639d643dcf 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; + sha256 = "1lbxnlj5l9i8k1dg33dh8ndx9vspk9dkpcbg06jbbswy6kadmx6f"; }; # perl is used for testing go vet From bf762d13e3135c4daf963b19ed1a8e13155c1b95 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 May 2018 16:33:55 -0700 Subject: [PATCH 151/369] dbus: 1.12.6 -> 1.12.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbus/versions. These checks were done: - built on NixOS - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-monitor --help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-update-activation-environment help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets -h’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets --help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session -h’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session --help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-uuidgen --help’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch -h’ got 0 exit code - ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch --help’ got 0 exit code - found 1.12.8 with grep in /nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8 - directory tree listing: https://gist.github.com/598fa486a7a2da2a0887e0899dd2ed27 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 55484b85a8e6..4f6bd829099f 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.12.6"; - sha256 = "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2"; + version = "1.12.8"; + sha256 = "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72"; self = stdenv.mkDerivation { name = "dbus-${version}"; From 130aee566d8348649bd31311752809a46b314acf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 3 May 2018 10:34:35 +0200 Subject: [PATCH 152/369] gnupg: 2.2.6 -> 2.2.7 See http://lists.gnu.org/archive/html/info-gnu/2018-05/msg00004.html for release informations. --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 87dcbe4e7066..0f575d748b6c 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6"; + sha256 = "0vlpis0q7gvq9mhdc43hkyn3cdriz4mwgj20my3gyzpgwqg3cnyr"; }; nativeBuildInputs = [ pkgconfig ]; From 3641b35baee69bbe8bc41b89e0a41f4e62397003 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 3 May 2018 13:20:42 +0200 Subject: [PATCH 153/369] gcc7: Removed java as a target language --- pkgs/development/compilers/gcc/7/default.nix | 67 +++----------------- 1 file changed, 8 insertions(+), 59 deletions(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index d0dd40083345..4b2624479a8e 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -2,23 +2,22 @@ , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin -, langJava ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false , enableShared ? true , texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man); required for Java +, perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. -, zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null +, zlib ? null +, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null -, x11Support ? langJava +, x11Support ? false , enableMultilib ? false , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" @@ -33,10 +32,6 @@ , buildPackages }: -assert langJava -> zip != null && unzip != null - && zlib != null && boehmgc != null - && perl != null; # for `--enable-java-home' - # LTO needs libelf and zlib. assert libelf != null -> zlib != null; @@ -70,29 +65,11 @@ let version = "7.3.0"; }) ++ optional langFortran ../gfortran-driving.patch; - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = http://www.antlr.org/download/antlr-4.4-complete.jar; - sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; - }; - xlibs = [ libX11 libXt libSM libICE libXtst libXrender libXrandr libXi xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && x11Support; - /* Platform flags */ platformFlags = let gccArch = targetPlatform.platform.gcc.arch or null; @@ -282,13 +259,12 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler libcCross crossMingw; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional (perl != null) perl); # For building runtime libs depsBuildTarget = @@ -303,8 +279,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with @@ -356,7 +330,6 @@ stdenv.mkDerivation ({ ( optional langC "c" ++ optional langCC "c++" ++ optional langFortran "fortran" - ++ optional langJava "java" ++ optional langGo "go" ++ optional langObjC "objc" ++ optional langObjCpp "obj-c++" @@ -377,19 +350,6 @@ stdenv.mkDerivation ({ # Optional features optional (isl != null) "--with-isl=${isl}" ++ - # Java options - optionals langJava [ - "--with-ecj-jar=${javaEcj}" - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # . - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ - - platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -428,11 +388,6 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # # Likewise, the LTO code doesn't find zlib. # # Cross-compiling, we need gcc not to read ./specs in order to build the g++ @@ -441,9 +396,6 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread ++ optional (libpthreadCross != null) libpthreadCross @@ -455,9 +407,6 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread) ); @@ -498,8 +447,8 @@ stdenv.mkDerivation ({ longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). GCC development is a part of the GNU Project, aiming to improve the compiler used in the GNU system including the GNU/Linux variant. From 719810d47423a636f5d07391095220fadc3b7e41 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 3 May 2018 16:43:51 +0200 Subject: [PATCH 154/369] gcc7: Removed X11 components, since they were only used by langJava See also: https://github.com/NixOS/nixpkgs/pull/39866/commits/51ac1d8df08d606ae5d8af95073bb74e330249f3 https://github.com/NixOS/nixpkgs/pull/39866#discussion_r185813776 --- pkgs/development/compilers/gcc/7/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 4b2624479a8e..c25c2a260295 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -12,12 +12,6 @@ , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null -, pkgconfig ? null -, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null -, x11Support ? false , enableMultilib ? false , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" @@ -65,11 +59,6 @@ let version = "7.3.0"; }) ++ optional langFortran ../gfortran-driving.patch; - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto - ]; - /* Platform flags */ platformFlags = let gccArch = targetPlatform.platform.gcc.arch or null; @@ -155,9 +144,6 @@ let version = "7.3.0"; in -# We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; - stdenv.mkDerivation ({ name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; From 0a4622cfe9e6ba800e57e0cbe8515a6e6fac8783 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 3 May 2018 19:42:42 +0200 Subject: [PATCH 155/369] gcc-snapshot: Removed java as a target language --- .../compilers/gcc/snapshot/default.nix | 76 ++----------------- 1 file changed, 6 insertions(+), 70 deletions(-) diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index d37cfac3fa85..ed7634b87db3 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -2,23 +2,16 @@ , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin -, langJava ? false , langGo ? false , profiledCompiler ? false , staticCompiler ? false , enableShared ? true , texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man); required for Java +, perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. -, zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null -, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null -, x11Support ? langJava +, zlib ? null , enableMultilib ? false , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" @@ -34,10 +27,6 @@ , buildPackages }: -assert langJava -> zip != null && unzip != null - && zlib != null && boehmgc != null - && perl != null; # for `--enable-java-home' - # LTO needs libelf and zlib. assert libelf != null -> zlib != null; @@ -63,29 +52,6 @@ let version = "7-20170409"; ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch; - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = http://www.antlr.org/download/antlr-4.4-complete.jar; - sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; - }; - - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto - ]; - - javaAwtGtk = langJava && x11Support; - /* Platform flags */ platformFlags = let gccArch = targetPlatform.platform.gcc.arch or null; @@ -166,9 +132,6 @@ let version = "7-20170409"; in -# We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; - stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -245,13 +208,12 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler libcCross crossMingw; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); + ++ (optional (perl != null) perl); # For building runtime libs depsBuildTarget = @@ -266,8 +228,6 @@ stdenv.mkDerivation ({ targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) # The builder relies on GNU sed (for instance, Darwin's `sed' fails with @@ -319,7 +279,6 @@ stdenv.mkDerivation ({ ( optional langC "c" ++ optional langCC "c++" ++ optional langFortran "fortran" - ++ optional langJava "java" ++ optional langGo "go" ++ optional langObjC "objc" ++ optional langObjCpp "obj-c++" @@ -340,18 +299,6 @@ stdenv.mkDerivation ({ # Optional features optional (isl != null) "--with-isl=${isl}" ++ - # Java options - optionals langJava [ - "--with-ecj-jar=${javaEcj}" - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # . - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ - platformFlags ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -388,11 +335,6 @@ stdenv.mkDerivation ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK+ peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # # Likewise, the LTO code doesn't find zlib. # # Cross-compiling, we need gcc not to read ./specs in order to build the g++ @@ -401,9 +343,6 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread ++ optional (libpthreadCross != null) libpthreadCross @@ -415,9 +354,6 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread) ); @@ -458,8 +394,8 @@ stdenv.mkDerivation ({ longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). GCC development is a part of the GNU Project, aiming to improve the compiler used in the GNU system including the GNU/Linux variant. From c0ebcab789af5927e67117baae97534b72fea207 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 3 May 2018 13:35:01 -0500 Subject: [PATCH 156/369] darwin.ICU: delete old /usr files This is a huge directory & not referenced anywhere. --- pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index eef26f4b79a6..6cf7ee07b70b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -20,5 +20,6 @@ appleDerivation { postInstall = '' mv $out/usr/local/include $out/include + rm -rf $out/usr ''; } From 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 3 May 2018 13:36:06 -0500 Subject: [PATCH 157/369] darwin.libSystem: multiple outputs adds 2 outputs for libSystem: - out - dev should shrink closure sizes --- .../darwin/apple-source-releases/Libsystem/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 28406c9751dc..89dc6eb74de9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -7,6 +7,8 @@ appleDerivation rec { nativeBuildInputs = [ cpio ]; + outputs = [ "out" "dev" ]; + installPhase = '' export NIX_ENFORCE_PURITY= From e25efa9673f3b274132875a4a95aae012b0b3467 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 3 May 2018 13:36:38 -0500 Subject: [PATCH 158/369] gettext: add dev output --- pkgs/development/libraries/gettext/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6dec7747c7e8..e64c045ad819 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff ]; - outputs = [ "out" "man" "doc" "info" ]; + outputs = [ "out" "dev" "man" "doc" "info" ]; hardeningDisable = [ "format" ]; From d88a61e43996ab6b1a5f72adabfd19f4c97b9275 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 3 May 2018 15:11:00 -0500 Subject: [PATCH 159/369] libsystem: fix phases --- .../darwin/apple-source-releases/Libsystem/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 89dc6eb74de9..8575e0676253 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,7 +3,8 @@ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + dontConfigure = true; nativeBuildInputs = [ cpio ]; From 481ca447715a9f71c51ac4c3591b2e9c6593a472 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 3 May 2018 15:14:24 -0500 Subject: [PATCH 160/369] git: disable failing test w/musl for now I'm working to resolve this but it will take some time (patches sent to upstream musl, maybe to git afterwards) and for now this blocks quite a lot. If that doesn't work out we can explore options such as always using GNU libiconv with musl. --- .../version-management/git-and-tools/git/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 21e9a805c108..a3f61f3399db 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -277,6 +277,9 @@ EOF # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? disable_test t1700-split-index "null sha1" + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + # Test fails (as of 2.17.0, musl 1.1.19) + disable_test t3900-i18n-commit ''; From 67e4ed96937dbbb663a66a9f0228f4811b5020df Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 7 Dec 2017 09:55:48 -0500 Subject: [PATCH 161/369] mmc-utils: Enable cross-compilation --- pkgs/os-specific/linux/mmc-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index a17f687a2550..b491d5bbda7e 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x"; }; + makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; + installPhase = '' make install prefix=$out mkdir -p $out/share/man/man1 From edd92f9182e63d6f118a1c5136590694fb1793dc Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 7 Dec 2017 09:55:37 -0500 Subject: [PATCH 162/369] net-tools: Enable cross-compilation --- pkgs/os-specific/linux/net-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index ce287dc18415..42f745b02e30 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" "BASEDIR=$(out)" "mandir=/share/man" "HAVE_ARP_TOOLS=1" From 10fa4a571c0669e44acfedc3bf1917b3ffcfbf61 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 16:57:54 -0400 Subject: [PATCH 163/369] tcp-wrappers: Enable cross-compilation This package, like so many others, assumes that ar is unprefixed. --- pkgs/os-specific/linux/tcp-wrappers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index e3aae30babca..5df7bb827aad 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libnsl ]; - makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ]; installPhase = '' mkdir -p "$out/bin" From d8c744b862e718ccf52ca6197a1c2383d77e9482 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 15:21:06 -0400 Subject: [PATCH 164/369] libnl: Enable parallel building This is a long enough derivation to make this worthwhile. --- pkgs/os-specific/linux/libnl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index f66df8163ff1..c79a4314d6f1 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r"; }); + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; meta = with lib; { From 6971c503af84da630e518697740789cb4c38a46f Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 14:00:31 -0400 Subject: [PATCH 165/369] runit: Enable cross-compilation --- pkgs/tools/system/runit/default.nix | 8 ++++++-- pkgs/tools/system/runit/fix-ar-ranlib.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/system/runit/fix-ar-ranlib.patch diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index aa2f50f2df07..4d5de56fbf0d 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; }; + patches = [ + ./fix-ar-ranlib.patch + ]; + outputs = [ "out" "man" ]; sourceRoot = "admin/${name}"; @@ -34,8 +38,8 @@ stdenv.mkDerivation rec { cd src # Both of these are originally hard-coded to gcc - echo cc > conf-cc - echo cc > conf-ld + echo ${stdenv.cc.targetPrefix}cc > conf-cc + echo ${stdenv.cc.targetPrefix}cc > conf-ld ''; installPhase = '' diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/tools/system/runit/fix-ar-ranlib.patch new file mode 100644 index 000000000000..c65a037d5242 --- /dev/null +++ b/pkgs/tools/system/runit/fix-ar-ranlib.patch @@ -0,0 +1,18 @@ +--- runit-2.1.2/src/print-ar.sh ++++ runit-2.1.2/src/print-ar.sh +@@ -1,7 +1,7 @@ + cat warn-auto.sh + echo 'main="$1"; shift' + echo 'rm -f "$main"' +-echo 'ar cr "$main" ${1+"$@"}' ++echo '$AR cr "$main" ${1+"$@"}' + case "`cat systype`" in + sunos-5.*) ;; + unix_sv*) ;; +@@ -10,5 +10,5 @@ case "`cat systype`" in + dgux-*) ;; + hp-ux-*) ;; + sco*) ;; +- *) echo 'ranlib "$main"' ;; ++ *) echo '$RANLIB "$main"' ;; + esac From d23f71deaa161054ef449c0014c5043d85ae950b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 23:17:55 -0400 Subject: [PATCH 166/369] curl: Enable cross-compilation By fixing toolchain paths --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4a1ff7f1798a..5980392267b0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"; - CXX = "c++"; - CXXCPP = "c++ -E"; + CXX = "${stdenv.cc.targetPrefix}c++"; + CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; doCheck = false; # expensive, fails From a09aa86ece6b39fb38fed510396abea779fa4d76 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 26 Feb 2018 18:17:23 -0500 Subject: [PATCH 167/369] rng-tools: Enable cross-compilation --- pkgs/tools/security/rng-tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 1885940e7f31..d2326c7e8c38 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; }; + # For cross-compilation + makeFlags = [ "AR:=$(AR)" ]; + meta = { description = "A random number generator daemon"; From 8b32cfdbc06e4839e71e9b11ab23aff726d48535 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 24 Apr 2018 16:25:33 -0400 Subject: [PATCH 168/369] lib.systems.gnu: Accept gnueabi as a gnu platform --- lib/systems/for-meta.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 9e85cea3ad11..4ecd9ffc6ac6 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -19,7 +19,11 @@ in rec { darwin = [ patterns.isDarwin ]; freebsd = [ patterns.isFreeBSD ]; # Should be better, but MinGW is unclear, and HURD is bit-rotted. - gnu = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ]; + gnu = [ + { kernel = parse.kernels.linux; abi = parse.abis.gnu; } + { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; } + { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; } + ]; illumos = [ patterns.isSunOS ]; linux = [ patterns.isLinux ]; netbsd = [ patterns.isNetBSD ]; From 860c81d6f70aac3f653fc240e35e7d6f7e98a187 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 25 Feb 2018 14:42:23 -0500 Subject: [PATCH 169/369] ldns: Enable cross-compilation --- pkgs/development/libraries/ldns/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 6c2a8f84d232..e9d81d3ab785 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { "--with-trust-anchor=${dns-root-data}/root.key" "--with-drill" "--disable-gost" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" ]; postInstall = '' From da481541585d5c6feb237f1559320dc7dfc064f7 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Apr 2018 16:35:31 -0400 Subject: [PATCH 170/369] glib: Enable cross-compilation glib needs gettext for the build machine. Since gettext is also a propagatedBuildInput I'm assuming that it's also used at runtime. --- pkgs/development/libraries/glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 403f0e8aa995..ac921227740c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; - nativeBuildInputs = [ pkgconfig perl python ]; + nativeBuildInputs = [ pkgconfig perl python gettext ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; From 86a778a80a3e4a8eca8fad3a6a4a93142255ebbc Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 20 Dec 2017 13:58:56 -0500 Subject: [PATCH 171/369] avahi: Enable cross-compilation --- pkgs/development/libraries/avahi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 098378701d57..53e3f5468abc 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -20,13 +20,15 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ] ++ (stdenv.lib.optional qt4Support qt4); - nativeBuildInputs = [ pkgconfig gettext intltool ]; + nativeBuildInputs = [ pkgconfig gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" "--disable-gtk" "--disable-gtk3" "--${if qt4Support then "enable" else "disable"}-qt4" - "--disable-python" "--localstatedir=/var" "--with-distro=none" ] + "--disable-python" "--localstatedir=/var" "--with-distro=none" + # A systemd unit is provided by the avahi-daemon NixOS module + "--with-systemdsystemunitdir=no" ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" # autoipd won't build on darwin ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd"; From 39df5831cae0dce4628e80cf7f6f5520a9dae18e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 3 May 2018 17:52:11 -0400 Subject: [PATCH 172/369] lib{std,}c++: Fix setup hooks for cross --- pkgs/development/compilers/gcc/libstdc++-hook.sh | 15 +++++++++++++-- .../compilers/llvm/3.5/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/3.7/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/3.8/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/3.9/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/4/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/5/libc++/setup-hook.sh | 15 +++++++++++++-- .../compilers/llvm/6/libc++/setup-hook.sh | 15 +++++++++++++-- 8 files changed, 104 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 893bbbc0c2dc..2325eeb9e2cf 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,2 +1,13 @@ -export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" -export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++" +# The `hostOffset` describes how the host platform of the dependencies are slid +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libstdc++" diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh index 9022fced6ecf..e18733b5ea3a 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies are slid +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh index 9022fced6ecf..e18733b5ea3a 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies are slid +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh index 9022fced6ecf..bcd93cf486ff 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh index 9022fced6ecf..bcd93cf486ff 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh index 9022fced6ecf..bcd93cf486ff 100644 --- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh index 9022fced6ecf..bcd93cf486ff 100644 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh index 9022fced6ecf..bcd93cf486ff 100644 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -1,3 +1,14 @@ +# The `hostOffset` describes how the host platform of the dependencies +# relative to the depending package. It is brought into scope of the setup hook +# defined as the role of the dependency whose hooks is being run. +case $hostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; + return 1 ;; +esac + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" From 5206574be32cbcfa8464dbf83db7d93dee784b5c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 3 May 2018 18:02:57 -0500 Subject: [PATCH 173/369] stdenv: add libSystem.dev to allowedRequisites --- pkgs/stdenv/darwin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9563f52ea263..98102cd56545 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -225,7 +225,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); + (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]); overrides = persistent; }; @@ -263,7 +263,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld ICU Libsystem locale ]); + (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]); overrides = persistent; }; @@ -383,7 +383,7 @@ in rec { binutils.bintools darwin.binutils darwin.binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale + dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale ]); overrides = self: super: From 27d716f4b5f56ec3c1230f4c97aa8fcd8696bfb2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 May 2018 10:54:06 -0500 Subject: [PATCH 174/369] llvm5: 5.0.1 -> 5.0.2 --- pkgs/development/compilers/llvm/5/clang/default.nix | 2 +- pkgs/development/compilers/llvm/5/default.nix | 6 +++--- pkgs/development/compilers/llvm/5/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/5/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/5/lld.nix | 2 +- pkgs/development/compilers/llvm/5/lldb.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 2 +- pkgs/development/compilers/llvm/5/openmp.nix | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 6499be2a0bdc..8027733bc527 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"} + unpackFile ${fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 13e1d2308f8c..67fceb317499 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -6,7 +6,7 @@ let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "5.0.1"; + release_version = "5.0.2"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,8 +14,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf"; - clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs"; + compiler-rt_src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; + clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; # Add man output without introducing extra dependencies. overrideManOutput = drv: diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 9ddeea7ef79a..6a486636d33a 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; + src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 6d27dcd47b0b..69970543674c 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as"; + src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index 1d00b16cce1f..05801f2f08f0 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym"; + src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 559c52831cd2..5e670d4de159 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp"; + src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index ac575a0bf7aa..66985861e386 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -20,7 +20,7 @@ }: let - src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz"; + src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 5a01c191b5ae..5c2b7501f979 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd"; + src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; From b99d7727b9acfdb80d85f4179423d7273d10d9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 5 May 2018 07:27:10 +0200 Subject: [PATCH 175/369] python.pkgs.bootstrapped-pip: remove pkg_resources patch --- .../python-modules/bootstrapped-pip/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 28962d0c9361..e6f751714451 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -14,14 +14,6 @@ let sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; }; - # TODO: Shouldn't be necessary anymore for pip >= 10! - # https://github.com/NixOS/nixpkgs/issues/26392 - # https://github.com/pypa/setuptools/issues/885 - pkg_resources = fetchurl { - url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py"; - sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv"; - }; - in stdenv.mkDerivation rec { pname = "pip"; version = "10.0.1"; @@ -38,8 +30,6 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - # TODO: Shouldn't be necessary anymore for pip >= 10! - cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; patchPhase = '' From f13cf52a843f2bca9ecdeb6f58db0b20244672f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 5 May 2018 07:36:39 +0200 Subject: [PATCH 176/369] python.pkgs.bootstrapped-pip: wheel: 0.30.0 -> 0.31.0 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index e6f751714451..250703cbc53b 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,9 +3,9 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.30.0"; + version = "0.31.0"; format = "wheel"; - sha256 = "e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64"; + sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107"; }; setuptools_source = fetchPypi { pname = "setuptools"; From 295815bec71ccee51cbc35582e7300df00c7fd6b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 3 May 2018 21:17:14 -0500 Subject: [PATCH 177/369] treewide: Remove phases --- .../darwin/apple-source-releases/CarbonHeaders/default.nix | 2 -- .../darwin/apple-source-releases/CommonCrypto/default.nix | 2 -- .../darwin/apple-source-releases/Libc/825_40_1.nix | 2 -- .../os-specific/darwin/apple-source-releases/Libc/default.nix | 2 -- .../darwin/apple-source-releases/Libinfo/default.nix | 2 -- .../os-specific/darwin/apple-source-releases/Libm/default.nix | 4 +--- .../darwin/apple-source-releases/Libnotify/default.nix | 2 -- .../darwin/apple-source-releases/Librpcsvc/default.nix | 2 -- .../darwin/apple-source-releases/Libsystem/default.nix | 3 --- .../darwin/apple-source-releases/architecture/default.nix | 4 +--- .../darwin/apple-source-releases/copyfile/default.nix | 4 +--- .../os-specific/darwin/apple-source-releases/dyld/default.nix | 2 -- .../darwin/apple-source-releases/eap8021x/default.nix | 4 +--- .../darwin/apple-source-releases/launchd/default.nix | 4 +--- .../darwin/apple-source-releases/libclosure/default.nix | 4 +--- .../darwin/apple-source-releases/libdispatch/default.nix | 2 -- .../darwin/apple-source-releases/libplatform/default.nix | 2 -- .../darwin/apple-source-releases/libpthread/default.nix | 2 -- .../darwin/apple-source-releases/libresolv/default.nix | 2 -- .../darwin/apple-source-releases/libutil/default.nix | 2 -- pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix | 2 -- .../darwin/apple-source-releases/removefile/default.nix | 4 +--- pkgs/os-specific/darwin/xcode/default.nix | 1 - 23 files changed, 7 insertions(+), 53 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 38215fa8f900..648770660d3d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp MacTypes.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 5bcf94a18cef..ad51f1df2bcd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/CommonCrypto cp include/* $out/include/CommonCrypto diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index 0fa9294f2290..302a657992aa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, ed, unifdef }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ ed unifdef ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 40237b27bd26..d73dc8f3ec24 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ ed unifdef ]; # TODO: asl.h actually comes from syslog project now diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index 2756857ba677..d3ffa1fa2834 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' substituteInPlace xcodescripts/install_files.sh \ --replace "/usr/local/" "/" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index b409a7347ef2..1a01d0321918 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include @@ -10,4 +8,4 @@ appleDerivation { cp Source/Intel/fenv.h $out/include cp Source/complex.h $out/include ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix index 810c8e8315a5..de691a056f3e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp notify.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index 512ec6253c78..7002f82fe561 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, developer_cmds }: appleDerivation rec { - phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ developer_cmds ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 8575e0676253..9759810ef686 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,9 +3,6 @@ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ cpio ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index edb7869269ac..2638a0afb76d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,9 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - - postUnpack = '' + postPatch = '' substituteInPlace $sourceRoot/Makefile \ --replace "/usr/include" "/include" \ --replace "/usr/bin/" "" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index c1a2acccaa97..bbc8c5e5e81d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/ cp copyfile.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix index 56b0d93f99be..ddadf1f3940b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/lib $out/include ln -s /usr/lib/dyld $out/lib/dyld diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index af9493fe32e8..c8a40a20c9d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,11 +1,9 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers cp EAP8021X.fproj/EAPClientProperties.h $out/Library/Frameworks/EAP8021X.framework/Headers ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index c0e00ca1636e..86bc6e598f7d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # No clue why the same file has two different names. Ask Apple! installPhase = '' mkdir -p $out/include/ $out/include/servers @@ -11,4 +9,4 @@ appleDerivation { cp liblaunch/bootstrap.h $out/include/servers cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index a0201f9db2c1..826dbed1dfe0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp *.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index c80e37575697..44c50e468384 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/dispatch $out/include/os diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 65accc870d71..41b1bf74af9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir $out cp -r include $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index b4d8004d3e66..650c6415defc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, libdispatch, xnu }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - propagatedBuildInputs = [ libdispatch xnu ]; installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index a565971a6fa4..5a2cd33d8a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation, Libinfo, configd, mDNSResponder }: appleDerivation { - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildInputs = [ Libinfo configd mDNSResponder ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index c943c2068e6d..a6f484ba4e8d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -2,8 +2,6 @@ # all symbols are located in libSystem appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include cp *.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index ffc19801c5dc..9ee8f2255b44 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,8 +1,6 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/include/ppp diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 315f93bef084..8baf62dba01b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -1,10 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out/include/ cp removefile.h checkint.h $out/include/ ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d3a9ec012ebf..bea8bc5d3c21 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -14,7 +14,6 @@ in stdenv.mkDerivation rec { sha256 = "70bb550cc14eca80b9825f4ae9bfbf7f076bb75777311be428bc30a7eb7a6f7e"; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; outputs = [ "out" "toolchain" ]; From 9811bf225876f0200a10e360800dd081d60253ec Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 6 May 2018 16:07:55 -0500 Subject: [PATCH 178/369] treewide: cleanup phases from last commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The last commit broken Darwin stdenv. We still need to skip some phases when Apple provides a Makefile that shouldn’t be used. --- .../darwin/apple-source-releases/CarbonHeaders/default.nix | 2 ++ .../darwin/apple-source-releases/architecture/default.nix | 7 +------ .../darwin/apple-source-releases/copyfile/default.nix | 1 + .../darwin/apple-source-releases/eap8021x/default.nix | 1 + .../darwin/apple-source-releases/libdispatch/default.nix | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 648770660d3d..5c6d54aeb9c3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix @@ -1,6 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; + installPhase = '' mkdir -p $out/include cp MacTypes.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 2638a0afb76d..07c36ebfe120 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,12 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - postPatch = '' - substituteInPlace $sourceRoot/Makefile \ - --replace "/usr/include" "/include" \ - --replace "/usr/bin/" "" \ - --replace "/bin/" "" - ''; + dontBuild = true; installPhase = '' export DSTROOT=$out diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index bbc8c5e5e81d..37dffaa9b20e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,6 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; installPhase = '' mkdir -p $out/include/ cp copyfile.h $out/include/ diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index c8a40a20c9d3..80d629dfa3e6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,6 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; installPhase = '' mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index 44c50e468384..a43c00f7691b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,6 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { + dontConfigure = true; + dontBuild = true; installPhase = '' mkdir -p $out/include/dispatch $out/include/os From e9366d1e6fce80c6bb9da632b6191bc1cf1e5844 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 6 May 2018 16:14:00 -0500 Subject: [PATCH 179/369] Revert "gettext: add dev output" This reverts commit e25efa9673f3b274132875a4a95aae012b0b3467. Breaks shadow. See: https://hydra.nixos.org/build/73664024/nixlog/1 --- pkgs/development/libraries/gettext/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index e64c045ad819..6dec7747c7e8 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff ]; - outputs = [ "out" "dev" "man" "doc" "info" ]; + outputs = [ "out" "man" "doc" "info" ]; hardeningDisable = [ "format" ]; From 64bb57972c7a9bf365281f376b991fda1ebab19c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 May 2018 20:13:16 -0700 Subject: [PATCH 180/369] unbound: 1.7.0 -> 1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unbound/versions. These checks were done: - built on NixOS - ran ‘/nix/store/456crrnsgkrbicb54bwrwwl76n2645gq-unbound-1.7.1/bin/unbound-host help’ got 0 exit code - found 1.7.1 with grep in /nix/store/456crrnsgkrbicb54bwrwwl76n2645gq-unbound-1.7.1 - directory tree listing: https://gist.github.com/ab82a0d52e5fd8bda918bbdaa6ce7609 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index ed5c30aa42b5..d7ef54a2497d 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "18i6p6zqmbs9gj57mz3iwz828csaab26gb534b8wrn0kzdqr1pcl"; + sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From 1c87d77efea75e29061d13e11af68efa6f50aee2 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 7 May 2018 12:47:07 -0500 Subject: [PATCH 181/369] ppp: add dontBuild = true Hopefully this is the last one. --- pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index 9ee8f2255b44..17c24bebfda7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,6 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { + dontBuild = true; installPhase = '' mkdir -p $out/include/ppp From 34a3233a2e1e8ed2f005a3a86cfca02d5f2769ae Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 6 May 2018 15:58:03 -0400 Subject: [PATCH 182/369] stdenv: Support concatenating setup hooks from multiple parts. --- pkgs/stdenv/generic/setup.sh | 91 ++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d7a4781448ae..82ae09122bd5 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -641,22 +641,9 @@ fi # Textual substitution functions. -substitute() { - local input="$1" - local output="$2" - shift 2 - - if [ ! -f "$input" ]; then - echo "substitute(): ERROR: file '$input' does not exist" >&2 - return 1 - fi - - local content - # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -N 0 content < "$input"; then - echo "substitute(): ERROR: File \"$input\" has null bytes, won't process" >&2 - return 1 - fi +substituteStream() { + local var=$1 + shift while (( "$#" )); do case "$1" in @@ -671,7 +658,7 @@ substitute() { shift 2 # check if the used nix attribute name is a valid bash name if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then - echo "substitute(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 + echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 return 1 fi pattern="@$varName@" @@ -685,18 +672,41 @@ substitute() { ;; *) - echo "substitute(): ERROR: Invalid command line argument: $1" >&2 + echo "substituteStream(): ERROR: Invalid command line argument: $1" >&2 return 1 ;; esac - content="${content//"$pattern"/$replacement}" + eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' done - if [ -e "$output" ]; then chmod +w "$output"; fi - printf "%s" "$content" > "$output" + printf "%s" "${!var}" } +consumeEntire() { + # read returns non-0 on EOF, so we want read to fail + if IFS='' read -r -N 0 $1; then + echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 + return 1 + fi +} + +substitute() { + local input="$1" + local output="$2" + shift 2 + + if [ ! -f "$input" ]; then + echo "substitute(): ERROR: file '$input' does not exist" >&2 + return 1 + fi + + local content + consumeEntire content < "$input" + + if [ -e "$output" ]; then chmod +w "$output"; fi + substituteStream content "$@" > "$output" +} substituteInPlace() { local fileName="$1" @@ -704,20 +714,30 @@ substituteInPlace() { substitute "$fileName" "$fileName" "$@" } - -# Substitute all environment variables that start with a lowercase character and -# are valid Bash names. -substituteAll() { - local input="$1" - local output="$2" - local -a args=() - +_allFlags() { for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do if (( "${NIX_DEBUG:-0}" >= 1 )); then printf "@%s@ -> %q\n" "${varName}" "${!varName}" fi args+=("--subst-var" "$varName") done +} + +substituteAllStream() { + local -a args=() + _allFlags + + substituteStream "$1" "${args[@]}" +} + +# Substitute all environment variables that start with a lowercase character and +# are valid Bash names. +substituteAll() { + local input="$1" + local output="$2" + + local -a args=() + _allFlags substitute "$input" "$output" "${args[@]}" } @@ -1091,6 +1111,19 @@ fixupPhase() { substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook" fi + # TODO(@Ericson2314): Remove after https://github.com/NixOS/nixpkgs/pull/31414 + if [ -n "${setupHooks:-}" ]; then + mkdir -p "${!outputDev}/nix-support" + local hook + for hook in $setupHooks; do + local content + consumeEntire content < "$hook" + substituteAllStream content >> "${!outputDev}/nix-support/setup-hook" + unset -v content + done + unset -v hook + fi + # Propagate user-env packages into the output with binaries, TODO? if [ -n "${propagatedUserEnvPkgs:-}" ]; then From 2110c0bd3009279ceec291f07bfbf063cb5ba6a0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 May 2018 13:07:19 -0400 Subject: [PATCH 183/369] treewide: Use pkgs/build-support/roles.bash to remove copy pasta Also fix some setup hooks that unnecessarily used environment hooks, which revolted in the same variable being modified too many times. --- .../bintools-wrapper/default.nix | 7 +- .../bintools-wrapper/setup-hook.sh | 38 ++-------- pkgs/build-support/cc-wrapper/default.nix | 7 +- pkgs/build-support/cc-wrapper/setup-hook.sh | 49 ++---------- pkgs/build-support/setup-hooks/role.bash | 75 +++++++++++++++++++ .../compilers/gcc/libstdc++-hook.sh | 16 +--- .../compilers/llvm/3.5/libc++/default.nix | 5 +- .../compilers/llvm/3.5/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/3.7/libc++/default.nix | 5 +- .../compilers/llvm/3.7/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/3.8/libc++/default.nix | 5 +- .../compilers/llvm/3.8/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/3.9/libc++/default.nix | 5 +- .../compilers/llvm/3.9/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/4/libc++/default.nix | 5 +- .../compilers/llvm/4/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/5/libc++/default.nix | 5 +- .../compilers/llvm/5/libc++/setup-hook.sh | 16 +--- .../compilers/llvm/6/libc++/default.nix | 5 +- .../compilers/llvm/6/libc++/setup-hook.sh | 16 +--- .../development/libraries/gettext/default.nix | 5 +- .../libraries/gettext/gettext-setup-hook.sh | 23 ++---- .../libraries/libiconv/default.nix | 5 +- .../libraries/libiconv/setup-hook.sh | 18 +---- .../bsd/netbsd/compat-setup-hook.sh | 22 ++---- pkgs/os-specific/bsd/netbsd/default.nix | 10 ++- pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 18 +---- pkgs/os-specific/linux/musl/fts-setup-hook.sh | 19 +---- pkgs/os-specific/linux/musl/fts.nix | 5 +- 29 files changed, 203 insertions(+), 261 deletions(-) create mode 100644 pkgs/build-support/setup-hooks/role.bash diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 47301bbdde69..c0aea2d11312 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -190,7 +190,12 @@ stdenv.mkDerivation { depsTargetTargetPropagated = extraPackages; - setupHook = ./setup-hook.sh; + wrapperName = "BINTOOLS_WRAPPER"; + + setupHooks = [ + ../setup-hooks/role.bash + ./setup-hook.sh + ]; postFixup = '' diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 48a00b0b9b07..dbe0a0572a48 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -11,44 +11,22 @@ set -u [[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 bintoolsWrapper_addLDVars () { - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac + # See ../setup-hooks/role.bash + local role_post role_pre + getTargetRoleEnvHook if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib64" + export NIX_${role_pre}LDFLAGS+=" -L$1/lib64" fi if [[ -d "$1/lib" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib" + export NIX_${role_pre}LDFLAGS+=" -L$1/lib" fi } -case $targetOffset in - -1) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' - ;; - 0) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre='' - role_post='' - ;; - 1) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1 - role_pre='TARGET_' - role_post='_FOR_TARGET' - ;; - *) - echo "cc-wrapper: used as improper sort of dependency" >2; - return 1 - ;; -esac +# See ../setup-hooks/role.bash +getTargetRole +getTargetRoleWrapper addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..0ea9dd0cb9f4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -191,7 +191,12 @@ stdenv.mkDerivation { propagatedBuildInputs = [ bintools ]; depsTargetTargetPropagated = extraPackages; - setupHook = ./setup-hook.sh; + wrapperName = "CC_WRAPPER"; + + setupHooks = [ + ../setup-hooks/role.bash + ./setup-hook.sh + ]; postFixup = '' diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 29a7306b9b7e..17d34c1e1f1b 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -66,55 +66,22 @@ set -u # over no state, and there's no @-substitutions within, so any redefined # function is guaranteed to be exactly the same. ccWrapper_addCVars () { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac + # See ../setup-hooks/role.bash + local role_post role_pre + getTargetRoleEnvHook if [[ -d "$1/include" ]]; then - export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" + export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" fi if [[ -d "$1/Library/Frameworks" ]]; then - export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" + export NIX_${role_pre}CFLAGS_COMPILE+=" -F$1/Library/Frameworks" fi } -# Since the same cc-wrapper derivation can be depend on in multiple ways, we -# need to accumulate *each* role (i.e. target platform relative the depending -# derivation) in which the cc-wrapper derivation is used. -# `NIX_CC_WRAPPER_@infixSalt@_TARGET_*` tracks this (needs to be an exported env -# var so can't use fancier data structures). -# -# We also need to worry about what role is being added on *this* invocation of -# setup-hook, which `role` tracks. -case $targetOffset in - -1) - export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' - ;; - 0) - export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre='' - role_post='' - ;; - 1) - export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1 - role_pre='TARGET_' - role_post='_FOR_TARGET' - ;; - *) - echo "cc-wrapper: used as improper sort of dependency" >2; - return 1 - ;; -esac +# See ../setup-hooks/role.bash +getTargetRole +getTargetRoleWrapper # We use the `targetOffset` to choose the right env hook to accumulate the right # sort of deps (those with that offset). diff --git a/pkgs/build-support/setup-hooks/role.bash b/pkgs/build-support/setup-hooks/role.bash new file mode 100644 index 000000000000..6f1c36f5c050 --- /dev/null +++ b/pkgs/build-support/setup-hooks/role.bash @@ -0,0 +1,75 @@ +# Since the same derivation can be depend on in multiple ways, we need to +# accumulate *each* role (i.e. host and target platforms relative the depending +# derivation) in which the derivation is used. +# +# The role is intened to be use as part of other variables names like +# - $NIX_${role_pre}_SOMETHING +# - $NIX_SOMETHING_${role_post} + +function getRole() { + case $1 in + -1) + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + role_pre='' + role_post='' + ;; + 1) + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "@name@: used as improper sort of dependency" >2 + return 1 + ;; + esac +} + +# `hostOffset` describes how the host platform of the package is slid relative +# to the depending package. `targetOffset` likewise describes the target +# platform of the package. Both are brought into scope of the setup hook defined +# for dependency whose setup hook is being processed relative to the package +# being built. + +function getHostRole() { + getRole "$hostOffset" +} +function getTargetRole() { + getRole "$targetOffset" +} + +# `depHostOffset` describes how the host platform of the dependencies are slid +# relative to the depending package. `depTargetOffset` likewise describes the +# target platform of dependenices. Both are brought into scope of the +# environment hook defined for the dependency being applied relative to the +# package being built. + +function getHostRoleEnvHook() { + getRole "$depHostOffset" +} +function getTargetRoleEnvHook() { + getRole "$depTargetOffset" +} + +# This variant is inteneded specifically for code-prodocing tool wrapper scripts +# `NIX_@wrapperName@_@infixSalt@_TARGET_*` tracks this (needs to be an exported +# env var so can't use fancier data structures). +function getTargetRoleWrapper() { + case $targetOffset in + -1) + export NIX_@wrapperName@_@infixSalt@_TARGET_BUILD=1 + ;; + 0) + export NIX_@wrapperName@_@infixSalt@_TARGET_HOST=1 + ;; + 1) + export NIX_@wrapperName@_@infixSalt@_TARGET_TARGET=1 + ;; + *) + echo "@name@: used as improper sort of dependency" >2 + return 1 + ;; + esac +} diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 2325eeb9e2cf..8b1d5d2da678 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,13 +1,5 @@ -# The `hostOffset` describes how the host platform of the dependencies are slid -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libstdc++" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libstdc++" diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 1f1129f578f4..6edd5e9798c7 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh index e18733b5ea3a..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies are slid -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 4296c0fd192c..462e35a483f4 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -33,7 +33,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh index e18733b5ea3a..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies are slid -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index ea468b3772e0..cc3f5545146c 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh index bcd93cf486ff..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index ad514b0daa54..7e5c30bdfd35 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh index bcd93cf486ff..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index f28957c35185..718abc420a97 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,7 +44,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh index bcd93cf486ff..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 9ddeea7ef79a..cb6dfe2808eb 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh index bcd93cf486ff..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3c6c009a58fa..27d8cd18b666 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; meta = { homepage = http://libcxx.llvm.org/; diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh index bcd93cf486ff..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -1,14 +1,6 @@ -# The `hostOffset` describes how the host platform of the dependencies -# relative to the depending package. It is brought into scope of the setup hook -# defined as the role of the dependency whose hooks is being run. -case $hostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2; - return 1 ;; -esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6dec7747c7e8..a7c79ee600ec 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -48,7 +48,10 @@ stdenv.mkDerivation rec { # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; - setupHook = ./gettext-setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./gettext-setup-hook.sh + ]; gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 074d313e48aa..0a6bc0dd253a 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -1,6 +1,8 @@ gettextDataDirsHook() { + # See pkgs/build-support/setup-hooks/role.bash + getHostRoleEnvHook if [ -d "$1/share/gettext" ]; then - addToSearchPath GETTEXTDATADIRS "$1/share/gettext" + addToSearchPath "GETTEXTDATADIRS${role_post}" "$1/share/gettext" fi } @@ -8,21 +10,8 @@ addEnvHooks "$hostOffset" gettextDataDirsHook # libintl must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though -gettextLdflags() { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac - - export NIX_${role}LDFLAGS+=" -lintl" -} - if [ ! -z "@gettextNeedsLdflags@" ]; then - addEnvHooks "$hostOffset" gettextLdflags + # See pkgs/build-support/setup-hooks/role.bash + getHostRole + export NIX_${role_pre}LDFLAGS+=" -lintl" fi diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index a4e6fed88e1c..169a4d38bb53 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; }; - setupHook = ./setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./setup-hook.sh + ]; postPatch = lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh index 78222dddbf1d..d20e94513e26 100644 --- a/pkgs/development/libraries/libiconv/setup-hook.sh +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -1,18 +1,6 @@ # libiconv must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though -iconvLdflags() { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac - export NIX_${role}LDFLAGS+=" -liconv" -} - -addEnvHooks "$hostOffset" iconvLdflags +# See pkgs/build-support/setup-hooks/role.bash +getHostRole +export NIX_${role_pre}LDFLAGS+=" -liconv" diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh index d47d602e2edb..81df09eba176 100644 --- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh @@ -1,18 +1,6 @@ -setupCompatFlags() { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole - export NIX_${role}LDFLAGS+=" -lnbcompat" - export NIX_${role}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H" - export NIX_${role}CFLAGS_COMPILE+=" -include nbtool_config.h" -} - -addEnvHooks "$hostOffset" setupCompatFlags +export NIX_${role_pre}LDFLAGS+=" -lnbcompat" +export NIX_${role_pre}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H" +export NIX_${role_pre}CFLAGS_COMPILE+=" -include nbtool_config.h" diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index b4fb99504ef2..84d6926c50c7 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -167,7 +167,10 @@ let sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; version = "7.1.2"; - setupHook = ./compat-setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./compat-setup-hook.sh + ]; # override defaults to prevent infinite recursion nativeBuildInputs = [ makeMinimal ]; @@ -270,7 +273,10 @@ let runHook postInstall ''; - setupHook = ./fts-setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./fts-setup-hook.sh + ]; }; stat = netBSDDerivation { diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh index 6b7064174931..5cf8c753aec3 100644 --- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh @@ -1,16 +1,4 @@ -ftsLdflags() { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac +# See pkgs/build-support/setup-hooks/role.bash +getHostRole - export NIX_${role}LDFLAGS+=" -lfts" -} - -addEnvHooks "$hostOffset" ftsLdflags +export NIX_${role_pre}LDFLAGS+=" -lfts" diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh index 3962dcb19a20..5cf8c753aec3 100644 --- a/pkgs/os-specific/linux/musl/fts-setup-hook.sh +++ b/pkgs/os-specific/linux/musl/fts-setup-hook.sh @@ -1,17 +1,4 @@ -ftsLdflags() { - # The `depHostOffset` describes how the host platform of the dependencies - # are slid relative to the depending package. It is brought into scope of - # the environment hook defined as the role of the dependency being applied. - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac - - export NIX_${role}LDFLAGS+=" -lfts" -} - -addEnvHooks "$hostOffset" ftsLdflags +# See pkgs/build-support/setup-hooks/role.bash +getHostRole +export NIX_${role_pre}LDFLAGS+=" -lfts" diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix index 0f16e8cc79bf..24d25de3a2d9 100644 --- a/pkgs/os-specific/linux/musl/fts.nix +++ b/pkgs/os-specific/linux/musl/fts.nix @@ -12,5 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - setupHook = ./fts-setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./fts-setup-hook.sh + ]; } From 8b0fce8cb1013837cd2108193653a1763cd68266 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 May 2018 13:15:34 -0400 Subject: [PATCH 184/369] {bintools,cc}-wrapper: Factor out role accumulation logic --- pkgs/build-support/bintools-wrapper/add-flags.sh | 11 +---------- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/add-flags.sh | 13 +------------ pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/default.nix | 4 ++-- .../utils.sh => wrapper-common/utils.bash} | 15 +++++++++++++++ 7 files changed, 23 insertions(+), 28 deletions(-) rename pkgs/build-support/{cc-wrapper/utils.sh => wrapper-common/utils.bash} (83%) diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 7d118d20fc68..d02a25fe697b 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -11,16 +11,7 @@ var_templates_bool=( NIX+DONT_SET_RPATH ) -declare -a role_infixes=() -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then - role_infixes+=(_BUILD_) -fi -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then - role_infixes+=(_) -fi -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then - role_infixes+=(_TARGET_) -fi +accumulateRoles for var in "${var_templates_list[@]}"; do mangleVarList "$var" "${role_infixes[@]}" diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c0aea2d11312..bfcd3292729b 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -294,7 +294,7 @@ stdenv.mkDerivation { set +u substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash ## ## Extra custom steps @@ -305,7 +305,7 @@ stdenv.mkDerivation { inherit dynamicLinker expand-response-params; - # for substitution in utils.sh + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; meta = diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 991ed0fe263c..2ad1fdcadc27 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -14,7 +14,7 @@ if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -source @out@/nix-support/utils.sh +source @out@/nix-support/utils.bash if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 604aaf6b6cf0..ee4cc1ec06d4 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -14,18 +14,7 @@ var_templates_bool=( NIX+ENFORCE_NO_NATIVE ) -# Accumulate infixes for taking in the right input parameters. See setup-hook -# for details. -declare -a role_infixes=() -if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then - role_infixes+=(_BUILD_) -fi -if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then - role_infixes+=(_) -fi -if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then - role_infixes+=(_TARGET_) -fi +accumulateRoles # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index c2e6c1406358..b2bacec5e9b5 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -15,7 +15,7 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi -source @out@/nix-support/utils.sh +source @out@/nix-support/utils.bash # Flirting with a layer violation here. if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0ea9dd0cb9f4..1b1c82b9294f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -282,7 +282,7 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${./utils.sh} $out/nix-support/utils.sh + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash ## ## Extra custom steps @@ -293,7 +293,7 @@ stdenv.mkDerivation { inherit expand-response-params; - # for substitution in utils.sh + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; meta = diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/wrapper-common/utils.bash similarity index 83% rename from pkgs/build-support/cc-wrapper/utils.sh rename to pkgs/build-support/wrapper-common/utils.bash index 9215fe2dc397..12b596a83e6f 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -1,3 +1,18 @@ +# Accumulate infixes for taking in the right input parameters with the `mangle*` +# functions below. See setup-hook for details. +accumulateRoles() { + declare -ga role_infixes=() + if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_BUILD:-}" ]; then + role_infixes+=(_BUILD_) + fi + if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_HOST:-}" ]; then + role_infixes+=(_) + fi + if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_TARGET:-}" ]; then + role_infixes+=(_TARGET_) + fi +} + mangleVarList() { local var="$1" shift From 014f2cdb890df62a3afa7ca1270b9bc1e7bd5ab3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 May 2018 11:18:43 -0500 Subject: [PATCH 185/369] mesa: 17.3.9 -> 18.0.3 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0811362bfcae..4fd3b38a3be1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.3.9"; + version = "18.0.3"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0yg4nvagg5y2fxyl3jjdgbi6gjqqw4z3j6pyzsac5q7h0pybbgn5"; + sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; }; prePatch = "patchShebangs ."; From 882e08ced1b29fa0819198bf444922c52b3588c5 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 8 May 2018 15:37:10 -0500 Subject: [PATCH 186/369] unixtools: fixup bad merge This should hopefully fix the eval issue. --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index a73f11e69a4a..c42cf8aa0267 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -47,7 +47,7 @@ let eject = { linux = pkgs.utillinux; }; - getconf = singleBinary "getconf" { + getconf = { linux = if hostPlatform.isMusl then pkgs.musl-getconf else lib.getBin stdenv.cc.libc; darwin = pkgs.darwin.system_cmds; From c4cac55d6979ccdbc48cf0daf26e44c79cf5d0f9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 8 May 2018 15:46:57 -0500 Subject: [PATCH 187/369] qt510: disable framework build on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We prefer to have $out/include & $out/lib installed so that things like multiple outputs can work. There is no way to do this in Qt currently without also disabling the ‘framework’ install. Not sure if this will break anything but it will fix issues we run into on some projects like python2.7-pyside: Linux: https://hydra.nixos.org/build/73219181 macOS: https://hydra.nixos.org/build/73059550 Hopefully this gives us consistency between the two. --- .../libraries/qt-5/5.10/default.nix | 4 +-- .../qt-5/5.10/restore-pc-files.patch | 27 ------------------- .../libraries/qt-5/mkDerivation.nix | 3 +++ 3 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index a45e055e60b2..3969e01a2b91 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -37,9 +37,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ] ++ - optionals stdenv.isDarwin [ ./qtbase-darwin.patch - ./restore-pc-files.patch ]; + qtbase = [ ./qtbase.patch ./qtbase-darwin.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch deleted file mode 100644 index a012c3f583e3..000000000000 --- a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index e6a0d97f1a..b50ce77d51 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -266,7 +266,7 @@ load(qt_installs) - load(qt_targets) - - # this builds on top of qt_common --!internal_module:!lib_bundle:if(unix|mingw) { -+!internal_module:if(unix|mingw) { - CONFIG += create_pc - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - host_build: \ -diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf -index 62b88c6fe2..f302f1e202 100644 ---- a/mkspecs/features/qt_module_headers.prf -+++ b/mkspecs/features/qt_module_headers.prf -@@ -102,8 +102,7 @@ git_build: \ - else: \ - INC_PATH = $$MODULE_BASE_INDIR - include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true) --!lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. -- CONFIG += qt_install_headers -+CONFIG += qt_install_headers - - alien_syncqt: return() - diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 96014cfbc779..53949ddd4925 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -16,6 +16,9 @@ let optional (!debug) "-DQT_NO_DEBUG" ++ lib.toList (args.NIX_CFLAGS_COMPILE or []); + configureFlags = [ "-no-framework" ] + ++ (args.configureFlags or []); + cmakeFlags = (args.cmakeFlags or []) ++ [ From ae8d6b08fdcae10d38e3ead70e708c85466a128e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 9 May 2018 00:18:09 +0200 Subject: [PATCH 188/369] Revert "poppler_utils: 0.63.0 -> 0.64.0" (#39742) This reverts commit 3dfe97c62d15d812e422b3e3e469fe9a862a0069. Breaks texlive.bin.core build, see discussion in #39742 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index a96de20ccfeb..11dd8ec32910 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.64.0"; + version = "0.63.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj"; + sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; }; outputs = [ "out" "dev" ]; From b7ad8d667c8d1bd7d531126f19a15050379731b9 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 9 May 2018 00:20:26 +0200 Subject: [PATCH 189/369] Revert "poppler_data: 0.4.8 -> 0.4.9" (#39524) This reverts commit 95d1d753dc874faa88a32f3c851afcd8a88cdff7. See discussion in #39742 --- pkgs/data/misc/poppler-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d7a5ce33bd26..5c8e0970518b 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.9"; + name = "poppler-data-0.4.8"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; + sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh"; }; nativeBuildInputs = [ cmake ninja ]; From 95ad9695a8b1b309f847175c5167daa19cc620a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 9 May 2018 03:58:06 +0200 Subject: [PATCH 190/369] =?UTF-8?q?librsvg:=202.42.3=20=E2=86=92=202.42.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/librsvg/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index dfd45f8e4ff2..76b7e7ccaee9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,17 +5,17 @@ let pname = "librsvg"; - version = "2.42.3"; + version = "2.42.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0mz6rdxpnnjnk15nahlwpa2gba0ws1hs2dnyk1agqw5ip522qkvh"; + sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; @@ -26,8 +26,17 @@ stdenv.mkDerivation rec { ApplicationServices ]); - configureFlags = [ "--enable-introspection" "--enable-vala" ] - ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + configureFlags = [ + "--enable-introspection" + "--enable-vala" + "--enable-installed-tests" + "--enable-always-build-tests" + ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + makeFlags = [ + "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" + "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG" + ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; From 59beaf7fa22cf2fe979e9a8fee17335ec34e3c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 May 2018 13:59:10 +0200 Subject: [PATCH 191/369] python: 2.7.14 -> 2.7.15 (bugfix + security) Fixes CVE-2018-1000030, /cc #38993. The ncurses patch no longer applied, and it appears the problems have been resolved upstream https://bugs.python.org/issue25720 https://github.com/python/cpython/commit/6ba0b583d67 --- .../python/cpython/2.7/default.nix | 6 +- .../cpython/2.7/properly-detect-curses.patch | 116 ------------------ 2 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 9d89e96383f5..ed1bc9dc817b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let majorVersion = "2.7"; - minorVersion = "14"; + minorVersion = "15"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -40,7 +40,7 @@ let src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi"; + sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -58,8 +58,6 @@ let # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - ./properly-detect-curses.patch - ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch b/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch deleted file mode 100644 index e2640bab0e9a..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 6dc83db69b5e29d25ba6d73646ea2e9a1097848a Mon Sep 17 00:00:00 2001 -From: Roumen Petrov -Date: Sun, 19 Feb 2012 16:13:24 +0200 -Subject: [PATCH] CROSS-properly detect WINDOW _flags for different ncurses versions - ---- - Include/py_curses.h | 5 +++++ - configure.ac | 40 ++++++++++++++++++++++++++++++++++++++-- - pyconfig.h.in | 6 ++++++ - 3 files changed, 49 insertions(+), 2 deletions(-) - -diff --git a/Include/py_curses.h b/Include/py_curses.h -index f2c08f6..a9b5260 100644 ---- a/Include/py_curses.h -+++ b/Include/py_curses.h -@@ -14,7 +14,9 @@ - /* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -+/* NOTE configure check if ncurses require such definition - #define NCURSES_OPAQUE 0 -+*/ - #endif /* __APPLE__ */ - - #ifdef __FreeBSD__ -@@ -57,9 +59,12 @@ - #ifdef HAVE_NCURSES_H - /* configure was checking , but we will - use , which has all these features. */ -+/* NOTE configure check for existence of flags -+ * Also flags are visible only if WINDOW structure is not opaque - #ifndef WINDOW_HAS_FLAGS - #define WINDOW_HAS_FLAGS 1 - #endif -+*/ - #ifndef MVWDELCH_IS_EXPRESSION - #define MVWDELCH_IS_EXPRESSION 1 - #endif -diff --git a/configure.ac b/configure.ac -index 0a3a186..75f5142 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4150,15 +4150,51 @@ then - fi - - AC_MSG_CHECKING(whether WINDOW has _flags) --AC_CACHE_VAL(ac_cv_window_has_flags, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ - WINDOW *w; - w->_flags = 0; - ]])], - [ac_cv_window_has_flags=yes], --[ac_cv_window_has_flags=no])) -+[ac_cv_window_has_flags=no]) - AC_MSG_RESULT($ac_cv_window_has_flags) - -+py_curses_window_is_opaque=no -+if test no = $ac_cv_window_has_flags; then -+ AC_MSG_CHECKING([whether WINDOW has _flags in non-opaque structure]) -+ AC_COMPILE_IFELSE([ -+ AC_LANG_PROGRAM([[ -+ #define NCURSES_OPAQUE 0 -+ #include -+ ]],[[ -+ WINDOW *w; -+ w->_flags = 0; -+ ]])], -+ [py_curses_window_is_opaque=yes]) -+ AC_MSG_RESULT([$py_curses_window_is_opaque]) -+fi -+if test yes = $py_curses_window_is_opaque; then -+ ac_cv_window_has_flags=yes -+ AC_DEFINE([NCURSES_OPAQUE], [0], [Define to 0 if you have WINDOW _flags in non-opaque structure.]) -+fi -+ -+py_curses_window_is_internal=no -+if test no = $ac_cv_window_has_flags; then -+ AC_MSG_CHECKING([whether WINDOW has _flags as internal structure]) -+ AC_COMPILE_IFELSE([ -+ AC_LANG_PROGRAM([[ -+ #define NCURSES_INTERNALS 1 -+ #include -+ ]],[[ -+ WINDOW *w; -+ w->_flags = 0; -+ ]])], -+ [py_curses_window_is_internal=yes]) -+ AC_MSG_RESULT([$py_curses_window_is_internal]) -+fi -+if test yes = $py_curses_window_is_internal; then -+ ac_cv_window_has_flags=yes -+ AC_DEFINE([NCURSES_INTERNALS], [1], [Define to 1 if you have WINDOW _flags as internal structure.]) -+fi - - if test "$ac_cv_window_has_flags" = yes - then -diff --git a/pyconfig.h.in b/pyconfig.h.in -index 3ca3a4f..484c817 100644 ---- a/pyconfig.h.in -+++ b/pyconfig.h.in -@@ -1130,6 +1130,12 @@ - /* Define if mvwdelch in curses.h is an expression. */ - #undef MVWDELCH_IS_EXPRESSION - -+/* Define to 1 if you have WINDOW _flags as internal structure. */ -+#undef NCURSES_INTERNALS -+ -+/* Define to 0 if you have WINDOW _flags in non-opaque structure. */ -+#undef NCURSES_OPAQUE -+ - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - --- -1.6.4 - From 0cdb56dfa85872b227c696b491681c67e9e62ca9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 9 May 2018 23:42:22 +0200 Subject: [PATCH 192/369] perl-URI: 1.73 -> 1.74 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3278311f25c0..e3329b1efc7c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17169,10 +17169,10 @@ let self = _self // overrides; _self = with self; { }; URI = buildPerlPackage rec { - name = "URI-1.73"; + name = "URI-1.74"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413"; + sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d"; }; buildInputs = [ TestNeeds ]; meta = { From 7d0906eea89f94b24d9df9af90579a88422dc126 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 01:38:34 -0400 Subject: [PATCH 193/369] fontconfig: Clean up cross --- pkgs/development/libraries/fontconfig/2.10.nix | 12 +----------- pkgs/development/libraries/fontconfig/default.nix | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 5fb0ea4429e7..6f711341fad3 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -17,23 +17,13 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; configureFlags = [ + "--with-arch=${hostPlatform.parsed.cpu.name}" "--sysconfdir=/etc" "--with-cache-dir=/var/cache/fontconfig" "--disable-docs" "--with-default-fonts=" ]; - # We should find a better way to access the arch reliably. - crossArch = if stdenv.hostPlatform != stdenv.buildPlatform - then hostPlatform.parsed.cpu.name - else null; - - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="$configureFlags --with-arch=$crossArch"; - fi - ''; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index a4f6fe007d06..4d0b1a7f1153 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -40,23 +40,13 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; configureFlags = [ + "--with-arch=${hostPlatform.parsed.cpu.name}" "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--disable-docs" # just <1MB; this is what you get when loading config fails for some reason "--with-default-fonts=${dejavu_fonts.minimal}" ]; - # We should find a better way to access the arch reliably. - crossArch = if stdenv.hostPlatform != stdenv.buildPlatform - then hostPlatform.parsed.cpu.name - else null; - - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="$configureFlags --with-arch=$crossArch"; - fi - ''; - enableParallelBuilding = true; doCheck = true; From 7864a17bfb1fce9195e024e1e2ff1dfa14a942f3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 01:38:51 -0400 Subject: [PATCH 194/369] misc video players: Clean up cross --- pkgs/applications/video/omxplayer/default.nix | 22 ++++---- .../libraries/ffmpeg-full/default.nix | 21 +++----- pkgs/development/libraries/ffmpeg/generic.nix | 18 +++---- pkgs/development/libraries/libav/default.nix | 52 +++++++++---------- 4 files changed, 47 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 520451df400f..00a419d0a85d 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -12,9 +12,13 @@ let sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; + configurePlatforms = []; configureFlags = [ - "--arch=arm" + "--arch=${hostPlatform.parsed.cpu.name}" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch32 [ + # TODO be better with condition "--cpu=arm1176jzf-s" + ] ++ [ "--disable-muxers" "--enable-muxer=spdif" "--enable-muxer=adts" @@ -42,19 +46,14 @@ let "--enable-hardcoded-tables" "--disable-runtime-cpudetect" "--disable-debug" + "--arch=${hostPlatform.parsed.cpu.name}" + "--target_os=${hostPlatform.parsed.kernel.name}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" ]; enableParallelBuilding = true; - - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${hostPlatform.parsed.cpu.name}" - ]; - }; meta = { homepage = http://www.ffmpeg.org/; @@ -83,5 +82,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/huceke/omxplayer; description = "Commandline OMX player for the Raspberry Pi"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.arm; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d2ef075beee1..6fd8bfc3e195 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -249,7 +249,10 @@ stdenv.mkDerivation rec { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; + configurePlatforms = []; configureFlags = [ + "--target_os=${hostPlatform.parsed.kernel.name}" + "--arch=${hostPlatform.parsed.cpu.name}" /* * Licensing flags */ @@ -371,8 +374,6 @@ stdenv.mkDerivation rec { #(enableFeature quvi "libquvi") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") - #(enableFeature (shine != null) "libshine") - (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") (enableFeature (SDL2 != null) "sdl2") (enableFeature (soxr != null) "libsoxr") (enableFeature (speex != null) "libspeex") @@ -396,6 +397,9 @@ stdenv.mkDerivation rec { (enableFeature optimizationsDeveloper "optimizations") (enableFeature extraWarningsDeveloper "extra-warnings") (enableFeature strippingDeveloper "stripping") + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" ]; nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; @@ -432,21 +436,8 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = true; - /* Cross-compilation is untested, consider this an outline, more work - needs to be done to portions of the build to get it to work correctly */ - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel.name}" - "--arch=${hostPlatform.parsed.cpu.name}" - ]; - }; - meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = https://www.ffmpeg.org/; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 530639d757de..b71a1c253c11 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -79,7 +79,10 @@ stdenv.mkDerivation rec { ++ optional (reqMin "1.0") "doc" ; # just dev-doc setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! + configurePlatforms = []; configureFlags = [ + "--arch=${hostPlatform.parsed.cpu.name}" + "--target_os=${hostPlatform.parsed.kernel.name}" # License "--enable-gpl" "--enable-version3" @@ -145,6 +148,9 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") + ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; @@ -168,18 +174,6 @@ stdenv.mkDerivation rec { moveToOutput share/ffmpeg/examples "$doc" ''; - /* Cross-compilation is untested, consider this an outline, more work - needs to be done to portions of the build to get it to work correctly */ - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel.name}" - "--arch=${hostPlatform.parsed.cpu.name}" - ]; - }; - installFlags = [ "install-man" ]; passthru = { diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 85fe902dae06..b726d9c2b42a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -18,7 +18,7 @@ assert faacSupport -> enableUnfree; -let inherit (stdenv.lib) optional optionals hasPrefix; in +let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools @@ -51,29 +51,35 @@ let substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh" ''; - configureFlags = - assert stdenv.lib.all (x: x!=null) buildInputs; - [ + configurePlatforms = []; + configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [ + "--arch=${hostPlatform.parsed.cpu.name}" + "--target_os=${hostPlatform.parsed.kernel.name}" #"--enable-postproc" # it's now a separate package in upstream "--disable-avserver" # upstream says it's in a bad state "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" "--cc=cc" - ] - ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ] - ++ optional mp3Support "--enable-libmp3lame" - ++ optional speexSupport "--enable-libspeex" - ++ optional theoraSupport "--enable-libtheora" - ++ optional vorbisSupport "--enable-libvorbis" - ++ optional vpxSupport "--enable-libvpx" - ++ optional x264Support "--enable-libx264" - ++ optional xvidSupport "--enable-libxvid" - ++ optional faacSupport "--enable-libfaac --enable-nonfree" - ++ optional vaapiSupport "--enable-vaapi" - ++ optional vdpauSupport "--enable-vdpau" - ++ optional freetypeSupport "--enable-libfreetype" - ; + (enableFeature enableGPL "gpl") + (enableFeature enableGPL "swscale") + (enableFeature mp3Support "libmp3lame") + (enableFeature mp3Support "libmp3lame") + (enableFeature speexSupport "libspeex") + (enableFeature theoraSupport "libtheora") + (enableFeature vorbisSupport "libvorbis") + (enableFeature vpxSupport "libvpx") + (enableFeature x264Support "libx264") + (enableFeature xvidSupport "libxvid") + (enableFeature faacSupport "libfaac") + (enableFeature faacSupport "nonfree") + (enableFeature vaapiSupport "vaapi") + (enableFeature vdpauSupport "vdpau") + (enableFeature freetypeSupport "libfreetype") + ] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" + ]; nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ lame yasm zlib bzip2 SDL bash ] @@ -112,16 +118,6 @@ let doInstallCheck = false; # fails randomly installCheckTarget = "check"; # tests need to be run *after* installation - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${hostPlatform.parsed.cpu.name}" - ]; - }; - passthru = { inherit vdpauSupport; }; meta = with stdenv.lib; { From 5cfbfb662b4623272e4f31026a7c510b74cc73ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:44:47 +0200 Subject: [PATCH 195/369] python: Cython: 0.28.1 -> 0.28.2 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index cffad983a450..a9488b540e28 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "Cython"; - version = "0.28.1"; + version = "0.28.2"; src = fetchPypi { inherit pname version; - sha256 = "152ee5f345012ca3bb7cc71da2d3736ee20f52cd8476e4d49e5e25c5a4102b12"; + sha256 = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a"; }; nativeBuildInputs = [ From a8c7973a427d187e6e086e9f5fd19df8b504d606 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:44:54 +0200 Subject: [PATCH 196/369] python: Nikola: 7.8.14 -> 7.8.15 --- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index bb6eddb46d1e..d0045c9fb7fd 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "7.8.14"; + version = "7.8.15"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0d838817ac30ac6d4b8139a2adc8b49bed22dbb8fbc6261958d2775e10447d92"; + sha256 = "182b4b9254f0d710603ba491853429ad6ef3f955f3e718191336b44cfd649000"; }; meta = { From 3977666717286cc772ee4677d6dd0ee6ebf93f1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:00 +0200 Subject: [PATCH 197/369] python: XlsxWriter: 1.0.2 -> 1.0.4 --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index c512b17332fc..d8209b233977 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "XlsxWriter"; - version = "1.0.2"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "0mpq4l1jfghdqx2vzbzl9v28vw69lkx5vz9gb77gzaw8zypvnsx2"; + sha256 = "ad947fd9e8edfb64f25e0ccfb161e109f279e5a5520b3dd22ddc03b7f8220887"; }; meta = { From 3cf2fb1fa76db3833a21505379e2e0c9ff6d4851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:07 +0200 Subject: [PATCH 198/369] python: aenum: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index facf86c58988..63db18e844e0 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.1.0"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9eb1c8f48ae13c56d22a7227db0e4b1717131b284c6c0db6e4ccca6f5894df95"; + sha256 = "a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687"; }; # For Python 3, locale has to be set to en_US.UTF-8 for From 48c82cac4d71d0d1d118a678ee2f3c340776634a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:13 +0200 Subject: [PATCH 199/369] python: aiohttp: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index ab5c4b625780..947f4341e6df 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.1.2"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "df49fe4452a942e0031174c78917f9926d122d4603bf56bae4591639f2a3dc6a"; + sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; }; disabled = pythonOlder "3.5"; From ec5dcae625da7d4a9a53755d3825bd7cbbd08be5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:20 +0200 Subject: [PATCH 200/369] python: astral: 1.6 -> 1.6.1 --- pkgs/development/python-modules/astral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 488c5ed66512..1be99b5d4dde 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.6"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083"; + sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; }; propagatedBuildInputs = [ pytz requests ]; From 698b94b54000b17541f47c7df75f1b30502b7692 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:28 +0200 Subject: [PATCH 201/369] python: astropy: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index d4c038a1afdc..0dcd5dfca364 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c35f4433c14ddfcaf2407cc815385f3d85396727e9a1e660cf66a7c4f5dd1067"; + sha256 = "22e682904a3b8884595addfb743cf1a3ecf2b539c6616d98f8426208d822d84a"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires From a7ec7402f15c10ed54f7bfb7d368e3a80f699d5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:35 +0200 Subject: [PATCH 202/369] python: bayespy: 0.5.14 -> 0.5.17 --- pkgs/development/python-modules/bayespy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index dcc1a45b1cf0..83bb10631958 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.14"; + version = "0.5.17"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "129bac6a1c494eedabdd04abf14aac35db176d25db44e27f755c758a18adf03c"; + sha256 = "2e04cd9873eea6891ea8dfd5fc6d718727ea7cc416bc2ced50e00a741386925f"; }; checkInputs = [ pytest glibcLocales ]; From e80b4912885ed5f14eb44857ab52de50eb69b6f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:41 +0200 Subject: [PATCH 203/369] python: zc.buildout: 2.11.2 -> 2.11.3 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index cb54f588f9d2..95b0f8dddc55 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.11.2"; + version = "2.11.3"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "e304f3604a4235e896e94ea79230cfb9c0bc54569f04d5c6c4b49cc9dc4fdbf6"; + sha256 = "f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c"; }; patches = [ ./nix.patch ]; From 06bab760f332bf759ac602ca37da1b0ae23d761c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:48 +0200 Subject: [PATCH 204/369] python: zc.buildout: 2.2.1 -> 2.2.5 --- pkgs/development/python-modules/buildout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index 080fd2f2a790..9efc53ebe6da 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.2.1"; + version = "2.2.5"; src = fetchPypi { inherit pname version; - sha256 = "1xafi6ndlm964qj7pnmzmvhp719c8pgs7r7wkr508v3cq2jjw4m6"; + sha256 = "fb08f24f9e51e647e29d714f6e9ad51a4ea28673dddeed831315617bb5a805d0"; }; meta = with stdenv.lib; { From e2d1c747fa9a70cdc0390c264722e68633fcf985 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:45:54 +0200 Subject: [PATCH 205/369] python: cmarkgfm: 0.4.0 -> 0.4.2 --- pkgs/development/python-modules/cmarkgfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 5867c33642f5..b2f58887ffb5 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.4.0"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "977d7061779c7ebc5cbe7af71adb795ced96058552fe5f6b646d95b5055959be"; + sha256 = "f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c"; }; propagatedBuildInputs = [ cffi ]; From 216e90c6ff487a9733eb3c234cc8e685bde9d512 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:01 +0200 Subject: [PATCH 206/369] python: colorlog: 3.1.2 -> 3.1.4 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index e737b8848975..3045e61db607 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "3.1.2"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z"; + sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d"; }; checkInputs = [ pytest ]; From 282aee8799e28e07db8eec4b23d618e47085bd06 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:08 +0200 Subject: [PATCH 207/369] python: confluent-kafka: 0.11.0 -> 0.11.4 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index c8cbfe9d9be1..c8ef038ec504 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.11.0"; + version = "0.11.4"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667"; + sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; From 3ffc398d20e07f87e4e84222b5b028691e4249c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:15 +0200 Subject: [PATCH 208/369] python: dask: 0.17.2 -> 0.17.4 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 5527e4617e7c..9bbf1da7a65e 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.17.2"; + version = "0.17.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "27e470b8cfdd0516189e641b1213fceec0ddc4f37ead1fbce733d3381134fccd"; + sha256 = "c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d"; }; checkInputs = [ pytest ]; From 0aaa1fac54af98435fd9522182759197b77e3809 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:22 +0200 Subject: [PATCH 209/369] python: devpi-common: 3.2.1 -> 3.2.3 --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index c43d34a9b555..bf2808745ecd 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,12 +2,12 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.2.1"; + version = "3.2.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e9afa277a9b227d92335c49fab40be2e9bb112c0f4dda84906c14addb1ded2f7"; + sha256 = "d2ecae3a92b2da62ecc6586d1c40d265e61bce70d7f1be2327e8b98598ba2687"; }; propagatedBuildInputs = [ requests py ]; From 712b0bc7197f94a26e8d5b436bf0f092481a2a08 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:29 +0200 Subject: [PATCH 210/369] python: django-ipware: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/django-ipware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 1f3aedab8102..5deccb34d894 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "django-ipware"; name = "${pname}-${version}"; - version = "2.0.1"; + version = "2.0.2"; meta = { description = "A Django application to retrieve user's IP address"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3fba8821298c8533ce5609debf31dc8a22f228c50e100f42d97637a9f9357d43"; + sha256 = "abf2bfbf0ec6c04679372a55c25889c9b08f55ec404bca3dfc08f3cf6c832a11"; }; propagatedBuildInputs = [ django ]; From 26f175e44a48db9f6a47ac2a651d26590085af09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:37 +0200 Subject: [PATCH 211/369] python: Django: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 89bd0407ca00..9c8cde3a0d8a 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "2.0.4"; + version = "2.0.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"; + sha256 = "71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092"; }; patches = stdenv.lib.optionals withGdal [ From 6c60f396fa13cae058fc90b1e7baeb512077b3c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:44 +0200 Subject: [PATCH 212/369] python: Faker: 0.8.12 -> 0.8.13 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 7a7d24d070cb..9fd37f86f740 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.12"; + version = "0.8.13"; src = fetchPypi { inherit pname version; - sha256 = "9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15"; + sha256 = "48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321"; }; checkInputs = [ From ecd18e40b4d799fae65fdd5c1e1fc7bfea3a055c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:51 +0200 Subject: [PATCH 213/369] python: fastimport: 0.9.6 -> 0.9.8 --- pkgs/development/python-modules/fastimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 44f7bcdab068..02c1ea60e611 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.6"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; + sha256 = "b2f2e8eb97000256e1aab83d2a0a053fc7b93c3aa4f7e9b971a5703dfc5963b9"; }; checkPhase = '' From 60f26a166f847959885ead7d03bc9ec006705e9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:46:58 +0200 Subject: [PATCH 214/369] python: Fiona: 1.7.11.post1 -> 1.7.11.post2 --- pkgs/development/python-modules/fiona/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index bd249dea5d24..7e9e2e1da64c 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.11.post1"; + version = "1.7.11.post2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "35df044fa805e6b420450f5d4281fc0edf96e1da0545c31032045cd3cfad3abf"; + sha256 = "5804c6f5f7e02cf1f95ca404c22653dd47d64e4496a0ba7af5a2d6b2051b872a"; }; buildInputs = [ From 07cec56a0437057ada98e31ce493d5c6289c6343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:05 +0200 Subject: [PATCH 215/369] python: Flask-Cors: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/flask-cors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index acd9430316b4..491ee22b0212 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Cors"; - version = "3.0.3"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b"; + sha256 = "bec996f0603a0693c0ea63c8126e5f8e966bb679cf82e6104b254e9c7f3a7d08"; }; buildInputs = [ nose ]; From af6be7b0c79c6711c1ecbdb115315ad672e3f01b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:11 +0200 Subject: [PATCH 216/369] python: Flask: 0.12.2 -> 0.12.4 --- pkgs/development/python-modules/flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 5e77de84fed1..1a2c6417167b 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.12.2"; + version = "0.12.4"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29"; + sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; }; checkInputs = [ pytest ]; From 7450cccaa799ab77f156ab6d2316734da12f1683 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:18 +0200 Subject: [PATCH 217/369] python: google-api-python-client: 1.6.6 -> 1.6.7 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index d4de33b5a837..74fe88be4475 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.6.6"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b"; + sha256 = "05583a386e323f428552419253765314a4b29828c3cee15be735f9ebfa5aebf2"; }; # No tests included in archive From 228900dc85b8a4dfeee7acfd42856bd7eaa340ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:25 +0200 Subject: [PATCH 218/369] python: google-api-core: 1.1.0 -> 1.1.2 --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index baf590f99572..9e1a0c308047 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b"; + sha256 = "2000963305e95410a66e6ef6cfcc9f4627a4a95cb1c10abc98268814f2a6cd80"; }; propagatedBuildInputs = [ From 8fbbd261d80f78e2678dd2c628add332f37b9f79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:32 +0200 Subject: [PATCH 219/369] python: hdbscan: 0.8.12 -> 0.8.13 --- pkgs/development/python-modules/hdbscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 3d57ff371666..e75b04e97923 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.12"; + version = "0.8.13"; src = fetchPypi { inherit pname version; - sha256 = "0yxi34frg2jwyvjl942qy4gq5pbx8dq4pf4p28d1xah8njchfqir"; + sha256 = "31874db29375816688b5541287a051c9bd768f2499ccf1f6a4d88d266530e2a6"; }; checkInputs = [ nose ]; From 4dd0f741a20ea770a2edd954973aef187e4e6d68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:39 +0200 Subject: [PATCH 220/369] python: ipywidgets: 7.2.0 -> 7.2.1 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index af7ebfb1c432..67d7d551522d 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.2.0"; + version = "7.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f23aac2447f593dbdc89a86833a2d59666ed44af42b23c267de380c324599507"; + sha256 = "ab9869cda5af7ba449d8f707b29b7e97a7db97d6366805d6b733338f51096f54"; }; # Tests are not distributed From 7a6bf668fb73cd4d1096fa1c0162d9c6009f1d7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:46 +0200 Subject: [PATCH 221/369] python: jira: 1.0.14 -> 1.0.15 --- pkgs/development/python-modules/jira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 03f1abd7abca..2a1abe7b59ce 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jira"; - version = "1.0.14"; + version = "1.0.15"; src = fetchPypi { inherit pname version; - sha256 = "1xncrcaqgj0gnva3bz5c4vwnn7z84v9cmr37pc93zx676w62fpm3"; + sha256 = "20108a1d5b0dd058d5d4e0047f2d09ee06aaa413b22ca4d5c249e86167417fe8"; }; buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; From 5a014fdfa6bbaf23eb0576e35d7e55dfb8211c60 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:52 +0200 Subject: [PATCH 222/369] python: Jug: 1.6.6 -> 1.6.7 --- pkgs/development/python-modules/jug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index d9315193d19f..4b0444e40d44 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.6"; + version = "1.6.7"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "897ffbbbe8061772c238b4f436512ea3696016a04473c45a716d78c0de103ec1"; + sha256 = "a7faba838f3437163ae8459bff96e2c6ca1298312bdb9104c702685178d17269"; }; meta = with stdenv.lib; { From dac15220fd3053ea0a20bda1df38d16b4241d01b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:47:59 +0200 Subject: [PATCH 223/369] python: Keras: 2.1.5 -> 2.1.6 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 860a14f7a4da..053ebb0fd019 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.5"; + version = "2.1.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d"; + sha256 = "c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e"; }; checkInputs = [ From c29398faa4eac33327f0eaf533d3a35dc62651ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:05 +0200 Subject: [PATCH 224/369] python: keyring: 12.0.1 -> 12.0.2 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 2029eabba026..98295ff802fa 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "12.0.1"; + version = "12.0.2"; src = fetchPypi { inherit pname version; - sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd"; + sha256 = "445d9521b4fcf900e51c075112e25ddcf8af1db7d1d717380b64eda2cda84abc"; }; nativeBuildInputs = [ setuptools_scm ]; From 29490c8029625df70b448752216cc12be63ddc81 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:11 +0200 Subject: [PATCH 225/369] python: llfuse: 1.3.3 -> 1.3.4 --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index f53ff3cbebaa..7eac54d84d87 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.3"; + version = "1.3.4"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "e514fa390d143530c7395f640c6b527f4f80b03f90995c7b38ff0b2f86e11ce7"; + sha256 = "50396c5f3c49c3145e696e5b62df4fcca8b66634788020fba7b6932a858c78c2"; }; nativeBuildInputs = [ pkgconfig ]; From d7898e1a7fe95e06671d5df87852807184daf5e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:18 +0200 Subject: [PATCH 226/369] python: marisa-trie: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index ad9f6d6f2457..71be4f5726d1 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "1n4pxnaranbh3x2fcqxwh8j1z2918vy7i4q1z4jn75m9rkm5h8ia"; + sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf"; }; postPatch = '' From a2ed092ea24ee923c9c9ff9af891f07379af5d6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:25 +0200 Subject: [PATCH 227/369] python: marshmallow: 2.15.0 -> 2.15.1 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index a9db6ef1e84c..71cc0cddf1b9 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.15.0"; + version = "2.15.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584"; + sha256 = "b73361eab812af97eaf8e8691333a1096787968450051d132c8b9fb90aa1db5a"; }; propagatedBuildInputs = [ dateutil simplejson ]; From 0144105da2732a575a2511087e001dbbc95428f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:31 +0200 Subject: [PATCH 228/369] python: moto: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/moto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 222e54c871a0..a0269e92d086 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moto"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b"; + sha256 = "45d14aca2b06b0083d5e82cfd770ebca0ba77b5070aec6928670240939a78681"; }; postPatch = '' From 82333e0e230a858dfeb0fc46c4995d1ad4ed4790 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:37 +0200 Subject: [PATCH 229/369] python: nipype: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 39fc0995b43d..372eeeec94a2 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1ed65f3e97fd0f82c418ad48af2107050e86d9e39eea4d22381ad7df932bf1ec"; + sha256 = "17850c2a34f10f93d12c994101ce86b5a0b7e939e5b854e9f9920c9513cc8e76"; }; # see https://github.com/nipy/nipype/issues/2240 From 572c6972815b0ccc9adb0b410daf0e7247a4bda8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:44 +0200 Subject: [PATCH 230/369] python: numexpr: 2.6.4 -> 2.6.5 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index e6fc5888feaf..8ba4e0061fa3 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.6.4"; + version = "2.6.5"; src = fetchPypi { inherit pname version; - sha256 = "f0bef9a3a5407fb8d6344cf91b658bef7c13ec8a8eb13f423822d9d2ca5af6ce"; + sha256 = "f8ad8014085628eab91bc82fb9d10cf9ab8e04ede4884e4a1061445d395b36bb"; }; propagatedBuildInputs = [ numpy ]; From 18b323b0747bef74393eeb7b42626eaa2acb9c14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:50 +0200 Subject: [PATCH 231/369] python: numpy: 1.14.2 -> 1.14.3 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ec727994b09c..3d64863c30d9 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.14.2"; + version = "1.14.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb"; + sha256 = "9016692c7d390f9d378fc88b7a799dc9caa7eb938163dda5276d3f3d6f75debf"; }; disabled = isPyPy; From 5d938387ccd4ef977541cf375ee328e84b225f28 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:48:57 +0200 Subject: [PATCH 232/369] python: onkyo-eiscp: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/onkyo-eiscp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index c0a1e39b384b..a4adc1f2a6f6 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "onkyo-eiscp"; - version = "1.2.4"; + version = "1.2.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj"; + sha256 = "cfcca6bc6c36992095f5aa4a15870a3ef89b9a26d991da2333891c2675d4ef1b"; }; propagatedBuildInputs = [ docopt netifaces ]; From 7e924926316fe360440c4f02d6ce53dca3e84e1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:03 +0200 Subject: [PATCH 233/369] python: openpyxl: 2.5.2 -> 2.5.3 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index d8a419189312..09e3bde6f8af 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.2"; + version = "2.5.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63165adcc806a5c281febb344f3594541f778f05b99a3a5e802941a3c0a85f71"; + sha256 = "0046fca88d6731875a385bf7edd689d7c4133f829203ea615a81291de3fa48b6"; }; checkInputs = [ pytest ]; From 22931cec66873491ef0af06beb777bdddfcb7b8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:10 +0200 Subject: [PATCH 234/369] python: pathlib2: 2.3.0 -> 2.3.2 --- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 09d759c97ee3..7ba0966de025 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3"; + sha256 = "8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; From 0b90e884d96dd0c22a4a326e75d882962eac79b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:17 +0200 Subject: [PATCH 235/369] python: pbr: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 993dab3aceeb..9b249f0a2b6f 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "4.0.1"; + version = "4.0.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "56b7a8ba7d64bf6135a9dfefb85a80d95924b3fde5ed6343a1a1d464a040dae3"; + sha256 = "dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f"; }; # circular dependencies with fixtures From a2402da7fb9f8fe422af1c78aa051d79ef13bbd6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:23 +0200 Subject: [PATCH 236/369] python: pip-tools: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index abe2dff6441b..926b625f7006 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "2.0.1"; + version = "2.0.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "81abea4ba206051ddaf90854b7302849002fdd0084450d2dd7f5c44a6d0ddf16"; + sha256 = "f11fc3bf1d87a0b4a68d4d595f619814e2396e92d75d7bdd2500edbf002ea6de"; }; LC_ALL = "en_US.UTF-8"; From adf9c673b8658f005e960656140c4e8a2de678ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:30 +0200 Subject: [PATCH 237/369] python: pretend: 1.0.8 -> 1.0.9 --- pkgs/development/python-modules/pretend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 3572d938a0dc..fed0499624af 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pretend"; - version = "1.0.8"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + sha256 = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10"; }; # No tests in archive From 5287f27a8f43beaef2b32b5aa7f71cb7dfb52e89 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:37 +0200 Subject: [PATCH 238/369] python: psutil: 5.4.3 -> 5.4.5 --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 6221e08ae574..f357aec914a4 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.4.3"; + version = "5.4.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e2467e9312c2fa191687b89ff4bc2ad8843be4af6fb4dc95a7cc5f7d7a327b18"; + sha256 = "ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe"; }; # No tests in archive From 7e450b65f6bc7dbdc2391e11b14cef9c9b8c3cef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:44 +0200 Subject: [PATCH 239/369] python: pyblake2: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/pyblake2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index 7d70fd30a254..2de46c0d1ed1 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyblake2"; - version = "1.1.1"; + version = "1.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8ec8e9087d13c99b354ab6d8b4cadb1758633db5946ff95a6bc7ac538b6d7b3d"; + sha256 = "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f"; }; # requires setting up sphinx doctest From 75ab17b2b93a74e0d3d49bdd6d50c80f5863cef0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:51 +0200 Subject: [PATCH 240/369] python: pygit2: 0.26.3 -> 0.26.4 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index d8eb05cf3485..3f05aa7b7896 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pygit2"; - version = "0.26.3"; + version = "0.26.4"; src = fetchPypi { inherit pname version; - sha256 = "29baa530d6fcbf7cca6a75cf9c78fb88613ca81afb39c62fe492f226f6b61800"; + sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From f875632ca254fbe9e78b9e445872f5028ff6a81f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:49:57 +0200 Subject: [PATCH 241/369] python: pyglet: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 3fc7f8ddb683..4bc1cd0608c5 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -2,12 +2,12 @@ , libGLU_combined, xorg, freetype, fontconfig, future}: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.2"; pname = "pyglet"; src = fetchPypi { inherit pname version; - sha256 = "0a73280fa3949ea4890fee28f625c10b1e10a7cda390a08b6bce4740948167cd"; + sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743"; }; postPatch = let From 8a9dd7b871b5220acca32ee14d5c103c477ecdad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:04 +0200 Subject: [PATCH 242/369] python: pypcap: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pypcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index e2d4e1efe285..ead63c2c1b34 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pypcap"; - version = "1.2.0"; + version = "1.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9"; + sha256 = "9ca9f79ca839fdc8fd37393509e2cb06be70f8db03f8cfe1857ca40cac1149f0"; }; patches = [ From 2c3e3b8af1141febc70e36056d8f755c16ce7ee8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:10 +0200 Subject: [PATCH 243/369] python: pytest: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 457826f26cbc..8e6b73b9c5e1 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools }: buildPythonPackage rec { - version = "3.5.0"; + version = "3.5.1"; pname = "pytest"; preCheck = '' @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"; + sha256 = "54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8"; }; checkInputs = [ hypothesis ]; From ce1d9f768ae2eec41ba890ac254f434de2461a4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:17 +0200 Subject: [PATCH 244/369] python: QtPy: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index d1aa4f096fe6..e433d922e10f 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.4.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "8e78e7ce28015c1041be68b90f43048c9815e8c89d3362f8073feecdc70eafba"; + sha256 = "1d1a4343540433a203280f162d43226e4c87489155fe4a9a6f1923ba11362bf9"; }; # no concrete propagatedBuildInputs as multiple backends are supposed From d3e682ef0f9a09d5b396507d1abc3306bace19ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:23 +0200 Subject: [PATCH 245/369] python: robotframework: 3.0.3 -> 3.0.4 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index be3316cf697e..f07d0208167c 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "3.0.3"; + version = "3.0.4"; pname = "robotframework"; disabled = isPy3k; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "a5ffe9283c9247c3a1e81228fcc009819d8f94b48768170268a3e6274a998bca"; + sha256 = "ab94257cbd848dfca7148e092d233a12853cc7e840ce8231af9cbb5e7f51aa47"; }; meta = with stdenv.lib; { From 7907ae6b1e6bfc24c4c7211fcb19fc2fa02da56d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:30 +0200 Subject: [PATCH 246/369] python: rpy2: 2.8.2 -> 2.8.6 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 8db7ae3b3372..c689bd482404 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { - version = "2.8.2"; + version = "2.8.6"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "0k5jp6n1lfab7a6r5568aq31hg4fgf2cwy0hzvf3chp6yhyk26ic"; + sha256 = "004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98"; }; buildInputs = [ readline From f1cb0e57d9e9b00f72cc4c7311035edf72fd2c90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:36 +0200 Subject: [PATCH 247/369] python: s3fs: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 956a96f14046..c605d43888c1 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "f19b2e81cfcf6f2849fa8195c366c6e81d2378400bab0611f461c4e55d4f6bed"; + sha256 = "4fbab74d72ceeb1a6f249165bde7b1d1c4dd758390339f52c84f0832bc5117a7"; }; buildInputs = [ docutils ]; From ea6e06a2d65f5a312aada0a3cb9e78c18fb6a371 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:43 +0200 Subject: [PATCH 248/369] python: Sphinx: 1.7.2 -> 1.7.4 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index a87362dfc3c0..3ccccdbf77d8 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2"; + sha256 = "e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10"; }; LC_ALL = "en_US.UTF-8"; From eaccf2b38499275411d9382aaae82643081296a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:50 +0200 Subject: [PATCH 249/369] python: SQLAlchemy: 1.2.6 -> 1.2.7 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6ac6fe21e4d2..882574aa675a 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "7cb00cc9b9f92ef8b4391c8a2051f81eeafefe32d63c6b395fd51401e9a39edb"; + sha256 = "d6cda03b0187d6ed796ff70e87c9a7dce2c2c9650a7bc3c022cd331416853c31"; }; checkInputs = [ From 072f4f83c12abd7a7c1999e9670f3fe68fb8d778 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:50:56 +0200 Subject: [PATCH 250/369] python: sqlmap: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index d5c89aefef7c..9a2aaeaa5538 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.4"; + version = "1.2.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cb70fdedd8dc0a30cf361d8e5401a5b07fc75c13847b13567b98966be4e3d063"; + sha256 = "93fe37e535f4aabd05a7456295f39c0af73cbcd0511750663fc7a718c5915919"; }; # No tests in archive From 74a5c32dbe96bb7dd7fdbdd423417e0f63cded4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:03 +0200 Subject: [PATCH 251/369] python: tables: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/tables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 2ae41832569e..d2346b7addbd 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -2,13 +2,13 @@ , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: buildPythonPackage rec { - version = "3.4.2"; + version = "3.4.3"; pname = "tables"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c"; + sha256 = "b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; From 588a305714ec3620094284df4409f3baccc74621 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:10 +0200 Subject: [PATCH 252/369] python: testfixtures: 6.0.0 -> 6.0.2 --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 55631f291c74..2b9ef2e24a16 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.0.0"; + version = "6.0.2"; src = fetchPypi { inherit pname version; - sha256 = "f6c4cf24d043f9d8e9a9337371ec1d2f6638a0032504bd67dbd724224fd64969"; + sha256 = "f8827cfc91e5cc9ac669727fdd48a85880f391b935a0a212b5cedb807879feec"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; From 081a805d1591c962fe272d947e7072c4c25848e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:16 +0200 Subject: [PATCH 253/369] python: textacy: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 47b8b04c4f6a..4ffe8ec735c6 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "textacy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f"; + sha256 = "32ffb796f2abf0577af480d482608cca2baf85d366a4e2981ffd3e632ebeb76c"; }; disabled = isPy27; # 2.7 requires backports.csv From 7a428dc4cdf5aa8abe8ab6334a93314e7e84d13c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:22 +0200 Subject: [PATCH 254/369] python: transitions: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/transitions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index edf13782b078..4bda41dd66b9 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { inherit pname version; - sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n"; + sha256 = "f72b6c5fcac3d1345bbf829e1a48a810255bcb4fc2c11a634af68107c378c1be"; }; postPatch = '' From 56537d6b77427b0878d05d6d632892dd283e34c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:29 +0200 Subject: [PATCH 255/369] python: widgetsnbextension: 3.2.0 -> 3.2.1 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 2e21ead19e09..cae05c74268f 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9b584b9210dadc98f1fae384fff5f4db047df0b94a81b2388c7b0b14a99c3f32"; + sha256 = "5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc"; }; propagatedBuildInputs = [ notebook ]; From bef6bac92929c47085ee6d3967609fd5986ea96d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:35 +0200 Subject: [PATCH 256/369] python: xarray: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 1d18b5830aaf..4035575915f0 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "dd5af05cc9ddd5713016ec1a7f0d481daf2f0bb4d4e0bd66790503f6412bbc59"; + sha256 = "72fafe29ba00633483aed39e405442226ef66d2ddc1021a39527ae1522b7067a"; }; checkInputs = [ pytest ]; From 53446a74ab439c797b90d542627828127d4f628c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:42 +0200 Subject: [PATCH 257/369] python: zetup: 0.2.42 -> 0.2.43 --- pkgs/development/python-modules/zetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index c6b5900c6272..d72752a59884 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "zetup"; - version = "0.2.42"; + version = "0.2.43"; src = fetchPypi { inherit pname version; - sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c"; + sha256 = "ee92ba93a03336962525536f237ae0decf99a9b5d484ba34a3cf06ef017dae8e"; }; checkPhase = '' From 292eb914a44e3e9d9ae7e0330731f59ed3e38849 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 May 2018 16:51:49 +0200 Subject: [PATCH 258/369] python: zxcvbn-python: 4.4.22 -> 4.4.24 --- pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 633270b9480f..4f34d7d02883 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.22"; + version = "4.4.24"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "402d4222dc9994baed66a19a1cf5cb5c3fafd065f9cabc4cf7d5a2915e980979"; + sha256 = "900b28cc5e96be4091d8778f19f222832890264e338765a1c1c09fca2db64b2d"; }; # No tests in archive From c248aa40b1102e1d450c1730424d9048648ffc19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 May 2018 10:13:30 +0200 Subject: [PATCH 259/369] python.pkgs.Keras: fix build --- pkgs/development/python-modules/keras/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 053ebb0fd019..f5590e11120b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist -, six, numpy, scipy, pyyaml +, six, numpy, scipy, pyyaml, h5py }: buildPythonPackage rec { pname = "Keras"; version = "2.1.6"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -21,7 +20,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six pyyaml numpy scipy + six pyyaml numpy scipy h5py ]; # Couldn't get tests working From 1080e264fb19f55e5c20edb0fad744ff2366c3dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 13:46:38 -0400 Subject: [PATCH 260/369] groff: Get rid of crossAttrs --- pkgs/tools/text/groff/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 4495a85b2885..27581134ca34 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -50,15 +50,14 @@ stdenv.mkDerivation rec { "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" ]; - doCheck = true; - - crossAttrs = { + makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # Trick to get the build system find the proper 'native' groff # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html - preBuild = '' - makeFlags="GROFF_BIN_PATH=${buildPackages.groff}/bin GROFFBIN=${buildPackages.groff}/bin/groff" - ''; - }; + "GROFF_BIN_PATH=${buildPackages.groff}/bin" + "GROFFBIN=${buildPackages.groff}/bin/groff" + ]; + + doCheck = true; # Remove example output with (random?) colors and creation date # to avoid non-determinism in the output. From 48300199566229bd1409eb8f1f2cf8b8871d6b67 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 12:55:36 -0400 Subject: [PATCH 261/369] libpcap: Remove crossAttrs --- .../development/libraries/libpcap/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index bef5f9a9da34..945554386930 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -12,10 +12,16 @@ stdenv.mkDerivation rec { # We need to force the autodetection because detection doesn't # work in pure build enviroments. - configureFlags = - if stdenv.isLinux then [ "--with-pcap=linux" ] - else if stdenv.isDarwin then [ "--with-pcap=bpf" ] - else []; + configureFlags = [ + ("--with-pcap=" + { + linux = "linux"; + darwin = "bpf"; + }.${stdenv.hostPlatform.parsed.kernel.name}) + ] ++ stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + "ac_cv_linux_vers=2" + ]; + + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" @@ -39,12 +45,6 @@ stdenv.mkDerivation rec { preInstall = ''mkdir -p $out/bin''; - crossAttrs = { - # Stripping hurts in static libraries - dontStrip = true; - configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ]; - }; - meta = with stdenv.lib; { homepage = http://www.tcpdump.org; description = "Packet Capture Library"; From d1cf0a8a3ad50f6e34f0cef7aee914552c1127ec Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 14:17:24 -0400 Subject: [PATCH 262/369] tcpdump: Remove crossAttrs and obsolete options --- pkgs/tools/networking/tcpdump/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 324a58cf7edb..59cc89ac5727 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, enableStatic ? false -, hostPlatform -}: +{ stdenv, fetchurl, fetchpatch, libpcap }: stdenv.mkDerivation rec { name = "tcpdump-${version}"; @@ -20,11 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - crossAttrs = { - LDFLAGS = if enableStatic then "-static" else ""; - configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (hostPlatform.platform.kernelMajor or null == "2.4") "--disable-ipv6"); - }; + configureFlags = stdenv.lib.optional + (stdenv.hostPlatform != stdenv.buildPlatform) + "ac_cv_linux_vers=2"; meta = { description = "Network sniffer"; From 507a64cd8da1647cd801ab01e1b95b4d6b43842e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 12:42:43 -0400 Subject: [PATCH 263/369] libmsgpack: Remove crossAttrs Just set cmakeFlags directly. Also improve conditions. --- pkgs/development/libraries/libmsgpack/generic.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index 889ef1347732..947960d23592 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -13,13 +13,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - crossAttrs = { - } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { - cmakeFlags = [ - "-DMSGPACK_BUILD_EXAMPLES=OFF" - "-DCMAKE_SYSTEM_NAME=Windows" - ]; - }; + cmakeFlags = [] + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "-DMSGPACK_BUILD_EXAMPLES=OFF" + ++ stdenv.lib.optional (hostPlatform.libc == "msvcrt") + "-DCMAKE_SYSTEM_NAME=Windows" + ; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; From 01b274ce0d9923eb960b1a55e13527545f381f41 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 13:08:07 -0400 Subject: [PATCH 264/369] librsync: Remove crossAttrs --- pkgs/development/libraries/librsync/0.9.nix | 4 +--- pkgs/development/libraries/librsync/default.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 0954694cf290..115f4cd90a0c 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -12,9 +12,7 @@ stdenv.mkDerivation { configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; - crossAttrs = { - dontStrip = true; - }; + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { homepage = http://librsync.sourceforge.net/; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 80acaf57d625..afb83051b211 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ perl zlib bzip2 popt ]; - crossAttrs = { - dontStrip = true; - }; + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with stdenv.lib; { homepage = http://librsync.sourceforge.net/; From 1e966f9aa6684c7a19493bbb470aafffce399dd9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 13:43:12 -0400 Subject: [PATCH 265/369] libvpx: Get rid of crossAttrs Only breaks native hashes because configurePlatforms --- pkgs/development/libraries/libvpx/default.nix | 52 +++++++++---------- pkgs/development/libraries/libvpx/git.nix | 34 ++++++------ 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 272761cc6af3..011e1450d474 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; + configurePlatforms = []; configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -131,8 +132,29 @@ stdenv.mkDerivation rec { (enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") - # Experimental features - ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${hostPlatform.config}${ + if hostPlatform.isDarwin then + if hostPlatform.osxMinVersion == "10.10" then "14" + else if hostPlatform.osxMinVersion == "10.9" then "13" + else if hostPlatform.osxMinVersion == "10.8" then "12" + else if hostPlatform.osxMinVersion == "10.7" then "11" + else if hostPlatform.osxMinVersion == "10.6" then "10" + else if hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + ] # Experimental features + ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; @@ -145,32 +167,6 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" - # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) - # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure - # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${hostPlatform.config}${ - if hostPlatform.isDarwin then - if hostPlatform.osxMinVersion == "10.10" then "14" - else if hostPlatform.osxMinVersion == "10.9" then "13" - else if hostPlatform.osxMinVersion == "10.8" then "12" - else if hostPlatform.osxMinVersion == "10.7" then "11" - else if hostPlatform.osxMinVersion == "10.6" then "10" - else if hostPlatform.osxMinVersion == "10.5" then "9" - else "8" - else ""}-gcc" - (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") - ]; - }; - meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; homepage = https://www.webmproject.org/; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index e2b94dda28e7..7d4b75d6cdf8 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; + configurePlatforms = []; configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -139,23 +140,7 @@ stdenv.mkDerivation rec { (enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") - # Experimental features - ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" - ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" - ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; - - nativeBuildInputs = [ perl yasm ]; - - buildInputs = [ ] - ++ optionals unitTestsSupport [ coreutils curl ]; - - enableParallelBuilding = true; - - postInstall = ''moveToOutput bin "$bin" ''; - - crossAttrs = { - configurePlatforms = []; - configureFlags = configureFlags ++ [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ #"--extra-cflags=" #"--prefix=" #"--libc=" @@ -175,8 +160,19 @@ stdenv.mkDerivation rec { else "8" else ""}-gcc" (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") - ]; - }; + ] # Experimental features + ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; + + enableParallelBuilding = true; + + postInstall = ''moveToOutput bin "$bin" ''; meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; From c42118bb822ae35431343109aeb903f2c2d121af Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 11:56:52 -0400 Subject: [PATCH 266/369] gcc: Get rid of crossAttrs Only a little bit was left --- .../development/compilers/gcc/4.8/default.nix | 20 +++++++------------ .../development/compilers/gcc/4.9/default.nix | 20 +++++++------------ pkgs/development/compilers/gcc/5/default.nix | 20 +++++++------------ pkgs/development/compilers/gcc/6/default.nix | 19 +++++++----------- pkgs/development/compilers/gcc/7/default.nix | 19 +++++++----------- pkgs/development/compilers/gcc/8/default.nix | 19 +++++++----------- .../compilers/gcc/snapshot/default.nix | 15 +++++--------- 7 files changed, 47 insertions(+), 85 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 532c56d52573..8aeb531e3ebe 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform @@ -371,21 +372,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -487,8 +484,5 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f041252495a6..7bd9f5460f12 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform @@ -393,21 +394,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -505,9 +502,6 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } // optionalAttrs (langJava) { diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index dee798eb09b1..b61a3719cc69 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null @@ -396,21 +397,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -508,8 +505,5 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b99ab8fce7fb..9a26d4dae26a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null @@ -400,20 +401,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = - optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -511,9 +509,6 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } // optionalAttrs (langJava) { diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 493e50d9f327..dd5e42f7642e 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null @@ -406,20 +407,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = - optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -517,8 +515,5 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 2465e6149c0a..239735bc6574 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -18,7 +18,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null @@ -347,20 +348,17 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = - optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -447,8 +445,5 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index d37cfac3fa85..d87df9972891 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -25,7 +25,8 @@ , libcCross ? null , crossStageStatic ? false , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true +, # Strip kills static libs of other archs (hence no cross) + stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null @@ -371,17 +372,14 @@ stdenv.mkDerivation ({ (if profiledCompiler then "profiledbootstrap" else "bootstrap") else ""; + dontStrip = !stripped; + NIX_STRIP_DEBUG = !stripped; + installTargets = if stripped then "install-strip" else "install"; - /* For cross-built gcc (build != host == target) */ - crossAttrs = { - dontStrip = true; - buildFlags = ""; - }; - # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -481,8 +479,5 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } -# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) From a9ac651764341c8789ceac2d6b649cac7856679f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 May 2018 21:07:28 -0500 Subject: [PATCH 267/369] libjpeg: always use libjpeg_turbo libjpeg_turbo is consistently built on Darwin now. I have no way to verify FreeBSD so if anyone can confirm libjpeg_turbo is still broken please revert this! --- pkgs/development/libraries/libjpeg-turbo/default.nix | 3 --- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 4ec0e5ebd9f4..e4f70b792fd5 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses maintainers = [ maintainers.vcunat ]; - # upstream supports darwin (and others), but it doesn't build currently platforms = platforms.all; - hydraPlatforms = platforms.linux; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3a71edbb6bb..9ef98ef0e461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10143,7 +10143,7 @@ with pkgs; libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; - libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; From 73833ee4465369c9eead8e00ce699053e010de2f Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 11 May 2018 08:14:21 -0500 Subject: [PATCH 268/369] darwin.architecture: add postPatch back in I didn't think it was even being called before, but now getting this error: https://hydra.nixos.org/build/73955984/nixlog/1 --- .../darwin/apple-source-releases/architecture/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 07c36ebfe120..8b3eb2017e27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,6 +3,13 @@ appleDerivation { dontBuild = true; + postPatch = '' + substituteInPlace $sourceRoot/Makefile \ + --replace "/usr/include" "/include" \ + --replace "/usr/bin/" "" \ + --replace "/bin/" "" + ''; + installPhase = '' export DSTROOT=$out make install From ea502c686f115abb03b6b24e57d812d845bb74f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 11 May 2018 06:30:55 -0700 Subject: [PATCH 269/369] libdrm: 2.4.91 -> 2.4.92 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdrm/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.92 with grep in /nix/store/9n9nnxcq129pwmynmbpsb2h86w6aafkr-libdrm-2.4.92 - directory tree listing: https://gist.github.com/f9b660cd3c8012a94adf29b9d2931d70 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 50d9a565a6cf..4d1b4e4c3fdc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.91"; + name = "libdrm-2.4.92"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3"; + sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79"; }; outputs = [ "out" "dev" "bin" ]; From fc8566532dfa005dc0f15e21dc551ed39fa17036 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 30 Apr 2018 21:13:02 +0900 Subject: [PATCH 270/369] firefox-bin: 59.0.2 -> 59.0.3 --- .../browsers/firefox-bin/release_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3dd7d9e8e659..cab39047212a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0.2"; + version = "59.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ach/firefox-59.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; + sha512 = "404b4cdd02a1d25379f3627824d7790bf1c73af9f58e94a8fb6208f8907b3a7e7599821edcee65838255fdee69914eb8c916218d7714226d7cce5180fb01ab2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/af/firefox-59.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; + sha512 = "59ef32fb550404f6e4572cc9b5e34d6a7875a16dc62ead78b02fe944e4f3d2128e71cdac236e074238c6ca45d3fda959e17df3f6c056f13b149058f156bb97a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/an/firefox-59.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; + sha512 = "a3d0b8785bfc1250c8b5deda2a876469c1c2c3c7c5bb22b45a6aebf7d4e3c1813c7a7ed99257a4ec52b7f56f1c183e50e515a88bcb5d47213095382ab1355485"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ar/firefox-59.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; + sha512 = "15f410bed4f64d8f3f8acf0275647aa0a94985e3172b4c5e0c5f52a3a1f1c132b1677032f361fec075667ce733e288cd79382abc5b4aa630281e72f889e35990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/as/firefox-59.0.3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; + sha512 = "f61f4e1bf0487657fa538ced9ddfb01fae19bc973a3a44e602b4d68547386fab4b730ad69ebabd14617fc4a6b291a4c5c50a09c60d5cfdfc1a01254a9cc70c4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ast/firefox-59.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; + sha512 = "30fc099cc873ad3159406018386033b251738cb258fbce3ad7428e6db359a263648d3c5f394150e5e162791e767e30de2907a16385669478706f66395ac60fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/az/firefox-59.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; + sha512 = "7b3fff9d731b1700461fdde8e4943fb5e01a73e2c89ae40511315b2f219524dc3ed67458f9c91ca0b4ba34ec9ff7e5edc5382dee25b23d46f468d597024adf46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/be/firefox-59.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; + sha512 = "f9913874e839249b892281b90cce9fa93243560a599c942e5dddf22b51e4b5774ef91d582a170d5a591b3e47dffb7015aef5d4ff39c165213ff8b24e238b8c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bg/firefox-59.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; + sha512 = "1a84a38460ac8a144e4dfef1b1e5ddb6dcfaff1f0cdc1497e477614b60b63405f0e573c25307957d52a91808af88b9906daac8c956d7ee74bb907bf90c94f526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-BD/firefox-59.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; + sha512 = "72b33e221e8d111bf8796879f8797c760e752e17d515a036c9c84172115a845cc82d34b4a16ad27a84db4c1d32fd74c066b6fb7810a4a06ba97140e5b8330fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-IN/firefox-59.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; + sha512 = "0ddec8964bbc6bf0aff10a96d5797166f4445ee26acc155a8777cab8755b6a119b61c38f9acc011f3857d97d35b808b72f22c5493c4091cc4c17694b1d8b4f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/br/firefox-59.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; + sha512 = "9171f0547ce9d0c244a959294d62477bac7fcb7e611666f394ac47fb0c8f3579f85b08fa837e5e834a38e4908e0e1a4fe3b96e5759825a41996afd3fc2308e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bs/firefox-59.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; + sha512 = "6322d2e315937a4b7007ff68a8e491e76fc13e07cc881ee9c7a0a20e57f75ea4ad245f1849902aaa80eadc380bf107dcbaac229f05bcc67f775844880a514b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ca/firefox-59.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; + sha512 = "e1080f2bf6a9fd9b20498c454231315387fc12e9f27a5e6637113d5121c1e3c4f7c9c1dcaf8ceef6af5245d9b5b9388aca63678431ff54e58378f3faf45f42a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cak/firefox-59.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; + sha512 = "770a9990136bcaf0e8d8a8056972de603c1f6e181c7b37c0b3dd2bf694a9402c981d4699e25d92c10a78808f9a56596f533107c941c29c8f3f318b40c79eacf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cs/firefox-59.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; + sha512 = "e1a65b8f97f106985714f221c0221b66c086f6a4aaeddf994089a4924d1f73ea5345de147870ab46201466e5bf7ae6d7de103f666ee40207141b5e64f5cc2534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cy/firefox-59.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; + sha512 = "7d150f5ed948a9ea25777e9d4f15c21076e72340150140aeb26db5d39ba124087f7e93362bf9b9b8104087b84a998ebf8fc006198527ecbe441d1701fe7fc7a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/da/firefox-59.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; + sha512 = "636bc1610c521bdf85976aafba91969641ad7cf77a00a51b095c84698f42fc27f5f4bef227f9f9d0128b8d68a99d2ca7d8d915e74c8428aed269a67e15851343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/de/firefox-59.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; + sha512 = "8dbf02a5533a84cff9c41584e91416859a06623f24936eb559238f0ccd5618c047f1b549036398aa8bd4f879a8eaae7b0f199576427dedbf9708cb55514cf169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/dsb/firefox-59.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; + sha512 = "b42bb2a2e75713e9c0c2f0602251ad5c3ab8683800ee08b0b5f36f055a63dca6e88e6e0c88806149217f20833538bde557c699c7f815eea59ab571e3b2db4df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/el/firefox-59.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; + sha512 = "32c61f7110084caf8cc3aed151f5b374e35ab4a4b7d5c3159f0e44007f3398e6fde02ca460e13400ce6d507bf2dccdcf88c50945420802dcd7cf2ba6ac3ba8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-GB/firefox-59.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; + sha512 = "ee19670513499ce3cde705e1dc19db9ae16018cf8672d5c1c1f7029ce4a44437239150dcad425592dbab2746571b5317fb0e1d7eed87f65e121ddca4a8efaf31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-US/firefox-59.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; + sha512 = "d42ae9f95b85a2678c895ba920435059f920df656bd41156c9e300a97827f58bcb689d0152f9732fabad792c084b47719124bd96d286744d2d787909e7844ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-ZA/firefox-59.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; + sha512 = "9ca481e4a072eba9d0bd373df8d4038b08d95af5ad69e08ee0d3499cbb422e1df20b2a56615675d2663ce1df6cf4cc01ec773a8b99e43301b4f5e13dfdc70cc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eo/firefox-59.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; + sha512 = "750ee8058e9c79047a5abb3b8219ce6c10d0aa8667ff788c921891d5bb8e85a400bc28c7be9a8d0479d7a64c7b6788a22a5a8545f4665e2c90513251f87bae30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-AR/firefox-59.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; + sha512 = "dc0350f8da5ab3deb8dccd05e71fc873051d8a935f75af95a3fcb0bb81e86f18eca3f14c1be2f9fd491662ad9c908c5770cf1e6d22a4f3ffacdf5aaadb54b13b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-CL/firefox-59.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; + sha512 = "04f9c3a5bb4e87778a5b7f10bdc4f6ac5f8eee39f50db72e20e4e94babaad0411d14eacefddb084469b7540cb5104b718e29020188ff05069faec919420083b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-ES/firefox-59.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; + sha512 = "f70157ee4afe65cf65529d1dbc1c93307f4a79cd89d0ef7c05bb9f8723c95c561eb3a122506509e83dc6056b603e203bdd5464dc1db7e6497c0fb7cd7035d039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-MX/firefox-59.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; + sha512 = "aec14d9c54a116047193596304ef235d05089c2e94eec9caa40ef12498800fafc88b3e094e1c72e25be06c8288daff20fe8859a62157544ee3233ed620fa0daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/et/firefox-59.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; + sha512 = "32dbdd743b65fb5f5941ca3a83272b49a47c7742377cd46bab19a9c2e75bf5726cfa7afa55c7cc33a4a9daceacdaf59019ab0f302af84edc6ea6beb9db7fd6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eu/firefox-59.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; + sha512 = "9b47c791bf12a2782930c62f4973a2d49cef28e4b5fca24824da28dc2f9b7bb64f9dbe8208c77d77f924962db35e0190969cf65b2d2b520cba94ae6747082038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fa/firefox-59.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; + sha512 = "bb0e0c3a8c5bb31b1959626a2d8e13a47f60815af3041e0463e9148c61fcf626cf1ed0a9a6f27ebf8fb5fcda60b306ca679f4d4c6f4080d7a542782b2805b22c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ff/firefox-59.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; + sha512 = "3e9f478f3712cd084ece2492f384c0ff4e92058d20df30893b5b96ff20bed8c3903cb66c23a4dc9fcdc12320addcc9da948c05bdf3c84232d307bb8360b163fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fi/firefox-59.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; + sha512 = "9f85727e929ecc8915530c5cd57bb6e76d7972636ae607e0ef211ab562694e825406e23b8ff98b39447fe9f5fbe6ab586370ba0a90331d5dbac04882baa13643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fr/firefox-59.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; + sha512 = "d150100a8d0eb9fe38bb40e5791735975a94d866778623c649fc9cca9907b773f3f5762dca0ffb707d50d72b48cfe3da0d3a203f310a119b1d2c17988a345233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fy-NL/firefox-59.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; + sha512 = "6110e624c28606720ba7383179573ba047e3a5f975d2790f9c647995a0821b17d04dcf1108672b5c8eff3c5c7fd6fc8bd0fda53a293d13217526e6f5f959e09b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ga-IE/firefox-59.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; + sha512 = "1d6015e42bf94eaba47a9cc75134eac83cd2ad6b18d86350eeb2df0ed7d38c3d39abae49f2b57d1b66f6d75c7e233e0e31c4fcaf7da76b6b8b90dd07e7519e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gd/firefox-59.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; + sha512 = "ca5cfa0b930147a88280f12a56ec7e112edc66079139cc0d7d5282dc6078dead6cca66b8725ed9cd59203e3121ec480454fd42d535c42ee6d002bfb99a323a58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gl/firefox-59.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; + sha512 = "0fa94d9f494e2b8c90931889fc0191540b8999526e6140cebffd93fd02c0035e206de09fd4f28f168ada7b8c13f61a7a327efe19909024779751090178add2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gn/firefox-59.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; + sha512 = "640518a9f2137495adc18fa689444335e4a663cdb9a4beeb3ae6dda6c4b5d2af166ecaae8068352852c3455ec8fe81cf945faf2742f8096dd6966fa37affaa12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gu-IN/firefox-59.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; + sha512 = "9cdd5186c99b5ba464a3931e443a7ac24f8236bd6e92f23314e0595525ce17757d58637b3d9db318816d704644b600a2f2bd1eaf156011c5d22bf58ecf0c0c90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/he/firefox-59.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; + sha512 = "a2ccb4a8ad24143c9b82d16c816527acf9022a2457695a66144d2b917ea2c933f15cb238b3afc61be2e590bdc966a009fe4aa5e08bc94e2d297f768344d6596d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hi-IN/firefox-59.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; + sha512 = "ee0f077a4001fab75b8d4386e8ed4b72a3240417cd4db4d9aafecd8cde7728bdf3dc1ea1c96dd7a568ff547dfe2ccd984a679ca464adf9528fef886b913224cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hr/firefox-59.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; + sha512 = "28c158c5b2895b16a599f3122d0742b8e48528f3a319fb48b5f2c500727dcb877ed7660a3a674883b3aab71cef66d76a6c1cb222dc16925e0bfcb044a5d510c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hsb/firefox-59.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; + sha512 = "6fb2b3fab3559b87c62d7c63fd522c7e0c8d51adc60a49ad87340ecc05e1d27ed3be84a0593d40173e25fe0445d776ede6db6d3d0e8ebe1dbc11f1ace4feded7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hu/firefox-59.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; + sha512 = "21f30c5e8e2f23f39b149545fdd5ce0fe0169bf580a574b8da6f141e09334a010b21ac076aa62b4df2c335ad8bd433344c58bfb7d9b80f26261a0f927e3ef455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hy-AM/firefox-59.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; + sha512 = "619190e969e7d9faf0b0d9b6eab902577a19183f1412a8f22a4615eda035ab06c10ea2ba0769febf3466ed97a964c7b7070a03d4ca2ba33f312e04fa20eddd5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ia/firefox-59.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; + sha512 = "8cc986bd03f6d9c66c7916ea8c7086a18ecdfacd9e117136bd8489ca5f91af6d87447ec1a9b998c9bd222dd83e679b4081dce4a98959c8ea8b3bf541e46a2c8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/id/firefox-59.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; + sha512 = "9debe3c7c1310d567a960985269e56f40a0a85eb99dc26bf7ba1c009f78dd66243ec9f8bef3cafa1f00f078d8cc76f84d4c4367b315418456f7f694faa9373f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/is/firefox-59.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; + sha512 = "f0f676e21ec9ce7625f6925e524d0ee2cfe11aad4a97cc9041b0cc03678a8059f3d32c931edf56173b5300d91620fdb9401919addffa4a76d060e31bba8000cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/it/firefox-59.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; + sha512 = "30fe899358440fb54c779470548dcff9ceb8eb55b72bd298aebd7281309f24fd256865b7db83461c83d212f6b66e3e81d505245ae9556594aff78e86ad12fa97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ja/firefox-59.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; + sha512 = "309f6e3a24fc2f9ed859f0133e38cbc47b74d6d04fdf439c14d6328f25c16697eac7b49e1441c9cc32877938aec1f8e862df6a44fa85156b9d29109713f61dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ka/firefox-59.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; + sha512 = "d2bdbe00907e43f1673616dbfd52182651e2aab4b356079537d361c8c88945f06ce23a953386d64e4aa6516a490674f3cc20973558d83990c8b9c35807941bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kab/firefox-59.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; + sha512 = "a144e1fd69291e5f30a0aefbfd2c9113e8d3f3dd38522b6c12e227c47626a7bda74d4663ab2c2aa10d85963689db4fbd3141e8c49ffe77d59f273c7031b31d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kk/firefox-59.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; + sha512 = "cb826eeddacab068f2b5ddfbbe05ffdc3862c23eece9e2b11cfa9c86780eba659cf6cb0917cc5d41737bf9f9fa59ed274ce29c3ae94c41c9d2c70be3249adea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/km/firefox-59.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; + sha512 = "d968692a7626bb8b831c747cc64c713b1209218cfe4bd4f1ed6e645ccff86dd4c4ca529f07a163915b155c72fad4e2637e2d1f52e0ee184f572743cb0b2c8de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kn/firefox-59.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; + sha512 = "ebcece13e28b4e5009a60dd88752b7f5c756a5fb974b606c3dccbe037401c30b684faba5d7b4c76d21dc369855c38b66fd160544efe7105235412dd10c16761e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ko/firefox-59.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; + sha512 = "5272a4d40ef663ed9f9774ce61e73a5f42be4ab08222e45755dc400e4a596d91f7833f7510cdd199932baa8eaa54fe56458513517d712ccf24bc1b40ddf62c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lij/firefox-59.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; + sha512 = "cb09361665412b9c5a0865d59197d0f7234a5005a2e147010c7d40f94d749e22719d150da70e8e415a9f9ff3f01a0f0aa9158d58f45d34232f4d6d40c6b7871f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lt/firefox-59.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; + sha512 = "f5e5ea9eb648c3d1c0363f275a1d262326cecb3e33f539614242d05e819e4fe58276eaef58f03f088c4f0bc8fd416e35c4ed5303f962daa80dc9fc7e90b6ffa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lv/firefox-59.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; + sha512 = "97bb94f1f8e30acb1f86cdecc272f56bca9dcc617f02e43fa024a0d9fbb7a111c01245e578684570886bdc67d706c5f41d02fec7cdc7b298467241a6b5ae9a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mai/firefox-59.0.3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; + sha512 = "00fcb9eabe9779878a8b73e98dbf025ea5d69adc2f84d828e3532257bdcacc9fced522228c330b3286fa9a9bc11806227c698dc4b6bc87482e838974652a8d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mk/firefox-59.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; + sha512 = "469394ce137bb09223123e84b36a2f6cc3f4679db831e787b26c674045025eb96c00e68eb8ca3c18dbcfc41ea91c31b4071c3d9c392b1cd5386e3c4b92352799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ml/firefox-59.0.3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; + sha512 = "0736b067e98e30c411e2996428a9abb596a38574ed6e2225cbb2e32ba3ca5c7793281d019f1f0b73d6fa9861c9526d7e504f49fb5100ab93d7b625061b356754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mr/firefox-59.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; + sha512 = "bb34429687408dc07c24959c93f38959ff3f3ce0804f1bfd33df9ac7f2218287d6f3a63029dfd73bad6aea47fa132cabf716c50c9f6f06258fb4fd667ee9b186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ms/firefox-59.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; + sha512 = "a96e7f57519a7672feee1a4fa84f6bb4de31a5a66d79905413ce8502d9b272d2e77bbe92a36cefc5ee050e8099f314054c81d440a73a2787bfe02a097d6e21ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/my/firefox-59.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; + sha512 = "25ebb5e15975848a1e66eb1ef6494fc42d5f8b42de77fc6e66313a0d00d5874271aae0cb883ee1f1139f9664bdafb902a3cb5fc73d2dc64f4a97ce686137bb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nb-NO/firefox-59.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; + sha512 = "b2281d8946e6367f9153f7201c2bf021a1ff20f69fd6a52a5074d195f8c7e1936ec811a57cf71f4cf10d7f128b6ac0f5229f1fea4fda3511d6e113f131f210ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ne-NP/firefox-59.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; + sha512 = "63c6772968397c738f4866ea68d07f9aa74f0e593010cc80a613f4c59713e81f29e6715caafc91a1e8d68df906abfe498146be1cdebe56f085cbf576bf26eeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nl/firefox-59.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; + sha512 = "bc75476bbb8791cc7b67f0403b31efe165775708961b849351cbab604a828e4f846630f9c4172a24a519cff0ebd2d86ba3d498659b1a4fb81554d0b3cc4da9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nn-NO/firefox-59.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; + sha512 = "5baadd863abe9c385b050e55748785f6d0dfe539781327713e0fd746a4546b7bd86b9b4ee2281092e733594106028ea36d37c254705f5f39447c152593c74035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/or/firefox-59.0.3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; + sha512 = "bb444d06d25d782923803db81d446f12324e70d13daad1d014f4d938d466f946d6922a5f21a560e4c82e9ae27c3ac72422875518f37bcba268f7884c0de98d86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pa-IN/firefox-59.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; + sha512 = "79881db61e611083c35d2730753ddd7d06e28e5dd1703fa5b500562ad66222d0f3b731e1cc475760cc726e34e12585c3059025f60a1a7a7c512286a92268313c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pl/firefox-59.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; + sha512 = "33c8a94cde2263b78c32ebf7dc8646d041c8071e3f26926776b7cec635cbeb7aeda74b31e6e59de186cf1f9f929139e1165635e6340fd3f3d56a400722d3f897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-BR/firefox-59.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; + sha512 = "a5e14da9ea50e92a6e48bab8f0626ef6a155eda72cc0ac068943e948c942f291d36a5ac4b06e802358153bdfee6a7278b524834c3e5c79c8f4adfae6c7877437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-PT/firefox-59.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; + sha512 = "991544ee16e1cc3b5dfe3e8426f2f7ca47d72003f60efefd9947b2cb72f614583225f81d5c49ed1bc72979ca548d749592888a01778c4cd8d2261c69e47a7cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/rm/firefox-59.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; + sha512 = "6f2cd65aa98c546a9a19144dc24da9cad112fef735618b5ec23ffbcf32ba4bd515838fd0d8f2147a2193b3146a913a2683f23889fb913e62bd26519135aa5f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ro/firefox-59.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; + sha512 = "4c1704d334a76c62c5407dc433861ca2afb063830703f5ed2b76e987a42935bc569d340f8e2e9d47efaf4e27cf820437f662981a1734a9f65022424847c70fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ru/firefox-59.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; + sha512 = "a3e941b5f14d1371c1321353566460b03546a9eb5238c72ce9fc9a06dd4f4f91c616fe15efe553cb87765ad64e71ef2abd7ea4ed8931067575c45d86a88c5348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/si/firefox-59.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; + sha512 = "aa8459ea3e1318485e9b73caef32f87958072a0f067bc86ff679cd65b58190a6ed358a7b6c9b1e59512c2a204cbb6545ccdd9178c4ea8fd60d003914872b9575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sk/firefox-59.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; + sha512 = "6759a550e8652902e9de653f160d2e50e89cfcd2328a5eb47d6dd79cb71326d88263ad0a820183b859b000bcfd575299b77107a0c409e92397918539289accbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sl/firefox-59.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; + sha512 = "6411d82a4a8cd9a710c755d8f588b4e7b936bd3f14726a6b0a8b5d90cbdda12390d9fd9f99b01b9a595e20c6a3ae50d7c5d7f242f542dc1f3a86b0051c3ea498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/son/firefox-59.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; + sha512 = "dbd99f23a8bda258cebefeb680cf205c75552850e59560d9df2683070c79147f5063fda983f95a5fa985732ae369007aa0d57bb1997e3dcd11e964c59fb9f46a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sq/firefox-59.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; + sha512 = "c2ff4a76aec95237747f740f052b943bc92009a232ef4e77af66a2e7afc26fee15c76b45e1dfe4f10a1e62f28e7372ace069200f93848dfb3fde71b85953b2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sr/firefox-59.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; + sha512 = "b69a111b27d05d88e8416ae1f8f0e3b2e48714694bc01fe14a299cd9ade7fb8d6b16e063bfd35a7579ba5a226e6d47872639b31f77bd4db7237d54277b0d7628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sv-SE/firefox-59.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; + sha512 = "16c23e86ff3f22935830c500acfbe6ff7d4d41f0840328407d540f17aa48c5ab45032194bbb5af9820dc03896b683e09e016a9ad6d0c23859524bc4ece0d16c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ta/firefox-59.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; + sha512 = "2aecef72d4847e2cb1bf857f8c3375c14be09c23b9ff211cf908c56cc1b2e4f5e20019ff7e6cbb0be6bbc882663fe0d539e9b3c7e3543e46f348d8ac9e829738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/te/firefox-59.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; + sha512 = "0967879b336d27c933ba606de57c3b60aa9b61d6bc01bf2fa0f5bdd43a08299a6f15d7792e1f4abd641fc9296c95a1ab874af8256292074532f7c69ef0369997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/th/firefox-59.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; + sha512 = "81c57006aea7a18ccc8e42299dba497528680567f1cb6cf96b069f2832eb8f305fbcfdcfad1ced9d90ab89a59d8d2e471da427fe4b3e77a88140073b0b78c4ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/tr/firefox-59.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; + sha512 = "df076aaa8e2478d5c7f4929c9c798dbe18d21d6601c48651653fb7f134f6c2c379e290168b0f7faca4e47ede8c571eed04e1337702787f0f64d4bc84aeba1d27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uk/firefox-59.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; + sha512 = "4c53c231aea6f63312fe8b218adf56b2012921460ef1a82f32a9587db9ccf74154b04859d26a7574c6290d492c8189fab80990092f289c7e96f24337689c8659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ur/firefox-59.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; + sha512 = "278d330c4409e931a02f7585dfd0185f30a733afa448bc0cbcb471bb67c41b0d46bb229d8c480342604201639b34d607ac0433c093d0bef205ef9918ec61b966"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uz/firefox-59.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; + sha512 = "a9a714b9a9e9439a12be8248d9fbd9d92dd7ab9c12bc0ad280b9753f2c369061d554129404ba6ca546918b33d87731623926c15aa908408392d27e89768027f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/vi/firefox-59.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; + sha512 = "de35687482f7e2cec359a8878bddc9facdd612fe077cfeaa9dbb1db8609727386b575b63afda66cb301902f3e39a6c7b703d46cca3359529eadfce7dc446a934"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/xh/firefox-59.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; + sha512 = "c97bd14cc26e6fade88ef23abb6cb211634ca65f37cc429327cb1c48bbd2ae90123f96d8b395e5490eafb795844541f04d3994c391a2e668264e70dc6194721d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-CN/firefox-59.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; + sha512 = "eac667946684308e4635c6e855a7c34ac41b804ad688dd2797dcba0ccd27bffc5174f0360ebeac5c3da1735b3f8fc43fce52e05aba94bdd7d99089ccfac157e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-TW/firefox-59.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; + sha512 = "c5b5565ef561c3b62b3a20f1b3af62a42c60f51783d1cfa0552c707b090834666d530ff579d7ff0b72b7d8b792b909c3c589dfbf377c8c9c56373ebc37695300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ach/firefox-59.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; + sha512 = "e8f63441044b74f377a7cf28e26cdb26bbf243799361d254c01853875318f0bfc366daca1bcdf49cf8e7e888c8eb154712c113f72f000c14eddc662e00888774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/af/firefox-59.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; + sha512 = "f2e0da9b8c395ca966f9fbe4500990f35188e599b5e6b5a6131b717510b7593db1aa6760308e10b04c0693fef7aba00e1fa9afeda7ed27bdff1459e9cbe176d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/an/firefox-59.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; + sha512 = "6971a436397420c8832d853fea0f36df80422ed96bed1bd7c8e0b83aa61e081789a8458528a0b8005056ab37d34a931a13dfa40c0fbf544433ca7276ea18c460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ar/firefox-59.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; + sha512 = "cc770512915404b138e9dc0b48070e3986a4eb00824b65e94788ab78462bdd2f13ba2001f7cf57b56eca37a712a6bdf88a46effc9aa330fbc8244cae82aad674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/as/firefox-59.0.3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; + sha512 = "b0407f2700faef6d8dc87a9e2ad6ad6aef8f5bb88aa4940fdb514be1b568b2b5b3e9ef7ee340d167a37f410e6aabd02bd74bb5fdd6c262f50f5b099ded5ec42f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ast/firefox-59.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; + sha512 = "0f4aec8ad23012e0001fdeaa49e0e526c4f15b8dde73b6fb7d29582eeeb6ef8e4833b3cb0b371df745321e612969336a30852a449356bfcf7a0e946025ea0a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/az/firefox-59.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; + sha512 = "29f3ae8f53a5c7eb4c9c2e4c750b9c2b3a11cf519ee75822442c862023b4da960c2b494f4e15dbcf1bf80a2ae237426c99480f3c2eabd733b68dab6e5b33b288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/be/firefox-59.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; + sha512 = "2f776f2a6d2b5ddff6d487df2ce71c9896b9f411fc4a7fc4e9f8c6a4c89bba4301e759754771e628aed2db51ab478236e860a2eb7d915b3f9e79291f5b1c8ce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bg/firefox-59.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; + sha512 = "6a16d832d8398dbb70b3ae5d9e7caf36ac03f85862338f96809e83b408363fbc7563556287ecee3fdf6f62ac575b8c4f4f79aefbf80d5239394beeee42a518d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-BD/firefox-59.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; + sha512 = "8df02f3e41c38c2ba9988d17611b43e8c7cd1000b579d767d4ba7ec4fff29208c61e9e4b618bad9024c7e2f082cb9c5f3e30f0dafce9833928cfbc8fa7eaf256"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-IN/firefox-59.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; + sha512 = "3439a65d5217570b92d7ff32d868b5e562a88d8973e644f3e9a0d0bc65ce0fdf9c2f31a028cf4f4a694041c57f080cc2bd9d4d674d48e12426e9a53df3a224d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/br/firefox-59.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; + sha512 = "433e5b36204f2350f39ea985e642ff5b2e375f08b5034167f353cc29c18c07d3e6cf9a8b0555f265dd8dcf55731ad472304f077b9abd0ee6ed1e06ea672559c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bs/firefox-59.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; + sha512 = "eb4a09ab24c0a25f780eafb544af4e8622d96fbbc417b0e967fc927bef222638d062a348e5f14bcf3e7485bcda1c0d7fc04a7fc61e1b3bce7487fe9f760ba88d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ca/firefox-59.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; + sha512 = "9f5f05299942911442386a6c86bee3b38e8a312ce331d5236be6e00900a8727cf3952bdff45fbbb0037f60b5a1d865e26d46173276466f091f4f9d8709cacea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cak/firefox-59.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; + sha512 = "3c32f5932799d9b9ca1b28acb77495e8c326990630cf84b051ad15853c419d4817bc101ec95551ed33e1cfded60620168a7915e3c1a6978f472ca38da6d0d5e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cs/firefox-59.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; + sha512 = "9adaddd0c480574ab67afa9b9149904c24ea396494649b113c19a33422f204dc23d9c8b141d7b155cdbdce8226a20a2f1d54a06f7fe68bd90bc3aded007b71a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cy/firefox-59.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; + sha512 = "7e9acff49b9713eda7eb4323ab2d829622fbb7a7795ac4013a1a5f644dd84074278989e416744730eb575b9eaa2c6ee802aa0cba735d338797afadd5b3121064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/da/firefox-59.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; + sha512 = "ce57898ac9daa0299456a65ab8bfc84e549869b7ed0049e6657370ee4591ad4208500ce76c3a45370dfd7669084dcf5b5611177a61189e9cb00562dac4575345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/de/firefox-59.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; + sha512 = "40304528aa2e0f7991138ae096372dd0ab5094ea4bad4eaed40d589f43e892ed092e6cac724ef603d55a96c8b18ebd6c96eccfe1ffca05ce79786c4df3b0e80a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/dsb/firefox-59.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; + sha512 = "8e004141d679f98a4045b22dee36ed8860283515708372f8231b2ba73648424cdce41f8ceb6ade33705d18dd70a7afd3a8f36c07d79c1194ea8cd55e82da3581"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/el/firefox-59.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; + sha512 = "8a61347c08e80763efca8a76338a4fc7c16ed0f9ee30b0b0a3b0c381d5788ef9961e7a39373af3bc8c9171b463ae481e56640c3548d6240c41a51765bac133ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-GB/firefox-59.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; + sha512 = "a48d79a2465aa99afe29d83f12822812dd80c1e8d2053e737c7c97dde49addffa38a9987d36c3b3fdf82e8d1f076d4ee8cb0fdc3a3afa84a61ae85fcfb25fb1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-US/firefox-59.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; + sha512 = "24caf749a1202893753a791ab88c100e91a372f05b600f53b0668eb17a0772cf3a404609c46662ad545a789b9f326c1f157ff046e1407e6e02e498e81a8282b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-ZA/firefox-59.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; + sha512 = "b156d3f2b266ecca8d767976fc25c8a532c96029384cb284f496d2c45e96da0a588e9c5ba8daaa9cecdd2074c40d1e2f0d4e4c010eaeeb04e8e806a6d8158222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eo/firefox-59.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; + sha512 = "564ca3321c9349e73aec5695bf1af885bb2bb4f802d6580f82aad5a3c5501ad38d40029cf03b1a0fcf540296dfec985eb5478a0a9f8244244292573295c9059e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-AR/firefox-59.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; + sha512 = "a8cb0ecc609919d3707fd5766fa64389c8ccefdc8dc395fde64c93075d7c4b23a3a0a6cddccd612d04d2f25211e05e744bdc59b141211e1ca6df1db4de5171d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-CL/firefox-59.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; + sha512 = "e38be1cb60807e75f6d68864a925e11abb337ee909359dadc268d57352510a9b4f046ad3dd8dde499d771a00766de7d5a20a79a1d4b8aadacc63fe74f7150294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-ES/firefox-59.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; + sha512 = "829eeb7a4cdc8b58e0dd558761817681cfab451a977c13d1d484d1aa350fe8f88be0c87eb81274ee766c1315196c10245dd7c4f227b42246ba96b8aa09f94735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-MX/firefox-59.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; + sha512 = "d62b35f47e3c40f698d17d4bbde1b545c97c39dca80cf15c852776c52e27c7d36bf1b6451a31b1e00a64359e16110a9917f412ad576027f4bb800b055b158200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/et/firefox-59.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; + sha512 = "4c3d6e2bbc8d77f51b6d28fec555b746df955c5043c7ad0f573e81dacd7f651658483fbefb0442458449104468ecbb1af4a5bc815bf9f43fe0ce902365e70c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eu/firefox-59.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; + sha512 = "bce4a19bab38960aa3b96a74c41bac79f449e12adcdf5ffc97843d0e85555bf49d3e3d4d691a4fb2615a359eb1edc23762c08830b9817c43993e6832da1e071c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fa/firefox-59.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; + sha512 = "4d1fb11d8f7c4f31bc4a8649d8c68ee8d89ae9f56693f58d48c46c312efa41d716d894a3756f174ba7a4c417b2388cb254e941354287eb60ea9397584e271f2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ff/firefox-59.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; + sha512 = "8b63609ed0b80386aa82e40bdd61eea53db70dc451e5ccf83290bcbfd2a88be781918b44d95a91fca8d75abc14699030281880d6826b9313ba3a61f371f0c132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fi/firefox-59.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; + sha512 = "2ab60636f442da71b01bd293e5ec68b0fc99cb98b7de707a27f725661bddc954c2ed9296b5862afec24d9a3dab0d1da6c2beab7ddf505c0951aacbf42c697033"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fr/firefox-59.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; + sha512 = "422916b8a03cf8e7271ca629ded5b8fa5990cbcf63495c196782e3a8e219156d66adfad2c3ccf450e9b7a357ef8d8cf99dd1c341a63379a20adf083a0ec5b736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fy-NL/firefox-59.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; + sha512 = "9da3085dd1c6e8a23a51545c8971d90e82c98d000f4eae3053b0edbd217879eafd9218edadb4776f592613b1f6641ab76dea3c63e30886a8fe727f282847c1a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ga-IE/firefox-59.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; + sha512 = "471456518971454c4f85d005bea9afa64998173ec2ba164ecafb833899e597fbe67217782f4e61d4edc102bad53c04f3aa652862ebbb88669351df8ae2500cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gd/firefox-59.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; + sha512 = "f086dc7c12948ab1d052f9de433e6121a43281d514d16d85163afed61eb8ab9f059e9e7e1f671d4207d5449087c9cc1432ced11322b95383e1bdfa8c9d48032d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gl/firefox-59.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; + sha512 = "b5d5b475015d8c3b76310e6baa19da872ce6b5ee5d4a69b4acd229536527e5718f8a6669323b968fdb1dcc6ee998be62798bf914310b91896845e953a0c2c72a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gn/firefox-59.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; + sha512 = "6bab886661997a8edbb71c86d938f3a798298c1000c4ccd0495a543f9104735d1f462e809bcd11a81750cf2743c19e476d352ac5fe99da47055c27dc35101084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gu-IN/firefox-59.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; + sha512 = "7dfeaadc772bef003700fcff66d2ffa4466aa443e1a822ed1b638f9d929d5479abdfa86de33b880eb0d89ec7f7e33474ba6644b5fb68c6708a7bd2df208c4204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/he/firefox-59.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; + sha512 = "b88a00c1aa346d1a1e1948a0ffffb79d86576c6b6c70419cfa06fd1687c4f5c124804f807e3d5db66cb9c49d168a80188c8e622dda5e6ce172d286ecfaffc3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hi-IN/firefox-59.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; + sha512 = "5344123a20046864605e26c388a79257d9a7b08c0ce981b7f47678d9894b710c0e765f14afa50d6ef80c89bac0ef1990a1cf51e225ad2a885be344027d583e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hr/firefox-59.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; + sha512 = "674a80317eb215d405a937df50e4c417feaf54795266dfba5bd4049d60764ed4d2750d390ac08e9d11762d34c80bf84d7e8b6cc58c9232f6e75268ea04316eae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hsb/firefox-59.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; + sha512 = "8c18833f2d0896d39e4be8b226f8ceda350e1c35bffda11cf0f752bf71fd130f2272345dfbf4b4d766a749b2d11624d41f77e6fcbad4c11849878a4bd0a154a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hu/firefox-59.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; + sha512 = "99c44f9307ed391bdc75a59291ca1e6b9c6e8c0dddf29c137dd93b62d3a9f3d19f23f2fd371f56257aa9dfaeebd150b29aec9141e8741f9edca4be0356541414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hy-AM/firefox-59.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; + sha512 = "891abdd7a6a671c55568736d7b25ff5c4ea37c59d7ca4fc64e2ae2f3752138ec17b91f375de636e09683fa30a252d5ff8adf7ed6f9ef08c860c54e263896d288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ia/firefox-59.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; + sha512 = "9f6609688c613fad6f00c3196122183d1480ac5a80b383e47cb1d1ffe8670d4bfbd9cb492cf0beeebcb9759f78283d6ee9b740e2d9bc2289bd72768b63603c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/id/firefox-59.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; + sha512 = "99dcc0f7d52dca3b172d138ea0ff2ff597c4c6c31f185cd2621acf3a1fa100c81e264993805bf74604857ed945e22b9b90c51fd19958f675f73a00a46fabb646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/is/firefox-59.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; + sha512 = "42c108d4ec83aafe6f27ca45ac5f32172e1481291a7b105dde8f565b8ca600307478deea0f59ad153398a78c0fb228c211d6907ad0a7a8a950dbf717cc8f89e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/it/firefox-59.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; + sha512 = "e68944d88a96a4405de772c6b5e7fbaa518474e6594fb358884eb5473c8a9c9662dc67c5619d492721cf047af5244d2af8eeef7de7fb8ffc37333f2c0f362933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ja/firefox-59.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; + sha512 = "dff549f43bc4185a7f5baa9ee0655c1a752f114c8abf51e086eb340afcc628822899775284b37ab1704c2e0435b87fc7c9ece70d878db811be2c7aac9c7e1b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ka/firefox-59.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; + sha512 = "d9291224b245006c5c2922b8bbb52411ba1852aa6ecc95969e623d68d5bae7e6c2d84ecb5d4723a3b6d0c3a48aea5bfb173f6192c4d150e0b75f7ca748883cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kab/firefox-59.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; + sha512 = "6e27a03b7ad1d84b1ffa383be8df8036d431f1e2a7c861a21064b553e71cf71b846c65021ae7dc49921057c7eb526c3790601de39cdd243a427929a69506b38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kk/firefox-59.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; + sha512 = "d270d5f0519b88469d01d953e01e426a7c91516e7336c1e21de82fe5b09193e41d2bd56ca06f24c843ff96ef4dc560a405bf9b1f4de66c201fc051d0e1299f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/km/firefox-59.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; + sha512 = "22822889c2406adfc717eea2ca4fabe005e055be1c6eec66b0e777c9ab11beacbb9abb3d7824e84225fb58da6214094e005946b3f3c78caee4cd76cd4e42bf93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kn/firefox-59.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; + sha512 = "ca9ef014bc339feb1c1732286762bca9b869cf38cdea3794124175d26bc1759e4f2f6dbc0167badecf3481eefdf76355d972d7c90c4890c1b3ca0268260267b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ko/firefox-59.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; + sha512 = "769b06aea04de7fc084e38e33a73b008420540c7f6ffa24f126fee65eff5f22d21784332932f9814faef1839605e6ebd29afd468debaf6800e523a63b92edb7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lij/firefox-59.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; + sha512 = "c9ddef72418c957fcb413fc19accc83987aea01321b0417af027257bf6884f419ab90d936ab2005595617bbe042542101cd09152eed23eb0f4dea49bcb285e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lt/firefox-59.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; + sha512 = "870563459a55d7b40718643d0c348518a10bcc48765b48899ba185d65d303249d58a365bd4d8662c7788279567a98dac4826e1e12c77e7ffd7eb927c2e76e222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lv/firefox-59.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; + sha512 = "c8db9d0ebab798fdec91855cb3bd762a391576cc6c6391395faf074bfc1e8b2c82953af34206fbfecb2ca10703d8a5af0837528af07de365da19c45eed371c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mai/firefox-59.0.3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; + sha512 = "4e5dfd66e44e6ba839bf59e68122fd3207f0082029746795aeee6ae8545d3ff6dbdf4f6b15984f4fb0ecadcdf78ad0f4afddebdfd240c5f75f10b4854986f983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mk/firefox-59.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; + sha512 = "95fbf34fe70e3ca3927ad587c02ccfe5e6d5494ab53af0c9d3578ab8ccbef8bc3766779a1e7fe1a275dbccbc855beac9585abe4dc45c04d43d830a98eb5aab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ml/firefox-59.0.3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; + sha512 = "49b3270031a43cb304121b3f889a3d101828e60d733fddc4184be437236c829c8a82bb60fa509c66625268505756a799e3001d8c673f5f405bbfc5d9bde6f119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mr/firefox-59.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; + sha512 = "83a010f59bd6c17f9aaaafab14786b8ab11ad4298e91cf101c7e2b1566beb9499990de1cebe7c721ba107f79e7e719dc9aca26bfedba230a97355689e71014ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ms/firefox-59.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; + sha512 = "0148a5ce8c124b40b7501d2f6e6102e182adbac4226c5783826278b65a2076dcbdde535819fe57076febb142efc13bd8632458fdfd54b3a7d7012228a1933063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/my/firefox-59.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; + sha512 = "5e988af0d46c5a1efe8b113194537ba711151c693810e761fe77e3cbae15994527459346abce3846825fa49eee0443149d2b4f2cdca33d33bc7791c52648b26c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nb-NO/firefox-59.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; + sha512 = "0dc5f04d92341f2fc3fa47f3836234edbbf1c3aa4785470f323eafb27f7cd9c5ced5301f3dbdbcf40f35bc12037b12d9c12e86b19f687372e8793c762ce1f2cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ne-NP/firefox-59.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; + sha512 = "6f4e88a48c2514f9ab2ded5e5e08842003a282c5dfebcab23183c1271d57ec765a41163ae217ddb2fe2cac7860e189dabaf5822725dd505c8f27673165e22603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nl/firefox-59.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; + sha512 = "23ea428a562d7c9cc17199294be927c15394a098d881208c05a558450f5df9d85dd65f934b2cce967d43004797d6f7f6838340ebac726308f6e12a4d9187f3b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nn-NO/firefox-59.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; + sha512 = "75bbcaa6b84da1f1aa0963e588207e256b09a68dd56590811333834e2cceeb3c24eec4deacc2d049d051005149a70aaedacd5af02ede684aa9d72aa1777f0a58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/or/firefox-59.0.3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; + sha512 = "c856da11eea56f3dff269c49a70c7c3eb760b18cac6491c6ebd365dbd5f9353b51e6264c44d0cc798e4d6deab68c9928f84ba2ea2205c77251586060aa794940"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pa-IN/firefox-59.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; + sha512 = "c6982d378aca49e32f968be08c3d9fc6cf1fe706543bb0f6356b4107b90be1e233880bd71a32abb36a57e47d76a62b8dc241d72a0613416b755b2746fae6710e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pl/firefox-59.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; + sha512 = "a263ae839be17284c8ce8bceb94fdc04d29d61fec480d936e5f3b0d67581b2fac65c3712013ed7611f61f7a054e0fff9d3cd3b97be824671a73277ec74ac3c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-BR/firefox-59.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; + sha512 = "00cc236a6ff2e3cf20b4f9d00418104ff7a5e0d86b21166958714f388b356022c20907ecb1f40cde695a70a088e5cddee955ee4754c9ccbb99be86d5b07ea067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-PT/firefox-59.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; + sha512 = "daaa2c6de1c534ebb04904a9e987dd190883b37254ef8b41c6d3c9c29f53f44006c8d6e6fd8ec4c722143d4d666a234ca892d8820b9b382252586f079a9aa75f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/rm/firefox-59.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; + sha512 = "5ada38c5aecb0003a0d6a814ccf60043fb9caed23f143192b4ea739c004c73c6a20c8326fcc6fb7a63073c74ffca2dcf6fad2d87a1b1445b220e074781d085e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ro/firefox-59.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; + sha512 = "ddb9cbad7cd1d16da0552f7922433a73186e17f0f1181e415a522f1d68daa0b564c226c5b8a0a2883cf627bf23f53db7db8c4373beb366df518af457d4da20fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ru/firefox-59.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; + sha512 = "e113811aafcf713e12d225097442e4f1df2bd79f24fde84b543d3c4e3aeac2abde4c19aa98708577391c4b016c32af5a188c200954e0750dca1a4f13412da3f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/si/firefox-59.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; + sha512 = "faa98d902ff56f2d3978337f69cc146de506f8eea86f671057ad6b9b72e00a1de9ee90e5d7945826aedfcd996fa8d5476c11fb0aaa77ee9a7fe49b5e1e9b4b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sk/firefox-59.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; + sha512 = "aee696579b46e4f0db7eef3d78a8d12d3bf7f1910049b7dec9de7f1598005ea7c9c2b1e5cc12a6258595b7c4ecc5be8cdce03e2566c539eeb0be0a545ab792b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sl/firefox-59.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; + sha512 = "7fd3522a56107f054fd852ff3ce5100276a63d423c8481ef0f90dbd87edcf4bbd71424c25fd78535a3cffb1bb273c9e61f7b332923409f0838b81d31bebbaf7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/son/firefox-59.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; + sha512 = "302d73075dfe7e12f06bc58cbeb7aa6985c9c6c82850d70cccc0854797a78ef4759136d1a9254d0d1407dc8ef39fac5501f14c2cff24ca3cd1db14ea337ae3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sq/firefox-59.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; + sha512 = "21f943834dc04a35f3e3f097e31614b18040ebb7decee4d3bd54916c79b5d16840d0265e7d20aa1d0a508f3d2bca38ee28046f017629c85ba49d98c2b8a543e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sr/firefox-59.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; + sha512 = "48af03fb3cd68774535bb873cd452f3ee907b96cd5aa4fa662079eab069ebc57eaecaa17726337190d1e528e927aed48fb5a58de97158898de87b318012aea24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sv-SE/firefox-59.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; + sha512 = "33a1becac255b82ec3d20d37ee4ec97975df55cbe2f3760a802021ac571b5f88a25ca591378fae990870fc03c552067f136209245a878c86d0c386245d6042f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ta/firefox-59.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; + sha512 = "a924970ef03b4f719bec64c507fe4e4c9ee8d18188c0a5a11785798ac28bb69397403a34b5e20f1d4e0affdb82037190dcb77042f5c5b62af79bb332022aaafb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/te/firefox-59.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; + sha512 = "0fbd8b103da9080c56b94d319b1e60b16a8b525c3c4071e12f390b52f870aa17db0d153c099fc77f1b70fde0302431b94549abbf713c7255a8b01c0c9c247341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/th/firefox-59.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; + sha512 = "6079f0e2bdaa67bcef0f850df24dca79473bbdc2ba0668b59c5d8fcc23627c4156ebadff4ea01744c50a50571d5fc65ee7c680ba48f67997817dbb729170cabf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/tr/firefox-59.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; + sha512 = "86c02b0bfb19f7461b9a2d31ba7a0f4473f52ec09350b9898f0c5c42eedb74c67e5fe3fdedec53bf9fa57497a970d286de6c1cfc141d0b0cb5deeee1df9ebdf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uk/firefox-59.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; + sha512 = "63afd6b42202ac16c7c638af84b10f1f655d8144af44c79e29894a123dff2eb1f445550a82e8aeba558cf759f2aa68752461301128c3adb9d7c18f39d9f45de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ur/firefox-59.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; + sha512 = "02e1341a4ac5e2e2fcf2cbfe1dcb10f82ba726d437e5de9d132eb58f5a68ce9e13d646ad004d5638f356a717f23d4a38f25171eb4c773da953042729fda19bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uz/firefox-59.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; + sha512 = "fd346ea8650222cac69531b28c70bbd0a069e24ef0383d169fe05dc966e5d8e523e87d33b1ce4b696b33e6182f5373e762fd40ceaaf1bbe7313c67f3905003c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/vi/firefox-59.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; + sha512 = "af4d11f8eeeb07457810e73f25d04d59131ada91c0142af486a8726c5abce26b2e16a51b539c5c47b2c2c220dd9cfbc6c95a81f114b382192528c50e431ee211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/xh/firefox-59.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; + sha512 = "06084e0b1c2e18cae797519ef3ea12e8af851c9d33c385e55418cd2cbe733d64e350958d0125664dba7317dc5579409a5dd33722bb1f504cc0406cf3dbc05806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-CN/firefox-59.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; + sha512 = "5b63ec90f6ba20001c3696081ca2048c6ad9b2a0f061aded8c5a7b2b25a906f95c0c3ea297b5b51db346d1af96819cdffefc3c3a0632308ec5a27a7ea1a5bdde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-TW/firefox-59.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; + sha512 = "164af70d9ec69685dd0bc909436a4c7dbb126716b28f0f4fc92e75777431e8a037833778ca8a9a5e35d883d940873b899ac2edfdca50be2c1167c320fb4dec65"; } ]; } From 459312c4239a439d9f0924f4713c33a12be1f4f2 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 30 Apr 2018 21:20:14 +0900 Subject: [PATCH 271/369] firefox: 59.0.2 -> 59.0.3 --- pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 07495e7d4707..e0b00985de96 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -18,10 +18,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "59.0.2"; + version = "59.0.3"; src = fetchurl { - url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; - sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; + url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2"; + sha512 = "2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp"; }; patches = nixpkgsPatches ++ [ From ae85f48652de786f5401f169b564456e979acf30 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 5 May 2018 22:24:32 +0900 Subject: [PATCH 272/369] firefox-esr: 52.7.3esr -> 52.7.4esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e0b00985de96..651bfb7bae19 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -41,10 +41,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.7.3esr"; + version = "52.7.4esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; + sha512 = "971ac97a749e5d322fec95ca1e86af5b633deab37d2d8fb49ab129c7ba20753a802c620315bc5b92a0a7ab7afe00e71aca04b3238670c4732d8e6816c645f53a"; }; patches = nixpkgsPatches; From c1db0cdc4ba97a6c079f52cba2b1a7e038cdaf9b Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 May 2018 20:31:44 +0900 Subject: [PATCH 273/369] firefox: use fetchzip instead of fetchurl --- pkgs/applications/networking/browsers/firefox/packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 651bfb7bae19..4c17f2c98069 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,5 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchzip +, fetchFromGitHub, fetchpatch }: let @@ -19,9 +20,9 @@ rec { firefox = common rec { pname = "firefox"; version = "59.0.3"; - src = fetchurl { + src = fetchzip { url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2"; - sha512 = "2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp"; + sha512 = "0wcvs0lzdddbrxp8prg1w1g4xq9xqzvqlgs9r22zjblfnp703nw82zr09ys7jd63mr77g3rgglhi3d5k42aqrbmsx1r5dn5qqf5jlkz"; }; patches = nixpkgsPatches ++ [ From e39706ce498016599cd46e34b924eb12069dd8df Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 May 2018 09:07:53 +0900 Subject: [PATCH 274/369] firefox-bin: 59.0.3 -> 60.0 --- .../browsers/firefox-bin/release_sources.nix | 788 +++++++++--------- 1 file changed, 399 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index cab39047212a..478728cf09e5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,985 @@ { - version = "59.0.3"; + version = "60.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ach/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ach/firefox-60.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "404b4cdd02a1d25379f3627824d7790bf1c73af9f58e94a8fb6208f8907b3a7e7599821edcee65838255fdee69914eb8c916218d7714226d7cce5180fb01ab2c"; + sha512 = "1e7d2419e488a14eed5af7f2aec9a0092f830cea256f69cf654b2bbf783b192ead4512538fe3b2566dd55061cccaced91a7aa54732fc0987a4b24f676b9cabd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/af/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/af/firefox-60.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "59ef32fb550404f6e4572cc9b5e34d6a7875a16dc62ead78b02fe944e4f3d2128e71cdac236e074238c6ca45d3fda959e17df3f6c056f13b149058f156bb97a7"; + sha512 = "5714025668a2a9856571c743870f3401f0bfba66bb216936df7fbc977d9a935ae8b66fcb3042e45a934584a2571289fdac4f8fe8af2ec6a52c93d6fbf21484fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/an/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/an/firefox-60.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a3d0b8785bfc1250c8b5deda2a876469c1c2c3c7c5bb22b45a6aebf7d4e3c1813c7a7ed99257a4ec52b7f56f1c183e50e515a88bcb5d47213095382ab1355485"; + sha512 = "678a060be20453e11fa2e8dc92db8a510789082d026a768dfb6cb3ac6a77924a1f6a9cce4e8c83e19a4aa6702b1e7e0b17846c52d2de2719dc5f8141a95d1c47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ar/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ar/firefox-60.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "15f410bed4f64d8f3f8acf0275647aa0a94985e3172b4c5e0c5f52a3a1f1c132b1677032f361fec075667ce733e288cd79382abc5b4aa630281e72f889e35990"; + sha512 = "0c8e9cff9d7a349dfb18e3c5924efb068e1f9f145347b08feb158521b3ebf331ee01b035052ddb889d09b728745465fb6b7ba79c3608719c6f14a36e1da061c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/as/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/as/firefox-60.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f61f4e1bf0487657fa538ced9ddfb01fae19bc973a3a44e602b4d68547386fab4b730ad69ebabd14617fc4a6b291a4c5c50a09c60d5cfdfc1a01254a9cc70c4a"; + sha512 = "0ec81546fa30b6ff5fd8b66df5b97eff25b359ea0ff258cd24aeab63cc87ecec3deb5f4173d9da46efbf82f70a3fd1579aff819de4e299a464abe289e7c77890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ast/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ast/firefox-60.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "30fc099cc873ad3159406018386033b251738cb258fbce3ad7428e6db359a263648d3c5f394150e5e162791e767e30de2907a16385669478706f66395ac60fb5"; + sha512 = "ca9eceb89df3d618756618d961be5115846c1c6426f7f145379c2a127c807ba17c4796e9a16395e6f2d05b5638366b7f0a77ca19a75f89bbdf6a2a2f93269c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/az/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/az/firefox-60.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "7b3fff9d731b1700461fdde8e4943fb5e01a73e2c89ae40511315b2f219524dc3ed67458f9c91ca0b4ba34ec9ff7e5edc5382dee25b23d46f468d597024adf46"; + sha512 = "e99295b469fb85cba099424700267f875e7d4ad9c3e8398c7ed8bd4427a3d173feec957edec2847ade3735df77a7313ca99a98b66b67c158b33bd17e39fe98df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/be/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/be/firefox-60.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f9913874e839249b892281b90cce9fa93243560a599c942e5dddf22b51e4b5774ef91d582a170d5a591b3e47dffb7015aef5d4ff39c165213ff8b24e238b8c6e"; + sha512 = "ce80aa81c5b04da5f0f89d9e527b8e1d7ebc287ddb05d2ecc08994c0e31ea8860b68316af5e00f59e1ba85a4abb29e1e9403cedde40faa294af6b130be2a4ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bg/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bg/firefox-60.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "1a84a38460ac8a144e4dfef1b1e5ddb6dcfaff1f0cdc1497e477614b60b63405f0e573c25307957d52a91808af88b9906daac8c956d7ee74bb907bf90c94f526"; + sha512 = "5a5f0fa8745c9c649dc26e8d235729bcdcbc397c4deb56bc0d8bff954ec64c2acd9f4d9fbeab9b0484d3fe91ed3717f8e37d5602f139fb5bc4fb22d0a372b926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-BD/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-BD/firefox-60.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "72b33e221e8d111bf8796879f8797c760e752e17d515a036c9c84172115a845cc82d34b4a16ad27a84db4c1d32fd74c066b6fb7810a4a06ba97140e5b8330fea"; + sha512 = "62989d16accef0717ec9360d66cd169d89847701cab64f06fae6290b9be6d67acb0dd6c5d7f0e0c79107301512f57b44da04ce66096232291c5947a903e446e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-IN/firefox-60.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0ddec8964bbc6bf0aff10a96d5797166f4445ee26acc155a8777cab8755b6a119b61c38f9acc011f3857d97d35b808b72f22c5493c4091cc4c17694b1d8b4f0c"; + sha512 = "fd75cfe4d3e9e7534d4b99452c05e4ee8bb45ddeb0b6cbac979b65db0a783f342b346204428c9b0787ab4e1bcccf4d4f056f4043a906dee41e7753ab8e53fc9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/br/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/br/firefox-60.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9171f0547ce9d0c244a959294d62477bac7fcb7e611666f394ac47fb0c8f3579f85b08fa837e5e834a38e4908e0e1a4fe3b96e5759825a41996afd3fc2308e8c"; + sha512 = "5c17a47e0fcc7231e6d1a9fb632f5f55c6dcb4dbfdf02ca6607ddcc54db3e198d563b0247fd4e95226ca29dfda25bf092e1b427d1b532b6544c2f2c5c498ee02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bs/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bs/firefox-60.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "6322d2e315937a4b7007ff68a8e491e76fc13e07cc881ee9c7a0a20e57f75ea4ad245f1849902aaa80eadc380bf107dcbaac229f05bcc67f775844880a514b97"; + sha512 = "290f57558d2d0b6abee4e6220047e0e6082f328bf3c1c7ba02474d7885ad3bbe77ead7875ec2726ae5ab4db25bf9659147c5abe9fea771a54acd4a9cefa18c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ca/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ca/firefox-60.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "e1080f2bf6a9fd9b20498c454231315387fc12e9f27a5e6637113d5121c1e3c4f7c9c1dcaf8ceef6af5245d9b5b9388aca63678431ff54e58378f3faf45f42a8"; + sha512 = "cfd5654a3ac3a50885621bc4be9918f5e71dd8150e4fe4e54acf35685a42ea82d6115e8a50593866e186860c7d5de5408c5a0e7325050b1bc39d6964e828a3e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cak/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cak/firefox-60.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "770a9990136bcaf0e8d8a8056972de603c1f6e181c7b37c0b3dd2bf694a9402c981d4699e25d92c10a78808f9a56596f533107c941c29c8f3f318b40c79eacf9"; + sha512 = "479d713253b99a19c6ec305e7986062b3a1ee476afb8968dfa2f57c52f22b734df82661bf487ad1fe7e706dfb581a99b247ea4128e89c9105b719b96f37e1cc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cs/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cs/firefox-60.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "e1a65b8f97f106985714f221c0221b66c086f6a4aaeddf994089a4924d1f73ea5345de147870ab46201466e5bf7ae6d7de103f666ee40207141b5e64f5cc2534"; + sha512 = "5139f4a2820ee921bd3c02acca7f57c5c2cc510c0e364129ecc07f17843cf92c565770fd0829515bfae94f96f6c9c68e8eb05c87fe5800da0be64f2400bf876a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cy/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cy/firefox-60.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "7d150f5ed948a9ea25777e9d4f15c21076e72340150140aeb26db5d39ba124087f7e93362bf9b9b8104087b84a998ebf8fc006198527ecbe441d1701fe7fc7a7"; + sha512 = "d26fa97dae91eaaf0b09a580880ff0bb70f67c473cd8dd804d835823ac6cd97306b0bfab9b8fabd45b35330ddbef72e779dd09b47580b0347d4d857dd04182e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/da/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/da/firefox-60.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "636bc1610c521bdf85976aafba91969641ad7cf77a00a51b095c84698f42fc27f5f4bef227f9f9d0128b8d68a99d2ca7d8d915e74c8428aed269a67e15851343"; + sha512 = "66a187b067f2e71f8ef43e3eed3eb12d02b407a230692e653111407c2dec82dce552eb5f9716733b0b3112d2d07ba6d917e4166e9bdac030dc0569a8630b566e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/de/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/de/firefox-60.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8dbf02a5533a84cff9c41584e91416859a06623f24936eb559238f0ccd5618c047f1b549036398aa8bd4f879a8eaae7b0f199576427dedbf9708cb55514cf169"; + sha512 = "aab4cfcf1c47d99c01cc93b0e26babecb4619b67df65a2400259249a870aa765152b7e4be625a9708e3e44b90f5a20b77f282b6939f2d092cc0bd180d8167c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/dsb/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/dsb/firefox-60.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b42bb2a2e75713e9c0c2f0602251ad5c3ab8683800ee08b0b5f36f055a63dca6e88e6e0c88806149217f20833538bde557c699c7f815eea59ab571e3b2db4df4"; + sha512 = "8726bd887b610e74b8b7073b8e797a98e009150594f2dd5e0f301f375b7bd6af02b5c8915c444145fadc6ae3e77f494a6c39632858d172b6324a2e4c84c0d6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/el/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/el/firefox-60.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "32c61f7110084caf8cc3aed151f5b374e35ab4a4b7d5c3159f0e44007f3398e6fde02ca460e13400ce6d507bf2dccdcf88c50945420802dcd7cf2ba6ac3ba8dc"; + sha512 = "f67a778f0aa15bac7450a210287f8e1e29cb9f4abc0f9e3c037d15a0f9341cdfff80b38a936724e5d18b5ceb373233fd8d038579e3a044c177887e05f5834310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-GB/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-GB/firefox-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ee19670513499ce3cde705e1dc19db9ae16018cf8672d5c1c1f7029ce4a44437239150dcad425592dbab2746571b5317fb0e1d7eed87f65e121ddca4a8efaf31"; + sha512 = "fecd277c434cf3d4509371a5abf09fad81aba3fc7807470fcb91975939fef0d1384a97c4322411a787bb3fb27e3b043f9dd3ac182e41d35ea59824d109ff483e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-US/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-US/firefox-60.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d42ae9f95b85a2678c895ba920435059f920df656bd41156c9e300a97827f58bcb689d0152f9732fabad792c084b47719124bd96d286744d2d787909e7844ae2"; + sha512 = "263b6e827b8e6f8757c82a2ca24f78bd649ee07254cfde454e6d6ed879cfe816ed61c94aab3c10f3d63a38f83f391bf66bc578ae958343327298801fc30eaf3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-ZA/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-ZA/firefox-60.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "9ca481e4a072eba9d0bd373df8d4038b08d95af5ad69e08ee0d3499cbb422e1df20b2a56615675d2663ce1df6cf4cc01ec773a8b99e43301b4f5e13dfdc70cc9"; + sha512 = "6ffa936e9f5e495309ff535fa9775200f8110bc0162d97f8d8bd00cbf3606c47b88b566114224f882a323c6e9538150ef79e1340e1e1eead8ddaf030b4ffb3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eo/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eo/firefox-60.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "750ee8058e9c79047a5abb3b8219ce6c10d0aa8667ff788c921891d5bb8e85a400bc28c7be9a8d0479d7a64c7b6788a22a5a8545f4665e2c90513251f87bae30"; + sha512 = "f65bf2b40299c5260cb857c781445c9213dea8a49751d6701f43f6dd11fccec206b5850d54e96a4eba544d59b6a470f21b3e15b60116615c343d78726e7402f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-AR/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-AR/firefox-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "dc0350f8da5ab3deb8dccd05e71fc873051d8a935f75af95a3fcb0bb81e86f18eca3f14c1be2f9fd491662ad9c908c5770cf1e6d22a4f3ffacdf5aaadb54b13b"; + sha512 = "50a912c5d4cb1e73bbe5b4c6cd8a112cf88377ca78cb45a073bfe74b4b5618a39fe088c908e278eedaf50308e70e63d38c06343c4d60fdfc346684ce7042a5ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-CL/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-CL/firefox-60.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "04f9c3a5bb4e87778a5b7f10bdc4f6ac5f8eee39f50db72e20e4e94babaad0411d14eacefddb084469b7540cb5104b718e29020188ff05069faec919420083b1"; + sha512 = "b12f0fca0d307b280ec2a44f9dceed0073b0b9e898e05a55fdfd15623e022eac7b937e6b4ce470c7892e9ed429fd98a4d09141a5e1141fe05e3b21ab838a21d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-ES/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-ES/firefox-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f70157ee4afe65cf65529d1dbc1c93307f4a79cd89d0ef7c05bb9f8723c95c561eb3a122506509e83dc6056b603e203bdd5464dc1db7e6497c0fb7cd7035d039"; + sha512 = "492aed6ef8fa3e51ad1604cf858dd1223ccc8a949b3cef4ec37be1596640421b057f50d3ad1827fe139230013ba4c040466682e61ebee59e7b6c168f35a14b1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-MX/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-MX/firefox-60.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "aec14d9c54a116047193596304ef235d05089c2e94eec9caa40ef12498800fafc88b3e094e1c72e25be06c8288daff20fe8859a62157544ee3233ed620fa0daf"; + sha512 = "8f12520b74b0899c58f29217f9ecc6223635b627ddf525e3d36b7a0616ad2ea39e239bdb3cf3e0570ba4be03ebd93a2aa2739cb7cbfb851e84d2549970fd0bec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/et/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/et/firefox-60.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "32dbdd743b65fb5f5941ca3a83272b49a47c7742377cd46bab19a9c2e75bf5726cfa7afa55c7cc33a4a9daceacdaf59019ab0f302af84edc6ea6beb9db7fd6c0"; + sha512 = "c24e822fbd147ae85a8f02dcbb070764c31b96056a07b2b344f85641517e1e8fa78fff860bc7e951675f9ba30616dcb567e279db93638f241a75632f7fd97b9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eu/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eu/firefox-60.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9b47c791bf12a2782930c62f4973a2d49cef28e4b5fca24824da28dc2f9b7bb64f9dbe8208c77d77f924962db35e0190969cf65b2d2b520cba94ae6747082038"; + sha512 = "61ebe8e2e353419f7ed3ef8f944f4d8ae54d3c1c21ed7c1707212ac31e20c6f0607c00d0f3039e83c1aba832653f9c352b4976af4100b968045ad103862cee6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fa/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fa/firefox-60.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "bb0e0c3a8c5bb31b1959626a2d8e13a47f60815af3041e0463e9148c61fcf626cf1ed0a9a6f27ebf8fb5fcda60b306ca679f4d4c6f4080d7a542782b2805b22c"; + sha512 = "d47f63bedfc12a2e14eab57eeca7f946513b3067ea84b7931237a32841c40e477dfb4f3979fdd617b6b43787631f97fa4e28f996038f3eac7c2be7c82f8edfaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ff/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ff/firefox-60.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3e9f478f3712cd084ece2492f384c0ff4e92058d20df30893b5b96ff20bed8c3903cb66c23a4dc9fcdc12320addcc9da948c05bdf3c84232d307bb8360b163fb"; + sha512 = "91fbab65d71da4416df7501ef392154844a6e5fafde529e9a9a42f01b44eb87ad248d83387b68fbda5b964b8d18b1b22b978dac8751cd73bf30c46d3cafda868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fi/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fi/firefox-60.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9f85727e929ecc8915530c5cd57bb6e76d7972636ae607e0ef211ab562694e825406e23b8ff98b39447fe9f5fbe6ab586370ba0a90331d5dbac04882baa13643"; + sha512 = "483408626eaec192e753277b02de5c5bb68ca6056f35756fd7f80ff6c6ab3e6ff15f23d4cd5d1a28c8e662bc278ce7cb285513504663340451b912126e4d4fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fr/firefox-60.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d150100a8d0eb9fe38bb40e5791735975a94d866778623c649fc9cca9907b773f3f5762dca0ffb707d50d72b48cfe3da0d3a203f310a119b1d2c17988a345233"; + sha512 = "adb7d295ba37c0cc7b51e312ffc3f60e8ee13106bacbb833086d160535504fa2f8f859ea3c1d30eb6a823ed9c2c6efc97bb691dde8cdcf991090e29e15d5c21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fy-NL/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fy-NL/firefox-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6110e624c28606720ba7383179573ba047e3a5f975d2790f9c647995a0821b17d04dcf1108672b5c8eff3c5c7fd6fc8bd0fda53a293d13217526e6f5f959e09b"; + sha512 = "ff44abaf4ec57162bdeb3197c3f75f312029934a8546018dab76aee8bab44cf2411c59d04a4dee9bebd618f26b466fd074f7533d839f1202e643d255e97e8015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ga-IE/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ga-IE/firefox-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1d6015e42bf94eaba47a9cc75134eac83cd2ad6b18d86350eeb2df0ed7d38c3d39abae49f2b57d1b66f6d75c7e233e0e31c4fcaf7da76b6b8b90dd07e7519e99"; + sha512 = "5d511a4dbc00b39199500b30c98ecd6bc009217644b82f58beed9fbb74699fdeca7cc31b59a046a7c56fa57c53c2aef7cc55232fedbca751b85347460c014d3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gd/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gd/firefox-60.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ca5cfa0b930147a88280f12a56ec7e112edc66079139cc0d7d5282dc6078dead6cca66b8725ed9cd59203e3121ec480454fd42d535c42ee6d002bfb99a323a58"; + sha512 = "c7c893d0acb97541d9545a35c031aec967405113a4855d6833b5ade0418004fb8b6efab82abb551499c4b4f8a32010634b64a96e8c9b12f27b764dc50b33a23e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gl/firefox-60.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0fa94d9f494e2b8c90931889fc0191540b8999526e6140cebffd93fd02c0035e206de09fd4f28f168ada7b8c13f61a7a327efe19909024779751090178add2ef"; + sha512 = "aadd92086094860936f1c0436bab9742170533a1b233022313439c9aa968269835b2f63bf33226c1fc52bafbcbe1e00677e8f1e04579193c474600e5dc3d94c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gn/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gn/firefox-60.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "640518a9f2137495adc18fa689444335e4a663cdb9a4beeb3ae6dda6c4b5d2af166ecaae8068352852c3455ec8fe81cf945faf2742f8096dd6966fa37affaa12"; + sha512 = "cf566c8adb01873712708f76bb976a92a3b729459639faabd22ab5515cf59951142af734c9eab7d67ec4eabf9590f1d7bab65787f70908dbc01aece73bf52277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gu-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gu-IN/firefox-60.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "9cdd5186c99b5ba464a3931e443a7ac24f8236bd6e92f23314e0595525ce17757d58637b3d9db318816d704644b600a2f2bd1eaf156011c5d22bf58ecf0c0c90"; + sha512 = "ecc4afe4acebf476fb0c4bd089679d8fdfb88c06769a75dc473ca3cefae09c01c8e71f88cf3c8130f4576eac17445032223f2713327ef6386fda6a2e3f588bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/he/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/he/firefox-60.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a2ccb4a8ad24143c9b82d16c816527acf9022a2457695a66144d2b917ea2c933f15cb238b3afc61be2e590bdc966a009fe4aa5e08bc94e2d297f768344d6596d"; + sha512 = "604048649305e7abe426b831c8b3fd0eb3cb26cabc7b055f85b7fcad8d0f9cb8bb06a431a28013ae8fd24ab4b21d8f8e68053dd7397a88546305f241adab476a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hi-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hi-IN/firefox-60.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ee0f077a4001fab75b8d4386e8ed4b72a3240417cd4db4d9aafecd8cde7728bdf3dc1ea1c96dd7a568ff547dfe2ccd984a679ca464adf9528fef886b913224cb"; + sha512 = "1f1d56c762166cd8c099f636c610c361ca94d388bd4d627ddae6d94e4424074686b5fb6a3aae5562e9250dc82576bc52abac4e1b09386dc2f81799a1804bb7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hr/firefox-60.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "28c158c5b2895b16a599f3122d0742b8e48528f3a319fb48b5f2c500727dcb877ed7660a3a674883b3aab71cef66d76a6c1cb222dc16925e0bfcb044a5d510c7"; + sha512 = "f5968a481d92aa0b57ed6319e7bba0d11ff00e0ec8beab9c6b66e18f4a6d128979ce1efaaf6fa07d4202130698216e58b8580833c13e1420dcfadbcda925b908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hsb/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hsb/firefox-60.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6fb2b3fab3559b87c62d7c63fd522c7e0c8d51adc60a49ad87340ecc05e1d27ed3be84a0593d40173e25fe0445d776ede6db6d3d0e8ebe1dbc11f1ace4feded7"; + sha512 = "6dee0423afa3ab5c173568aa91a2e92927cd6aae390033f34d8e63ad224d813b3f688a0287872cd8b08efad823b05804ddf54efcb57d1503bb70731391fafebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hu/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hu/firefox-60.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "21f30c5e8e2f23f39b149545fdd5ce0fe0169bf580a574b8da6f141e09334a010b21ac076aa62b4df2c335ad8bd433344c58bfb7d9b80f26261a0f927e3ef455"; + sha512 = "688103282fbc64a541bf6b914f757ef4cdf58ac6eaa942f45bb8b20b661136913b62735b7352c2118643118c48d94dd9a7cc18dcac184c3080e078d6bafbb278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hy-AM/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hy-AM/firefox-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "619190e969e7d9faf0b0d9b6eab902577a19183f1412a8f22a4615eda035ab06c10ea2ba0769febf3466ed97a964c7b7070a03d4ca2ba33f312e04fa20eddd5b"; + sha512 = "f836cd764ddd7f9f48295c103b4ec0c091c8eaceb756825fbc9f4a03b9dab786fc94781903975167d93c8d9ee73940a6607403ae6d0ef97a7c83b89989ec628c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ia/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ia/firefox-60.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "8cc986bd03f6d9c66c7916ea8c7086a18ecdfacd9e117136bd8489ca5f91af6d87447ec1a9b998c9bd222dd83e679b4081dce4a98959c8ea8b3bf541e46a2c8e"; + sha512 = "61ed80fa61e7e8247ac1b59dd26582b063fd1313a02bf1ab73c696389cdf5f3d8bc0c3b58a15fd9ff08ca9514e3a3b53fb16aa532758586d412a8155131fa457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/id/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/id/firefox-60.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9debe3c7c1310d567a960985269e56f40a0a85eb99dc26bf7ba1c009f78dd66243ec9f8bef3cafa1f00f078d8cc76f84d4c4367b315418456f7f694faa9373f1"; + sha512 = "a87de8f34c82d35a5bfc77ba7a5be2c5afa6b5015d79f25280d162f9563cf8e48ff54386c03b67e4743a376c0d679f1d90b7f87924126028f2a4b990e7d28182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/is/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/is/firefox-60.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f0f676e21ec9ce7625f6925e524d0ee2cfe11aad4a97cc9041b0cc03678a8059f3d32c931edf56173b5300d91620fdb9401919addffa4a76d060e31bba8000cb"; + sha512 = "3b51c777930363c3085f11f3fd54a58a3ebf63a1a35384ec8d324acd670cb35e8bf8f9d1bd3b6ba735b63b5b2f0901d064e7802c5fea6edd5b36d7cc022cfd94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/it/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/it/firefox-60.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "30fe899358440fb54c779470548dcff9ceb8eb55b72bd298aebd7281309f24fd256865b7db83461c83d212f6b66e3e81d505245ae9556594aff78e86ad12fa97"; + sha512 = "84ab4fc30b8753fd7586239b6f7313828862793581932aba00394ba59f6070a5ce69455a102f2ad05fe19e8cdfcd78de82d488bc31918b63f4d8aa810db2be76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ja/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ja/firefox-60.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "309f6e3a24fc2f9ed859f0133e38cbc47b74d6d04fdf439c14d6328f25c16697eac7b49e1441c9cc32877938aec1f8e862df6a44fa85156b9d29109713f61dcb"; + sha512 = "345b9ed332637d74064064894d34d32263725af9d288da3de3b2c05d2e38ee97355bba5a871698980d772a7b6847642c19716e00514d2965900f12b8a5d7a633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ka/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ka/firefox-60.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d2bdbe00907e43f1673616dbfd52182651e2aab4b356079537d361c8c88945f06ce23a953386d64e4aa6516a490674f3cc20973558d83990c8b9c35807941bf7"; + sha512 = "fa3baf6c474e883c94e5d862739e2124980e3d7cb7692dee8507d13bd1aaf389c849b218ec0cde02f60db479c1ecd32e8e444afe3e09c6ebb4e7afa0b273a2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kab/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kab/firefox-60.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a144e1fd69291e5f30a0aefbfd2c9113e8d3f3dd38522b6c12e227c47626a7bda74d4663ab2c2aa10d85963689db4fbd3141e8c49ffe77d59f273c7031b31d55"; + sha512 = "a86ccc40c7a7460acf3242a8ab85fdae4146bf0efbae20ea44fb0251f18bbc803f55748348022ad5196c2347e3da7b79a03418ae281835af184d2245e4bb7635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kk/firefox-60.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cb826eeddacab068f2b5ddfbbe05ffdc3862c23eece9e2b11cfa9c86780eba659cf6cb0917cc5d41737bf9f9fa59ed274ce29c3ae94c41c9d2c70be3249adea9"; + sha512 = "420956435202d7166c3d29c795974034b43c758fe19d0d55dfbd207e4e1862272a55a6770294ffa54a4cb9259985eac7f17a290e13a49006661b18beb7f27a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/km/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/km/firefox-60.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d968692a7626bb8b831c747cc64c713b1209218cfe4bd4f1ed6e645ccff86dd4c4ca529f07a163915b155c72fad4e2637e2d1f52e0ee184f572743cb0b2c8de9"; + sha512 = "cfc262238316cd3dcab2e2a11647cdf3a7ba38004d4fa18f83286d6cf1320a78534cb88727635c330e6ca8c8608aae748786a83fb68484f6d2f6ee23cff603f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kn/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kn/firefox-60.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ebcece13e28b4e5009a60dd88752b7f5c756a5fb974b606c3dccbe037401c30b684faba5d7b4c76d21dc369855c38b66fd160544efe7105235412dd10c16761e"; + sha512 = "27c445445080f6642d4f95022d8bd07824ea81549f80da041ad1273db6d4a0eccb9e1bdcacb89e269e69dc63a33af2c131f193545624771e25444e212592c45b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ko/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ko/firefox-60.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "5272a4d40ef663ed9f9774ce61e73a5f42be4ab08222e45755dc400e4a596d91f7833f7510cdd199932baa8eaa54fe56458513517d712ccf24bc1b40ddf62c2e"; + sha512 = "21f8dedddbcc5da3788abbc17ae07c422b2f1476fea3c45f173376b1ba38736f1a85b7d11bfc0e50ad610d605680b3333c39b18b89e9e4990086a782f8559881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lij/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lij/firefox-60.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "cb09361665412b9c5a0865d59197d0f7234a5005a2e147010c7d40f94d749e22719d150da70e8e415a9f9ff3f01a0f0aa9158d58f45d34232f4d6d40c6b7871f"; + sha512 = "706bb394d90ac405773448cd4869c8880a649569d15af420e15851131194a014b0b9f72a9b60b2f621596d4215f606b3b81e0409ea4eff5da0c04a91691bd99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lt/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lt/firefox-60.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f5e5ea9eb648c3d1c0363f275a1d262326cecb3e33f539614242d05e819e4fe58276eaef58f03f088c4f0bc8fd416e35c4ed5303f962daa80dc9fc7e90b6ffa1"; + sha512 = "6cf1735fb80b7fd945a2b993f1963ed14c903791dd720fb9821a728251b0c006cfda12f80f55e96bb821c7988f7e73144254e7e3a3c92a4a66680be9293771cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lv/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lv/firefox-60.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "97bb94f1f8e30acb1f86cdecc272f56bca9dcc617f02e43fa024a0d9fbb7a111c01245e578684570886bdc67d706c5f41d02fec7cdc7b298467241a6b5ae9a1a"; + sha512 = "5feccbfe1088ed569e67e3a54f9cff0f7fcac91dccb8fa447febfd96ef2a4f25a2f51b8dce2f397b2b09fd8654bfcf292339cc5d25140a1892894425f2d86e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mai/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mai/firefox-60.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "00fcb9eabe9779878a8b73e98dbf025ea5d69adc2f84d828e3532257bdcacc9fced522228c330b3286fa9a9bc11806227c698dc4b6bc87482e838974652a8d77"; + sha512 = "0b75fa47591f6ed9cdab76ceda17636a7f666b6469e2fef948d29c77f559328320cb1108105590a240a0004976cc922439eaa800a5234f7064396e2d56e5a45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mk/firefox-60.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "469394ce137bb09223123e84b36a2f6cc3f4679db831e787b26c674045025eb96c00e68eb8ca3c18dbcfc41ea91c31b4071c3d9c392b1cd5386e3c4b92352799"; + sha512 = "bcecbd3a82a66abc1918f03ff0c5da822526f3c1a8ad72ca9a021d5c036a382734251513dacef9ca6f290b130b67edeea5a79a37606ac34f34b27528ba7cffac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ml/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ml/firefox-60.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "0736b067e98e30c411e2996428a9abb596a38574ed6e2225cbb2e32ba3ca5c7793281d019f1f0b73d6fa9861c9526d7e504f49fb5100ab93d7b625061b356754"; + sha512 = "14d844aa0c430376d17224e0172234bf028f1bdc56b931aad2455c221affb93f1048866b8bb3418dd10fe12367178e7504842762fa9fff381a21ef8599bf9f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mr/firefox-60.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bb34429687408dc07c24959c93f38959ff3f3ce0804f1bfd33df9ac7f2218287d6f3a63029dfd73bad6aea47fa132cabf716c50c9f6f06258fb4fd667ee9b186"; + sha512 = "b25b3aad52c6670c27c977084cacaf526b4c64b24c679dd7f45f4ab583a80799912b6e6b9eac195ba19c94d70dc5a1fcdac46e2c1234fac777d706fa51008221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ms/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ms/firefox-60.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a96e7f57519a7672feee1a4fa84f6bb4de31a5a66d79905413ce8502d9b272d2e77bbe92a36cefc5ee050e8099f314054c81d440a73a2787bfe02a097d6e21ed"; + sha512 = "5df8c5ca3e8dec6b84066ce0c4e2db00d12cbf7c0c51d229a88072653166359652caf4c51e7470f06151d9ddda0075f8f53eebe2bd83e25bec9920db7654a97a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/my/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/my/firefox-60.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "25ebb5e15975848a1e66eb1ef6494fc42d5f8b42de77fc6e66313a0d00d5874271aae0cb883ee1f1139f9664bdafb902a3cb5fc73d2dc64f4a97ce686137bb12"; + sha512 = "eb35f499f6d2ad6e71eb780767abef864b2611e8cf83669e1a8a08f6fdd098ea183234e157a5ea442773c45348b13c55b2811398a2440d5e579cf57ffd1620fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nb-NO/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nb-NO/firefox-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b2281d8946e6367f9153f7201c2bf021a1ff20f69fd6a52a5074d195f8c7e1936ec811a57cf71f4cf10d7f128b6ac0f5229f1fea4fda3511d6e113f131f210ee"; + sha512 = "bf8b5d719d507faed5f2f9c34d6a78471b16f0452286ab3f79d63d516bdd6af54186cb4cd896d09400da51ec4a923f711791e4040048ed546a0d30a065dac129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ne-NP/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ne-NP/firefox-60.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "63c6772968397c738f4866ea68d07f9aa74f0e593010cc80a613f4c59713e81f29e6715caafc91a1e8d68df906abfe498146be1cdebe56f085cbf576bf26eeef"; + sha512 = "e389da15177b36b9f480630e88491252b37ae1c4b9874804eda96a259fd8d0dd5c53975056246dbfb1ec8b5d47c90a9eddd2dc665c19dda64d35fb1af4d1a531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nl/firefox-60.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "bc75476bbb8791cc7b67f0403b31efe165775708961b849351cbab604a828e4f846630f9c4172a24a519cff0ebd2d86ba3d498659b1a4fb81554d0b3cc4da9b4"; + sha512 = "d4b4978889d9acd79e60c05f9e088c8850ef234e475bc05b27abe79596f74db47da748fa228b0b9706ff8f7e747b28edda36555dca8a3c8a70bb3a2ee147b8cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nn-NO/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nn-NO/firefox-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5baadd863abe9c385b050e55748785f6d0dfe539781327713e0fd746a4546b7bd86b9b4ee2281092e733594106028ea36d37c254705f5f39447c152593c74035"; + sha512 = "7f27fefba306c82b7227889f56059d271623ac40af272ecf810c53224cdfca8a79225bdc1dbf267be8b8a4db4a5c870f5f969f0e30cb3bc6488c8ce101c43bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/or/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/oc/firefox-60.0.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha512 = "f5dd23837b4c6d60a3efece4f70fa4ad2c69a0d560d2dba884ca0bf004619c26aca11348e4eaecebb0a92c46a835ea766b09a9734f7ae34dab88c4849aae5151"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/or/firefox-60.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bb444d06d25d782923803db81d446f12324e70d13daad1d014f4d938d466f946d6922a5f21a560e4c82e9ae27c3ac72422875518f37bcba268f7884c0de98d86"; + sha512 = "f3224d03f3a264498167e62fa8df8b1d4ad0cd9de07f9bfe26eb85977214a00d64daa0d3ed8ae9d2d4ba30e606bb006a0399918dcda34d6eb5b9009eb3db6dcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pa-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pa-IN/firefox-60.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "79881db61e611083c35d2730753ddd7d06e28e5dd1703fa5b500562ad66222d0f3b731e1cc475760cc726e34e12585c3059025f60a1a7a7c512286a92268313c"; + sha512 = "47b347b899f7300a9bc9fb15f00ea5b05ed26f422b4836d24da1a795b8f35fa8cdce292fcd92b8730e54078318794cf942b27425c367ed4090f3ea9237611cb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pl/firefox-60.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "33c8a94cde2263b78c32ebf7dc8646d041c8071e3f26926776b7cec635cbeb7aeda74b31e6e59de186cf1f9f929139e1165635e6340fd3f3d56a400722d3f897"; + sha512 = "844eb1c7e46ef7bea66317220a6a57daa0cca6022457da4184550974cb9f616bc25ea01ccd8f158c3d195d39e74cab4d04f51d41406a9cbaffb423c87ea24b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-BR/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-BR/firefox-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a5e14da9ea50e92a6e48bab8f0626ef6a155eda72cc0ac068943e948c942f291d36a5ac4b06e802358153bdfee6a7278b524834c3e5c79c8f4adfae6c7877437"; + sha512 = "ba3418e27df6f0e037c37d1afde5e96c5415257fb0ad70f95bec98d50084f8f0aaf1a5d8752163bfaf00b390db6d0dfb88867d3afe48bb246664e7a9361b2d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-PT/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-PT/firefox-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "991544ee16e1cc3b5dfe3e8426f2f7ca47d72003f60efefd9947b2cb72f614583225f81d5c49ed1bc72979ca548d749592888a01778c4cd8d2261c69e47a7cc4"; + sha512 = "6f675e939407e19ddea4962e2f8cb0fcfc7f573ff76689d1f434416b02024bf8786ad78b03fcd4150301309fbfbb91be078340a47d9fa413d2312c6b8aebdb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/rm/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/rm/firefox-60.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6f2cd65aa98c546a9a19144dc24da9cad112fef735618b5ec23ffbcf32ba4bd515838fd0d8f2147a2193b3146a913a2683f23889fb913e62bd26519135aa5f12"; + sha512 = "d6623710addc98457977ff62337a3aaccf1953874e6df5fb6d4ecfe2d7650920d5c1d4593793f37b5397e688ee3e745ac7007f3925e0982b7ce168f5a1fd90ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ro/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ro/firefox-60.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4c1704d334a76c62c5407dc433861ca2afb063830703f5ed2b76e987a42935bc569d340f8e2e9d47efaf4e27cf820437f662981a1734a9f65022424847c70fcb"; + sha512 = "38c6a14a6ac375ce700cea3853b4fa208929ab6814bf2037c2b9d03b15d85ce81833c09e889ef5a8966c61658055fc11e4d1ece2a16370e7436adb52ab321bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ru/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ru/firefox-60.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a3e941b5f14d1371c1321353566460b03546a9eb5238c72ce9fc9a06dd4f4f91c616fe15efe553cb87765ad64e71ef2abd7ea4ed8931067575c45d86a88c5348"; + sha512 = "730d26ce8e54b9b4e8379c475e6db9bfc293cd6bd233f566ac54ef6512f3f3bcf687b18f8a31f3869821a9fa1d26cd8e6149e3721b5950ff7633a645df4df8fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/si/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/si/firefox-60.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "aa8459ea3e1318485e9b73caef32f87958072a0f067bc86ff679cd65b58190a6ed358a7b6c9b1e59512c2a204cbb6545ccdd9178c4ea8fd60d003914872b9575"; + sha512 = "37b72c9fd02ca03087458b58080da505fd334fd7059291a7d83557212af0e30273ef002a3fdd9a8797e76f1178fba731c127a28051b1bbf74f570f13d6d8064f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sk/firefox-60.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6759a550e8652902e9de653f160d2e50e89cfcd2328a5eb47d6dd79cb71326d88263ad0a820183b859b000bcfd575299b77107a0c409e92397918539289accbd"; + sha512 = "5ad4c596575cf5ee63d7ee6c9df3f9b9dead8fe41fc66dd09c010755d069f2c6dc2a920ce4cd82f23df7a22d600aa502b3accbdb05976ad5f08f1ec19772fd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sl/firefox-60.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6411d82a4a8cd9a710c755d8f588b4e7b936bd3f14726a6b0a8b5d90cbdda12390d9fd9f99b01b9a595e20c6a3ae50d7c5d7f242f542dc1f3a86b0051c3ea498"; + sha512 = "5c7181d319b5bc4c9c731640360fec12a862975fb8d6b59f913a9a113b88a65ab3b9db9ff759f9faef6088f25c5f59462f0f82b62a8e5115836f498289478f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/son/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/son/firefox-60.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "dbd99f23a8bda258cebefeb680cf205c75552850e59560d9df2683070c79147f5063fda983f95a5fa985732ae369007aa0d57bb1997e3dcd11e964c59fb9f46a"; + sha512 = "f1ff760bc5516ac6a5beb251d541e38cadf0652ff51f9f1798b9677e9d3e33c844d56e6397288c898ba38c6bfc80129c7318e1e9cba3ef9ab4b9f07405dd628a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sq/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sq/firefox-60.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c2ff4a76aec95237747f740f052b943bc92009a232ef4e77af66a2e7afc26fee15c76b45e1dfe4f10a1e62f28e7372ace069200f93848dfb3fde71b85953b2c8"; + sha512 = "d57cd7cf4669cb537d96d6b9b4bc81446d7e54d6cc294776f2155b1280352289c1afc3d0b2744973280bc980c4f6200a0cf114e449c15c339535cb30ed153766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sr/firefox-60.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b69a111b27d05d88e8416ae1f8f0e3b2e48714694bc01fe14a299cd9ade7fb8d6b16e063bfd35a7579ba5a226e6d47872639b31f77bd4db7237d54277b0d7628"; + sha512 = "2aaaa459fc730feb75428dc4af773d001bd18fd0afbe564d919925f159cd95abc22a21db9919a0c3f16f12ffdb30e8f0d91c0d3c113578804c35a1764b86af1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sv-SE/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sv-SE/firefox-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "16c23e86ff3f22935830c500acfbe6ff7d4d41f0840328407d540f17aa48c5ab45032194bbb5af9820dc03896b683e09e016a9ad6d0c23859524bc4ece0d16c0"; + sha512 = "223f00e509c53a88f102c2f9da9b75640bea329307251b59aaf2ccc759fa0246701b1877c400f3fef2337099f2c070f33ffb92c8313612a384e7f5ec7cf66ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ta/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ta/firefox-60.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "2aecef72d4847e2cb1bf857f8c3375c14be09c23b9ff211cf908c56cc1b2e4f5e20019ff7e6cbb0be6bbc882663fe0d539e9b3c7e3543e46f348d8ac9e829738"; + sha512 = "910ff3e81fda8c94989b3d6cefc5ade22ff0dce21a81907e84f1573d631253ca3b3f45383552193fb46875e09b770ff8e28fe945558fd897bf0b64bfb4e01004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/te/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/te/firefox-60.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0967879b336d27c933ba606de57c3b60aa9b61d6bc01bf2fa0f5bdd43a08299a6f15d7792e1f4abd641fc9296c95a1ab874af8256292074532f7c69ef0369997"; + sha512 = "3fb89f3620d5a39a44cef228a9fdd11362bb3bff59fc64815468376221bc151e3538f929023fe634a163e0c7ec47c45c54388d4f5dc911b53a3f2565caaa6edf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/th/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/th/firefox-60.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "81c57006aea7a18ccc8e42299dba497528680567f1cb6cf96b069f2832eb8f305fbcfdcfad1ced9d90ab89a59d8d2e471da427fe4b3e77a88140073b0b78c4ef"; + sha512 = "78a66d69b6225ee29c5c1084c9059a9f1bb867c22886ad42e628fd7e0316bc2eb8eb02522972817508557f1be5369e00ba489260b7b6882a4f12448808b9af16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/tr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/tr/firefox-60.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "df076aaa8e2478d5c7f4929c9c798dbe18d21d6601c48651653fb7f134f6c2c379e290168b0f7faca4e47ede8c571eed04e1337702787f0f64d4bc84aeba1d27"; + sha512 = "afb9c372e5b1f0f69c53b4c0ea9dcd8ba73672c163bd63cf88b7d8c9bf24af3656a924b29c6b3e28f826ea710c452cde789ee68e0a80bf269b034428ca2de577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uk/firefox-60.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4c53c231aea6f63312fe8b218adf56b2012921460ef1a82f32a9587db9ccf74154b04859d26a7574c6290d492c8189fab80990092f289c7e96f24337689c8659"; + sha512 = "ff3cd139b34652446807063c4d68f4a5ff8b5643bfe786527114a11a4cfe2838f64ff151d5d77ffc9c51e4b057d3f1058dee1dde521ea95bc9f17392a641c5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ur/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ur/firefox-60.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "278d330c4409e931a02f7585dfd0185f30a733afa448bc0cbcb471bb67c41b0d46bb229d8c480342604201639b34d607ac0433c093d0bef205ef9918ec61b966"; + sha512 = "f075ecd1d15e9737ea6079c2dad94f7e3bda9503ae8a17f017fba27c166f1721ff9e5956c3a7a3704594d8f4154f9e11dd2df19630aa735aa7d3e533283af43f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uz/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uz/firefox-60.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a9a714b9a9e9439a12be8248d9fbd9d92dd7ab9c12bc0ad280b9753f2c369061d554129404ba6ca546918b33d87731623926c15aa908408392d27e89768027f5"; + sha512 = "8c885715f9df669d79fa4c0b0bc054c4e760916ddef288deda943ce372dfc85693a2297ed591b4f540f618e4044321fd3812c9fb037561969a11a7b472dba2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/vi/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/vi/firefox-60.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "de35687482f7e2cec359a8878bddc9facdd612fe077cfeaa9dbb1db8609727386b575b63afda66cb301902f3e39a6c7b703d46cca3359529eadfce7dc446a934"; + sha512 = "19b398ae13e9cb74f61fbfeefe68fa8fcdf8785fdba2dece9e2674900cd9ab71b401029e1f1fb91174c9996e65522eabea975d3bf9d46de0f76c29d0ff6d3812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/xh/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/xh/firefox-60.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c97bd14cc26e6fade88ef23abb6cb211634ca65f37cc429327cb1c48bbd2ae90123f96d8b395e5490eafb795844541f04d3994c391a2e668264e70dc6194721d"; + sha512 = "e236beb0e0d5a7fda5c6bde0141884a0d5e09628e579ad0e31280db64d2f373946bba15fa1fc40a7c5ac7d468896d9e7af41b587378a999dd7fc1d9b89d7a11d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-CN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-CN/firefox-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "eac667946684308e4635c6e855a7c34ac41b804ad688dd2797dcba0ccd27bffc5174f0360ebeac5c3da1735b3f8fc43fce52e05aba94bdd7d99089ccfac157e8"; + sha512 = "d4865b13e94ed4ecaddee1458700ad6ac3850aed5c5298761fc1dee3b483a302a60256ceae15fb0b8d2b212420aedf1e66345b951dc90e5d8368242bcdd0cebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-TW/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-TW/firefox-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c5b5565ef561c3b62b3a20f1b3af62a42c60f51783d1cfa0552c707b090834666d530ff579d7ff0b72b7d8b792b909c3c589dfbf377c8c9c56373ebc37695300"; + sha512 = "2165c1971c390be50a8af0e7a17766952a28c62355ac6c017c0871696b4073dd164795b3a347c3db99fd6b625f02c7e1ab8dfedb48943bcd50a1fcd46aca797d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ach/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ach/firefox-60.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e8f63441044b74f377a7cf28e26cdb26bbf243799361d254c01853875318f0bfc366daca1bcdf49cf8e7e888c8eb154712c113f72f000c14eddc662e00888774"; + sha512 = "ae783339b7f51f9e7fdddd36086fee47545b0624d42498627b65233bdc157cd30b2efd2272e27699e495b617b888c6c0a179d9026b7e22b5f96112f9cb520837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/af/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/af/firefox-60.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "f2e0da9b8c395ca966f9fbe4500990f35188e599b5e6b5a6131b717510b7593db1aa6760308e10b04c0693fef7aba00e1fa9afeda7ed27bdff1459e9cbe176d5"; + sha512 = "8591da90fb08f30445457e84464219f47e685b973b118829878e5c9bda41a58296190f34959549bec9cfda400cf4dd29b2bff99b8411a3f255b04da4f67789b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/an/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/an/firefox-60.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6971a436397420c8832d853fea0f36df80422ed96bed1bd7c8e0b83aa61e081789a8458528a0b8005056ab37d34a931a13dfa40c0fbf544433ca7276ea18c460"; + sha512 = "f60502441cc1d58194329d9853cc5d893ef1255dbf0d07a9344d9d49ebf328473bc978a5cd8ec43de5b57751b698774e090c2ee471ce65423f5a33750262c280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ar/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ar/firefox-60.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cc770512915404b138e9dc0b48070e3986a4eb00824b65e94788ab78462bdd2f13ba2001f7cf57b56eca37a712a6bdf88a46effc9aa330fbc8244cae82aad674"; + sha512 = "c0174c009dce15fc2836d28cf80063e04ce34d12c04ce2230c5a9e01bbdcdc8073856601db45158bee68b410c4b9d9c53c78bfbe24c8293536c866b2cd13c3cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/as/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/as/firefox-60.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b0407f2700faef6d8dc87a9e2ad6ad6aef8f5bb88aa4940fdb514be1b568b2b5b3e9ef7ee340d167a37f410e6aabd02bd74bb5fdd6c262f50f5b099ded5ec42f"; + sha512 = "19f81fb36908e5959818c74c0534d4189025b061222bcd01745033891321a2931ffcfec76a893249a8e7026489ced55497c00ef0dab156416a644a9b88c72a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ast/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ast/firefox-60.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "0f4aec8ad23012e0001fdeaa49e0e526c4f15b8dde73b6fb7d29582eeeb6ef8e4833b3cb0b371df745321e612969336a30852a449356bfcf7a0e946025ea0a93"; + sha512 = "a9bcf4be3e09509d34f70ea2cbffd4ecbf3aeb15f535080851c63aa2cc8e473fcc9453ef76d25fd525ae79f74eb76a6269919261aff5e8637cac139587b92c95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/az/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/az/firefox-60.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "29f3ae8f53a5c7eb4c9c2e4c750b9c2b3a11cf519ee75822442c862023b4da960c2b494f4e15dbcf1bf80a2ae237426c99480f3c2eabd733b68dab6e5b33b288"; + sha512 = "14dc7149a69e6dce184e4526cc31f1a8d2f5a833c49ffd1c0ec51d67e8746d27334fa49abf9d487b7656b9f1e71ee0f24e7ef69b9888e6da640ffeab1da12ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/be/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/be/firefox-60.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2f776f2a6d2b5ddff6d487df2ce71c9896b9f411fc4a7fc4e9f8c6a4c89bba4301e759754771e628aed2db51ab478236e860a2eb7d915b3f9e79291f5b1c8ce4"; + sha512 = "38dc8e028feb9a523190346b01b9342e865af18db67eda7dd65189087ec1302085a141c708da5834339f5abb36e5eb91cf727eab1dd4feca3b4fda8035f8b423"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bg/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bg/firefox-60.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "6a16d832d8398dbb70b3ae5d9e7caf36ac03f85862338f96809e83b408363fbc7563556287ecee3fdf6f62ac575b8c4f4f79aefbf80d5239394beeee42a518d3"; + sha512 = "d8f0df46d689c512996623657d3b2e893d2a465bf22be0679c1ff9204e8e773172f6a857d392fe2278c59c44e91eb588ba4b035b1dca1540ed59645a9d8708b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-BD/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-BD/firefox-60.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8df02f3e41c38c2ba9988d17611b43e8c7cd1000b579d767d4ba7ec4fff29208c61e9e4b618bad9024c7e2f082cb9c5f3e30f0dafce9833928cfbc8fa7eaf256"; + sha512 = "98902ccb5f3b34e3dfcf101c6f1333428a6a1579d5c5c390cfc134fcf64ae0b4fdb493094bd654c39e9e6708bcdb1ffab377003544432a73e4d80c150a17e871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-IN/firefox-60.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3439a65d5217570b92d7ff32d868b5e562a88d8973e644f3e9a0d0bc65ce0fdf9c2f31a028cf4f4a694041c57f080cc2bd9d4d674d48e12426e9a53df3a224d5"; + sha512 = "d2582614773a08192d0ef87eba9392dc4023c15affbfd14227b642ff93bffa8339fcafad0ef0ee8428c8d5f84a4e84f67af376cbd2e14f187c37a294e710dd12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/br/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/br/firefox-60.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "433e5b36204f2350f39ea985e642ff5b2e375f08b5034167f353cc29c18c07d3e6cf9a8b0555f265dd8dcf55731ad472304f077b9abd0ee6ed1e06ea672559c6"; + sha512 = "62457d015c193a77d12bfe58dff76a23c8b71e184965130699d7d97ba9dcdac47cdbbe9858e5a571185e4c56621f5aa4d8ec01a8c081f6157a98c6ef68ee90d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bs/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bs/firefox-60.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "eb4a09ab24c0a25f780eafb544af4e8622d96fbbc417b0e967fc927bef222638d062a348e5f14bcf3e7485bcda1c0d7fc04a7fc61e1b3bce7487fe9f760ba88d"; + sha512 = "5fe3bdeabe8804b4604440541565fd45854c82f421714a182b93f5b455935743ccb8f29d7b177316513a3f86bf31f549bfbda296c68f5808071dd3f74744fd4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ca/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ca/firefox-60.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9f5f05299942911442386a6c86bee3b38e8a312ce331d5236be6e00900a8727cf3952bdff45fbbb0037f60b5a1d865e26d46173276466f091f4f9d8709cacea9"; + sha512 = "05240abcb093d8a643e636f05fc24f58cd79aebdfd9050dbea00cbec8f25bd61f521f4f85492df0bb4b7db1a69b0d73a322604a0d3741ebd88a3c961495924e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cak/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cak/firefox-60.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "3c32f5932799d9b9ca1b28acb77495e8c326990630cf84b051ad15853c419d4817bc101ec95551ed33e1cfded60620168a7915e3c1a6978f472ca38da6d0d5e4"; + sha512 = "9bd35d87ee4b3e0d867088c5c788c3871ed6c1bdfb5443d7cc4c88501a59a2cd16d58ebe38343d7e9789292ef9ba1392d7a26d86dc56ca916330cf91e7e859d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cs/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cs/firefox-60.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "9adaddd0c480574ab67afa9b9149904c24ea396494649b113c19a33422f204dc23d9c8b141d7b155cdbdce8226a20a2f1d54a06f7fe68bd90bc3aded007b71a6"; + sha512 = "643daf0dabf25827872158e746355b2cce1df12b696e03e2e1e1ee9beb70339eae1175c3eacb31bef8af45d82772310bbcda00fa4d19219421c636a79b85fd0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cy/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cy/firefox-60.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7e9acff49b9713eda7eb4323ab2d829622fbb7a7795ac4013a1a5f644dd84074278989e416744730eb575b9eaa2c6ee802aa0cba735d338797afadd5b3121064"; + sha512 = "3742cf47692ef0a6cc3597678601c260bbbcedf1828286ecef73c55b51113b63954d8f1577050f7db647fc5c520c080fd476e2b714c1c7fc4d2a2eb7bb5ef450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/da/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/da/firefox-60.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ce57898ac9daa0299456a65ab8bfc84e549869b7ed0049e6657370ee4591ad4208500ce76c3a45370dfd7669084dcf5b5611177a61189e9cb00562dac4575345"; + sha512 = "500ac0b682d60e92a695da8b63c87414f2d86f48fea269946b978fe2e1adb79583c813764d039e2201736d367c86dd91a2ca62a555d3355d25b7c4dc96f9fea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/de/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/de/firefox-60.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "40304528aa2e0f7991138ae096372dd0ab5094ea4bad4eaed40d589f43e892ed092e6cac724ef603d55a96c8b18ebd6c96eccfe1ffca05ce79786c4df3b0e80a"; + sha512 = "4d0e210832d9a3290271b804bcf3a64c125764c6236bb84af88988c8ffd0aa57ba7e1060985005100476f36a4a93da93469717634665a634d726a1eda372cf73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/dsb/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/dsb/firefox-60.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8e004141d679f98a4045b22dee36ed8860283515708372f8231b2ba73648424cdce41f8ceb6ade33705d18dd70a7afd3a8f36c07d79c1194ea8cd55e82da3581"; + sha512 = "39b5f2aaf2617a021d15a9da5a3bdb9ce5e56b28e8d61d7d422d5e95918fe10b5608aeb255595f9f92879fc48686337dcb93fc5b8e4a04610523156c8097f579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/el/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/el/firefox-60.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8a61347c08e80763efca8a76338a4fc7c16ed0f9ee30b0b0a3b0c381d5788ef9961e7a39373af3bc8c9171b463ae481e56640c3548d6240c41a51765bac133ce"; + sha512 = "bc8d884f1b850d0b76625d4abf1a919481d23a0632e89396ade24841d7bbc9e23eeabed768b7d937bd7d69adeb2146551e25065251d65021240459f197a6d533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-GB/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-GB/firefox-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a48d79a2465aa99afe29d83f12822812dd80c1e8d2053e737c7c97dde49addffa38a9987d36c3b3fdf82e8d1f076d4ee8cb0fdc3a3afa84a61ae85fcfb25fb1b"; + sha512 = "905394e0add0e530b4a0202237ce6c77bbc124543f2fada77ff6d578b52deeb90861ce4b7df907b9be0c12863b4aea9f545ad55729b83e713cdb556c7d1c4404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-US/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-US/firefox-60.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "24caf749a1202893753a791ab88c100e91a372f05b600f53b0668eb17a0772cf3a404609c46662ad545a789b9f326c1f157ff046e1407e6e02e498e81a8282b1"; + sha512 = "75d3f38d13033717486a7b9cd686cdda1dc15d2064f47311b1bc4c7cbd4c1fd783fb1b8298751360f1513e74dcd1f9eefd73967fb248dc52e26bbc92f5914b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-ZA/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-ZA/firefox-60.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "b156d3f2b266ecca8d767976fc25c8a532c96029384cb284f496d2c45e96da0a588e9c5ba8daaa9cecdd2074c40d1e2f0d4e4c010eaeeb04e8e806a6d8158222"; + sha512 = "9ce1abed9f7bc0debbd34e70c036ae48afe36d87b1cd4df108fd5ff698b3d8e8b32cdf5c8d9ba8b9bba2c7113eddaf9f7a5d015e1b908b47c98f066bff644b40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eo/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eo/firefox-60.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "564ca3321c9349e73aec5695bf1af885bb2bb4f802d6580f82aad5a3c5501ad38d40029cf03b1a0fcf540296dfec985eb5478a0a9f8244244292573295c9059e"; + sha512 = "bf671aa74bd9f22d56864b46d12ac131255c43b2820cda77264f08c48223627e4dff88872240b39d6404a7cec2135788ce5b08506eeeee571c14e2d933d8eb35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-AR/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-AR/firefox-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a8cb0ecc609919d3707fd5766fa64389c8ccefdc8dc395fde64c93075d7c4b23a3a0a6cddccd612d04d2f25211e05e744bdc59b141211e1ca6df1db4de5171d3"; + sha512 = "b282c35954eed46ddf46ed1f0e0ad52440811f6bb0b351337716eed5bd595c519792853003a6f7a742f83beb5231abe8f11deaaa176febe2dcbf84a43eda4077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-CL/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-CL/firefox-60.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e38be1cb60807e75f6d68864a925e11abb337ee909359dadc268d57352510a9b4f046ad3dd8dde499d771a00766de7d5a20a79a1d4b8aadacc63fe74f7150294"; + sha512 = "278245defd36da337383e6970b8afc59c37b207248638db8947a8fa970ca025620dfa8c8045ac2c0f53b4f3e8167425c2f6dc2071574931b43190560ca511ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-ES/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-ES/firefox-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "829eeb7a4cdc8b58e0dd558761817681cfab451a977c13d1d484d1aa350fe8f88be0c87eb81274ee766c1315196c10245dd7c4f227b42246ba96b8aa09f94735"; + sha512 = "f0fb467bbace051bc229fbe07f21f29db492d35f3901cfa9b488c72f303a5dcc85a7969517165980ea7182a85c45a3758a7ceedea3c51bb8a31b9e81ae197214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-MX/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-MX/firefox-60.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d62b35f47e3c40f698d17d4bbde1b545c97c39dca80cf15c852776c52e27c7d36bf1b6451a31b1e00a64359e16110a9917f412ad576027f4bb800b055b158200"; + sha512 = "9a0bfa7ec953da8564b34d0e17efb6935bac51399f604ede83f4c0497494a93ce087ea35daa8ba0c52839e8722ce3bdbceb2e1ed17810f5816c5dbc9778bcd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/et/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/et/firefox-60.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4c3d6e2bbc8d77f51b6d28fec555b746df955c5043c7ad0f573e81dacd7f651658483fbefb0442458449104468ecbb1af4a5bc815bf9f43fe0ce902365e70c18"; + sha512 = "12209ad383627aaafdc4a89b462494f23eb239c736d5f3a1f2541b0ebd5487d6348ac63ccfd4da40df9c8bb929c02a9a54563bd6c53ec5dd87edfdeaece0bb5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eu/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eu/firefox-60.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bce4a19bab38960aa3b96a74c41bac79f449e12adcdf5ffc97843d0e85555bf49d3e3d4d691a4fb2615a359eb1edc23762c08830b9817c43993e6832da1e071c"; + sha512 = "afc9e8e0fed835420c385f0c19e81d1711a8c99a7b02f1a8e09218ac2a30aac6380ed88040e96a36edd39a057b98581cdc3a043d6222aaf30bab92ca81669729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fa/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fa/firefox-60.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4d1fb11d8f7c4f31bc4a8649d8c68ee8d89ae9f56693f58d48c46c312efa41d716d894a3756f174ba7a4c417b2388cb254e941354287eb60ea9397584e271f2d"; + sha512 = "6e8821bc7678a1d486693b2043031064618ff06309cd5b0dcaad0c9b712a312e43cb948bfa0e5e5af1eb54ac8e258bb6a5464b1369c9759ac72803709f5d86b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ff/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ff/firefox-60.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8b63609ed0b80386aa82e40bdd61eea53db70dc451e5ccf83290bcbfd2a88be781918b44d95a91fca8d75abc14699030281880d6826b9313ba3a61f371f0c132"; + sha512 = "ecf9565c6d6e8442836dfb50f1ad833cf88ea9eab884dd3d2fe6f1296d6230658093f27e30e953a51c2bd6ba5d69823f1f4e3f5457cc40a4e516b14baa17d884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fi/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fi/firefox-60.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2ab60636f442da71b01bd293e5ec68b0fc99cb98b7de707a27f725661bddc954c2ed9296b5862afec24d9a3dab0d1da6c2beab7ddf505c0951aacbf42c697033"; + sha512 = "ca10ece92ea7114a4c91bdebadbab97933232f8610719b5130e2658600b9ff7667834708a992500f31628249bca5c585f08fbced1e98ff31e318a20b68d3e27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fr/firefox-60.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "422916b8a03cf8e7271ca629ded5b8fa5990cbcf63495c196782e3a8e219156d66adfad2c3ccf450e9b7a357ef8d8cf99dd1c341a63379a20adf083a0ec5b736"; + sha512 = "2458452a4c239cdc36e744e4116791a310f2a300b913b61dee64e20349dbce8c0290e544027f0b9eca6d50dcc57561e63f4c618ef5ece9cc05815337ce639498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fy-NL/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fy-NL/firefox-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9da3085dd1c6e8a23a51545c8971d90e82c98d000f4eae3053b0edbd217879eafd9218edadb4776f592613b1f6641ab76dea3c63e30886a8fe727f282847c1a6"; + sha512 = "51cf096cd74d98bb081f9d397ff7eebc4624bfc4b90de8000bdf07dd739a441543d631dc783af1bb8aa3c639492aa1e402541ea979fd7837535874d8a4adb771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ga-IE/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ga-IE/firefox-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "471456518971454c4f85d005bea9afa64998173ec2ba164ecafb833899e597fbe67217782f4e61d4edc102bad53c04f3aa652862ebbb88669351df8ae2500cd4"; + sha512 = "680c47e14f7c6a1abd94ac73bba738a44c0bab8745176639283efea617974c40efecf5b43538940c43599bcdb21ff6c4cb380c3c53c0c9915fc542cc647240d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gd/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gd/firefox-60.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f086dc7c12948ab1d052f9de433e6121a43281d514d16d85163afed61eb8ab9f059e9e7e1f671d4207d5449087c9cc1432ced11322b95383e1bdfa8c9d48032d"; + sha512 = "3702012b6a32bb9878747d85a0a66c69ee68fe2eac25be428b9e07081a90c867cafd70d2cae32b48229fb333c3f3dddc339f43212aaca29508db33f5807ee6a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gl/firefox-60.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b5d5b475015d8c3b76310e6baa19da872ce6b5ee5d4a69b4acd229536527e5718f8a6669323b968fdb1dcc6ee998be62798bf914310b91896845e953a0c2c72a"; + sha512 = "bbc4986b7d03bd11041e969ef8341023a95e2f4a524c6cbd2290555ced2669edaf89971bd58b30b8193dd880a068d9bc8b2c0a3b16310a678b19e3f5e60c3c65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gn/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gn/firefox-60.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6bab886661997a8edbb71c86d938f3a798298c1000c4ccd0495a543f9104735d1f462e809bcd11a81750cf2743c19e476d352ac5fe99da47055c27dc35101084"; + sha512 = "a27c80bd7041fc80939716b55c631796e2421a5bdd05843d411d6f0dda84a636fbd366cffa214fba133635332318af2d2e67f5e03c719b12368437dcb4341142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gu-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gu-IN/firefox-60.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7dfeaadc772bef003700fcff66d2ffa4466aa443e1a822ed1b638f9d929d5479abdfa86de33b880eb0d89ec7f7e33474ba6644b5fb68c6708a7bd2df208c4204"; + sha512 = "14edc663057b200f32f9a4437c0141d079fa5b77eeeee357d3a09342299643aa0ee5146c6dc2fe0a178285d39f530c58c456f8bf6533e7f901cba551ad84f1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/he/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/he/firefox-60.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b88a00c1aa346d1a1e1948a0ffffb79d86576c6b6c70419cfa06fd1687c4f5c124804f807e3d5db66cb9c49d168a80188c8e622dda5e6ce172d286ecfaffc3e1"; + sha512 = "ce57395416083abb353c45050b6f6fcc8c7b9affe81d6e8504b8c6264b806ce33a44bc018918df92cfcdef047d31c67640074c63447a76c65f5928fbf6b0f50a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hi-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hi-IN/firefox-60.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5344123a20046864605e26c388a79257d9a7b08c0ce981b7f47678d9894b710c0e765f14afa50d6ef80c89bac0ef1990a1cf51e225ad2a885be344027d583e0d"; + sha512 = "a3621b49b47f835381df92712044a1d9d4655bb0d4a8502841761a60c8d00f0fd0288b8a6574aa2baba88ab8cfbe714c866bbb493aaa1bb382f75ca069f1a97f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hr/firefox-60.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "674a80317eb215d405a937df50e4c417feaf54795266dfba5bd4049d60764ed4d2750d390ac08e9d11762d34c80bf84d7e8b6cc58c9232f6e75268ea04316eae"; + sha512 = "49cb57fc321b67e1b5c9e516b72d36025d22abfdc49bda180cca0194cdc0465be5c0e7edd9b98714eb3b1a7c0a1946bd28d8b9ae59e2ac4e9f45d48916cbfeb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hsb/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hsb/firefox-60.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8c18833f2d0896d39e4be8b226f8ceda350e1c35bffda11cf0f752bf71fd130f2272345dfbf4b4d766a749b2d11624d41f77e6fcbad4c11849878a4bd0a154a2"; + sha512 = "c8488108906636a4a93447ca28176013e161c56e86d16b535cd73bd27dc568ce22fccff1d26a520a76578c31d870637afcf04ae9e104fc6b347701d4021eb98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hu/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hu/firefox-60.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "99c44f9307ed391bdc75a59291ca1e6b9c6e8c0dddf29c137dd93b62d3a9f3d19f23f2fd371f56257aa9dfaeebd150b29aec9141e8741f9edca4be0356541414"; + sha512 = "69bc30e00e39f2c3ae4da333fbd48a595dcc84f7e9e2cc0691e04658ab02e48d2ac6a1e9194faba7a0c28df3637ff9d213708812436200213721136775243d91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hy-AM/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hy-AM/firefox-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "891abdd7a6a671c55568736d7b25ff5c4ea37c59d7ca4fc64e2ae2f3752138ec17b91f375de636e09683fa30a252d5ff8adf7ed6f9ef08c860c54e263896d288"; + sha512 = "155c1a34a252cb1789c85ce4d757f483cc51b62d1f8bbe6179adfe5642a9693f1d202240a1765c5966602c03f95dba5c8ae58cd9a0c98edd65da101e61593cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ia/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ia/firefox-60.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "9f6609688c613fad6f00c3196122183d1480ac5a80b383e47cb1d1ffe8670d4bfbd9cb492cf0beeebcb9759f78283d6ee9b740e2d9bc2289bd72768b63603c57"; + sha512 = "7e603f5d72c0b060404d6639858051951a4aef9d61f3e1e813e8c0167896e15a4b837d6f0eae5da8b26acd8b5899c7a557e5e259a797b096a6e6d8eca2cc7177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/id/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/id/firefox-60.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "99dcc0f7d52dca3b172d138ea0ff2ff597c4c6c31f185cd2621acf3a1fa100c81e264993805bf74604857ed945e22b9b90c51fd19958f675f73a00a46fabb646"; + sha512 = "82179d401af39f949057153062190214bf294445964a6d1c63102da1a7f94ce3327351e6257e82bd66c4586791a73c11e2394207514cab6b8ac76fc7f4a2f147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/is/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/is/firefox-60.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "42c108d4ec83aafe6f27ca45ac5f32172e1481291a7b105dde8f565b8ca600307478deea0f59ad153398a78c0fb228c211d6907ad0a7a8a950dbf717cc8f89e2"; + sha512 = "20237dc74245241a289a4a51964d19ec0ae60732c2a528de412d5ae70aebc1b58c4d4ad514109c01bfb1bbd83d4be22bfcf18b89361eeff0e9024bd07acfec35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/it/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/it/firefox-60.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e68944d88a96a4405de772c6b5e7fbaa518474e6594fb358884eb5473c8a9c9662dc67c5619d492721cf047af5244d2af8eeef7de7fb8ffc37333f2c0f362933"; + sha512 = "d15b7b6a4e56676a45d2a0c55612de6b57a5d90558bd826d3c9047db831551893cc288771826b95a0ceb587b9bd82e5b30c914f9dc7070bb09a93073222e2bea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ja/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ja/firefox-60.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "dff549f43bc4185a7f5baa9ee0655c1a752f114c8abf51e086eb340afcc628822899775284b37ab1704c2e0435b87fc7c9ece70d878db811be2c7aac9c7e1b59"; + sha512 = "e47706e58a216f0f468bd6972d0373c3795a33318f811064b1c7dbf78a955bc65a62f8f27d66c656b002a4301043485abeaef8c5ef28622e65bc355cb1fa05db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ka/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ka/firefox-60.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d9291224b245006c5c2922b8bbb52411ba1852aa6ecc95969e623d68d5bae7e6c2d84ecb5d4723a3b6d0c3a48aea5bfb173f6192c4d150e0b75f7ca748883cf9"; + sha512 = "84c141262f4c2a7ece6ae6effb47ac2ce277da9db4bf1683dfc62e78dea5a0daac52647279da7ef19e439c8622678e235fc90763a0e19dcbf156aa0e2b30d8d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kab/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kab/firefox-60.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6e27a03b7ad1d84b1ffa383be8df8036d431f1e2a7c861a21064b553e71cf71b846c65021ae7dc49921057c7eb526c3790601de39cdd243a427929a69506b38f"; + sha512 = "d5ca56b0d58f9acf8577cc1a69f1e0213a2d9e6c6ad70f6ef2b234d6ca87ae4b37489f69f7d8003a71a7992c6443700c8aa2739c58bafb34d3f99ecbe2b9aca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kk/firefox-60.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d270d5f0519b88469d01d953e01e426a7c91516e7336c1e21de82fe5b09193e41d2bd56ca06f24c843ff96ef4dc560a405bf9b1f4de66c201fc051d0e1299f31"; + sha512 = "8b892727929298025c9f7c212da27c6941afbea15a07b5212bae363b358c05ca5373a1fcaf487e2f4f2aa5a491ac0a244e74240b22d80125140ea563432bb7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/km/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/km/firefox-60.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "22822889c2406adfc717eea2ca4fabe005e055be1c6eec66b0e777c9ab11beacbb9abb3d7824e84225fb58da6214094e005946b3f3c78caee4cd76cd4e42bf93"; + sha512 = "11326282020f7b673b78490452fd47bfd932c99ed523b87ef4d99b55a189069665d1e8cb7d39d0f45a673e1e36e0bb689b9454c9047c1f701dc1c9b18055f043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kn/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kn/firefox-60.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ca9ef014bc339feb1c1732286762bca9b869cf38cdea3794124175d26bc1759e4f2f6dbc0167badecf3481eefdf76355d972d7c90c4890c1b3ca0268260267b2"; + sha512 = "842005f68c58fbfc6c831a7515e0ad5078697e6eabf40294fb1c0b8bf45497549f0636b6a9d53973f64d0d522d601cc0d872ce6f515c4a488c2aaa563b70da60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ko/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ko/firefox-60.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "769b06aea04de7fc084e38e33a73b008420540c7f6ffa24f126fee65eff5f22d21784332932f9814faef1839605e6ebd29afd468debaf6800e523a63b92edb7f"; + sha512 = "aa8bf2c373fe549a59f3412e3b155164c3f4953257f7adb6535c3e4cec494e1191f25dfff9475fa610cd3ab765c10c4a303c895c78b35720483677a87613923a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lij/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lij/firefox-60.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c9ddef72418c957fcb413fc19accc83987aea01321b0417af027257bf6884f419ab90d936ab2005595617bbe042542101cd09152eed23eb0f4dea49bcb285e2b"; + sha512 = "fbcfad4fae4dcd132ccbc2fdbf7cb6f0deb49357c987c52edcf87b25d55684732b5e6a834d0263996620c2b4149e06b5e82a097807d8673a8b7df6c0cb9a0561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lt/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lt/firefox-60.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "870563459a55d7b40718643d0c348518a10bcc48765b48899ba185d65d303249d58a365bd4d8662c7788279567a98dac4826e1e12c77e7ffd7eb927c2e76e222"; + sha512 = "f388751a01ed0214c284ec1ef1045a7c66c7a201901ad48370d7fa3c0e06e2b66c3ecc42357c781b58f6308efcf74e6b0c3902a8db46b11d0b39435294eb5e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lv/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lv/firefox-60.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c8db9d0ebab798fdec91855cb3bd762a391576cc6c6391395faf074bfc1e8b2c82953af34206fbfecb2ca10703d8a5af0837528af07de365da19c45eed371c6f"; + sha512 = "f932a06b7667762f41c410e394b4ec5cd91116cf82a774899b48045143c6fe88840ba472d91c71f7088f420563857b185c99cbaee884acb2ad760ce7f83abcc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mai/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mai/firefox-60.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "4e5dfd66e44e6ba839bf59e68122fd3207f0082029746795aeee6ae8545d3ff6dbdf4f6b15984f4fb0ecadcdf78ad0f4afddebdfd240c5f75f10b4854986f983"; + sha512 = "34da4ab327eba8076fd9944ad1c86b6e0e300df870b5a7ce906c7666df8c8ba7c76c792da7d8776150710bf2e8098a0ee9de86c273b19f6fdeadb5978258357a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mk/firefox-60.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "95fbf34fe70e3ca3927ad587c02ccfe5e6d5494ab53af0c9d3578ab8ccbef8bc3766779a1e7fe1a275dbccbc855beac9585abe4dc45c04d43d830a98eb5aab34"; + sha512 = "8b92fd90754604535c641286e465b720400505e86d778d554364ba6e3fea9db038607bc0638e426123760de59a4a920d21fc4522d8e3e155f47d834ef7db4cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ml/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ml/firefox-60.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "49b3270031a43cb304121b3f889a3d101828e60d733fddc4184be437236c829c8a82bb60fa509c66625268505756a799e3001d8c673f5f405bbfc5d9bde6f119"; + sha512 = "4ce610e4b8979027e12dc07cca350f467d9f48c9c8cff1f52d08452616cab30dc8c49ce967ee49afca1c4905121d93ec00be9892b7b613736f1daced144f4347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mr/firefox-60.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "83a010f59bd6c17f9aaaafab14786b8ab11ad4298e91cf101c7e2b1566beb9499990de1cebe7c721ba107f79e7e719dc9aca26bfedba230a97355689e71014ee"; + sha512 = "1c1092ee47d62addc304dc81ddef6fa2987afd778ed8deb2796c862496bba584812a9acad11deb045c050fe80aec523de3b007488bbd23fc039767254b8f5918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ms/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ms/firefox-60.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0148a5ce8c124b40b7501d2f6e6102e182adbac4226c5783826278b65a2076dcbdde535819fe57076febb142efc13bd8632458fdfd54b3a7d7012228a1933063"; + sha512 = "d0e4257f953e907c2ebdeafb7c60e3407906f908a9724ce6674842a2c87692963d0d932ba16e92ab0506cb91461ad07712178914f38feeb0662cde7b0fe035c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/my/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/my/firefox-60.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "5e988af0d46c5a1efe8b113194537ba711151c693810e761fe77e3cbae15994527459346abce3846825fa49eee0443149d2b4f2cdca33d33bc7791c52648b26c"; + sha512 = "d77bce209f0b333abf132f9d8220b5d808e7aa45930f509278b9666c4f0bf03d09cd9a38752af7924a66f3c1171260a92ffee2ed550c75c304065e413d9d25ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nb-NO/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nb-NO/firefox-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0dc5f04d92341f2fc3fa47f3836234edbbf1c3aa4785470f323eafb27f7cd9c5ced5301f3dbdbcf40f35bc12037b12d9c12e86b19f687372e8793c762ce1f2cd"; + sha512 = "a1d86b6859599df2680e68e166e411590eda852923117051e28c14832c061a975dd535b11439639e44b1ea85bc4b409aada94e01bbda8847d4ca5239268306f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ne-NP/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ne-NP/firefox-60.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6f4e88a48c2514f9ab2ded5e5e08842003a282c5dfebcab23183c1271d57ec765a41163ae217ddb2fe2cac7860e189dabaf5822725dd505c8f27673165e22603"; + sha512 = "5cd668f8c4295bffd14d769557f0be86b643ade50990497d72f15f5da15e1b4e82cb9b671045f445e87987f13fc97d05d04970d9fb559db1edc0122bf08871e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nl/firefox-60.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "23ea428a562d7c9cc17199294be927c15394a098d881208c05a558450f5df9d85dd65f934b2cce967d43004797d6f7f6838340ebac726308f6e12a4d9187f3b4"; + sha512 = "a0aac7fda38ac8f85ba341a11b1e90bb21dd5827e5201c782adc854a5b159a5555eaacc8df78bd6ccfe6945fa4502711b655688e61bf1d24748872da7830f522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nn-NO/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nn-NO/firefox-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "75bbcaa6b84da1f1aa0963e588207e256b09a68dd56590811333834e2cceeb3c24eec4deacc2d049d051005149a70aaedacd5af02ede684aa9d72aa1777f0a58"; + sha512 = "e40c0bab77e5437c77a2db272444d0fe6874b9e153f84033f0bbc21a3d987562d77b5e37da82accc1e996682b8cdfc8eb67c104134191414e6a86f755130aac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/or/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/oc/firefox-60.0.tar.bz2"; + locale = "oc"; + arch = "linux-i686"; + sha512 = "86a2193d5d442dad54fa55d83f0788d3e30b278370ef6b5836ad06e36307b599155ce2bef6760e6c73c56f4badfb1ad63073d3348395c598e13be73b2fef762d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/or/firefox-60.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c856da11eea56f3dff269c49a70c7c3eb760b18cac6491c6ebd365dbd5f9353b51e6264c44d0cc798e4d6deab68c9928f84ba2ea2205c77251586060aa794940"; + sha512 = "b10a8f799764a2933d6a3843848028bbd8f6cc7fbe2566550426c2f066699158f654bb6913e57585fd695bd775efa29c054c5b7992efd1110d3e7135723ce206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pa-IN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pa-IN/firefox-60.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c6982d378aca49e32f968be08c3d9fc6cf1fe706543bb0f6356b4107b90be1e233880bd71a32abb36a57e47d76a62b8dc241d72a0613416b755b2746fae6710e"; + sha512 = "5b0e9b50dd17472919cbcbc04dd8edcdde706d08421723e7afeb978fb31422e49751a4377a414b330ee81a6ad0e6ecb508db28d9a6a9fddd6e915819c1895fe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pl/firefox-60.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a263ae839be17284c8ce8bceb94fdc04d29d61fec480d936e5f3b0d67581b2fac65c3712013ed7611f61f7a054e0fff9d3cd3b97be824671a73277ec74ac3c1a"; + sha512 = "49f9ff7f27dd04ff0c05b82b82d9f3864b3fa10cc27fe86099773e4984f6ae8d6ab8be964d345801a4bbf84b5fd28e794eb850d67f5e82d8a1a693ad77e8f396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-BR/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-BR/firefox-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "00cc236a6ff2e3cf20b4f9d00418104ff7a5e0d86b21166958714f388b356022c20907ecb1f40cde695a70a088e5cddee955ee4754c9ccbb99be86d5b07ea067"; + sha512 = "e4e6a6b5017297faff42ea399519c414530b2a281a9e8d20858c10b464e06d989f145b78b955e653fa5f11895a2b375d549bf8bad01b10fb4b8c88e7b5aab2e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-PT/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-PT/firefox-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "daaa2c6de1c534ebb04904a9e987dd190883b37254ef8b41c6d3c9c29f53f44006c8d6e6fd8ec4c722143d4d666a234ca892d8820b9b382252586f079a9aa75f"; + sha512 = "6acb042f4e22f67afb66a2a34f7c3865b77fa59dee2e163594f87c0aff0e409d3f252ffdb1986a4f7d776ece974ccb8701c90e72ee4782ea774298f801782271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/rm/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/rm/firefox-60.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ada38c5aecb0003a0d6a814ccf60043fb9caed23f143192b4ea739c004c73c6a20c8326fcc6fb7a63073c74ffca2dcf6fad2d87a1b1445b220e074781d085e5"; + sha512 = "822ca52c4be4a5ac19fd1c0436603d587816b3771f39ba1c6bb9e2e047b8e5fce8d8b4ae5109a07c79cbe35ece397cbd9644a45b4a8dd3d79d0e5162bdc6f68d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ro/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ro/firefox-60.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ddb9cbad7cd1d16da0552f7922433a73186e17f0f1181e415a522f1d68daa0b564c226c5b8a0a2883cf627bf23f53db7db8c4373beb366df518af457d4da20fa"; + sha512 = "0c85d51248e95ba3a6a871b99e97dad557af06686949616990aca8ff939fdc1e4fa3414f91c03f7c9f6b8b1a90d13d8b080bc1a04af40daf57b01681efb8ff46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ru/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ru/firefox-60.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e113811aafcf713e12d225097442e4f1df2bd79f24fde84b543d3c4e3aeac2abde4c19aa98708577391c4b016c32af5a188c200954e0750dca1a4f13412da3f1"; + sha512 = "cf2b8f766237534342c31f6227e653fbe171222caeb4ba8a234dd23389ac5fd4e1ff7a75cb9fa66d25a3022e73c148cce9872f976cc9e0f8b275c828cb30fd5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/si/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/si/firefox-60.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "faa98d902ff56f2d3978337f69cc146de506f8eea86f671057ad6b9b72e00a1de9ee90e5d7945826aedfcd996fa8d5476c11fb0aaa77ee9a7fe49b5e1e9b4b70"; + sha512 = "4b480cec371499a48f01455a908b1acc90525b8f92a7cc0e0a4dbb7f81daac6ee60b96ef2c8439dd3e8b38d721317b07928afd59ac329ec80575e10d16579f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sk/firefox-60.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "aee696579b46e4f0db7eef3d78a8d12d3bf7f1910049b7dec9de7f1598005ea7c9c2b1e5cc12a6258595b7c4ecc5be8cdce03e2566c539eeb0be0a545ab792b5"; + sha512 = "415a8231ef4303fabe66b9e4f3e34ec8fbabd1d56feb5a2f7e9c63dd30907786255992f56ce340609fdfccec6eb88583c00473fdc52245456aa16078cfe6a834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sl/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sl/firefox-60.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7fd3522a56107f054fd852ff3ce5100276a63d423c8481ef0f90dbd87edcf4bbd71424c25fd78535a3cffb1bb273c9e61f7b332923409f0838b81d31bebbaf7a"; + sha512 = "e3f4374669d2ef1cb029695ac2945147f7a47d6b97a711f99a0e622aa6919dc30505f19879018f6df4c1f3086937c5317ad85945770ff3cfd7d86e89bbd22886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/son/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/son/firefox-60.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "302d73075dfe7e12f06bc58cbeb7aa6985c9c6c82850d70cccc0854797a78ef4759136d1a9254d0d1407dc8ef39fac5501f14c2cff24ca3cd1db14ea337ae3e9"; + sha512 = "0ca8209e1ca51d4529b6dc20b7c7d15f8e5307a4b4b292a6c6eaabf4919d91c35a6d35694031eac5889ea17ef691f34683210de3590c9bc768bcc5f444b6a0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sq/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sq/firefox-60.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "21f943834dc04a35f3e3f097e31614b18040ebb7decee4d3bd54916c79b5d16840d0265e7d20aa1d0a508f3d2bca38ee28046f017629c85ba49d98c2b8a543e8"; + sha512 = "27613a71060a22665d6332b2f8e5e3c91c98a8cd3207b94a67ebfd08b8604c7bad834e4cc2bfab10f9f0897696925e19addee42eb45eaca9b358fe15136c09a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sr/firefox-60.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "48af03fb3cd68774535bb873cd452f3ee907b96cd5aa4fa662079eab069ebc57eaecaa17726337190d1e528e927aed48fb5a58de97158898de87b318012aea24"; + sha512 = "6234e96196069614a25ddf751f820f5787e77f75d0adf91c9a479749471c75cef114d4a3816b4d63227344c4ae9915756c81e862aca3282d467f86fd42faee99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sv-SE/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sv-SE/firefox-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "33a1becac255b82ec3d20d37ee4ec97975df55cbe2f3760a802021ac571b5f88a25ca591378fae990870fc03c552067f136209245a878c86d0c386245d6042f2"; + sha512 = "3b5f8c85ffd4037aea0f8de95c77ac29f227e6ea02cbd8fdebbfc50ef6a03c6b7d31f695c7e0eb54dbd4d1d5471edf0c4793bf39e78b846c287f35ffc5a01aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ta/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ta/firefox-60.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a924970ef03b4f719bec64c507fe4e4c9ee8d18188c0a5a11785798ac28bb69397403a34b5e20f1d4e0affdb82037190dcb77042f5c5b62af79bb332022aaafb"; + sha512 = "e965954447ea2b47b949b74c06857c75b31edf724987559fc13ec25c4eb2766811da9929f0430297d4c7354ffe8bc9ee2b8ef7274bc47d1a07af3ed3f0ceaf61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/te/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/te/firefox-60.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0fbd8b103da9080c56b94d319b1e60b16a8b525c3c4071e12f390b52f870aa17db0d153c099fc77f1b70fde0302431b94549abbf713c7255a8b01c0c9c247341"; + sha512 = "05b795c817f46fdbb1b15055203f4622fc231d5344993d96db81c98466724b72e99f8293cab8d560e9c297f7b4197e3cc0449e037096455c480020817aa24a0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/th/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/th/firefox-60.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6079f0e2bdaa67bcef0f850df24dca79473bbdc2ba0668b59c5d8fcc23627c4156ebadff4ea01744c50a50571d5fc65ee7c680ba48f67997817dbb729170cabf"; + sha512 = "6e10c20163819045bafd07216f7d29ef4d737bf60c9f38e4981871fda4c19112b19aa628ede00f45b71c7b549b2611c2cf74044a1d153fb9fab9b9014184bf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/tr/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/tr/firefox-60.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "86c02b0bfb19f7461b9a2d31ba7a0f4473f52ec09350b9898f0c5c42eedb74c67e5fe3fdedec53bf9fa57497a970d286de6c1cfc141d0b0cb5deeee1df9ebdf8"; + sha512 = "1ed74dc5b302c70c9d980f6c19dcda00b399879034f6d49368b0a859434d5ba3097360e15de8d47b136dccd3567d60dbef1f0ac20cdcea3ca8757b2dc189a19c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uk/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uk/firefox-60.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "63afd6b42202ac16c7c638af84b10f1f655d8144af44c79e29894a123dff2eb1f445550a82e8aeba558cf759f2aa68752461301128c3adb9d7c18f39d9f45de8"; + sha512 = "be15de40cc87999b145178e5009e144aa1a68d6c7c422dd3f7c1669bdf8c200787ffe650670d29b2ab8230dd25a3ece9bdf9dc5b93331da96df6f28bb2388b1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ur/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ur/firefox-60.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "02e1341a4ac5e2e2fcf2cbfe1dcb10f82ba726d437e5de9d132eb58f5a68ce9e13d646ad004d5638f356a717f23d4a38f25171eb4c773da953042729fda19bbe"; + sha512 = "c4d853ce32374513df113fc95e28c26c2dfdd4e7d2f4771cd23fbad78f29068cd003fd2aad657ea582a5229ee217d3c05c2acc0ee248c10b1630c0bd8b521625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uz/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uz/firefox-60.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "fd346ea8650222cac69531b28c70bbd0a069e24ef0383d169fe05dc966e5d8e523e87d33b1ce4b696b33e6182f5373e762fd40ceaaf1bbe7313c67f3905003c5"; + sha512 = "9912cef59e3f2457126a6623f0e3913248335b29d5c5412b6ddd451aa32e455cf3d4a752f975c6b06a9a4dcbb2511cff6cb918b0bf3564c8e8c37a06f79e862d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/vi/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/vi/firefox-60.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "af4d11f8eeeb07457810e73f25d04d59131ada91c0142af486a8726c5abce26b2e16a51b539c5c47b2c2c220dd9cfbc6c95a81f114b382192528c50e431ee211"; + sha512 = "5ae557d429613cc9bb3fb4220d3242fad8b7b5a625b01bbe662283b78153b9d96f4d27907e63488500a766606196d8292b61614d007c6c5a4391dc8f88332e5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/xh/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xh/firefox-60.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "06084e0b1c2e18cae797519ef3ea12e8af851c9d33c385e55418cd2cbe733d64e350958d0125664dba7317dc5579409a5dd33722bb1f504cc0406cf3dbc05806"; + sha512 = "4fac1b8bce8770812566dd05460d7d580f2fca9b4b006c5aefe50ecb8e24d104f725c0fe952e59492d438e5c98e683bf4b55df12a18748eb3daffa59aa4de35e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-CN/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-CN/firefox-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5b63ec90f6ba20001c3696081ca2048c6ad9b2a0f061aded8c5a7b2b25a906f95c0c3ea297b5b51db346d1af96819cdffefc3c3a0632308ec5a27a7ea1a5bdde"; + sha512 = "0f1adcc43685a0da2e855ad8b679270be7131343f92c4f3f19048049696ce75b03e5a8b508a0d025b1348a66f18e65ccbb7def6382d3bb51152d7b9389f53656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-TW/firefox-59.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-TW/firefox-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "164af70d9ec69685dd0bc909436a4c7dbb126716b28f0f4fc92e75777431e8a037833778ca8a9a5e35d883d940873b899ac2edfdca50be2c1167c320fb4dec65"; + sha512 = "9a53a37523125ae165f2fd71957f748841302918812b0dea1b1b088eb56906524ddb0a3dc27bbfe7e0b9e7adec2823d5656561eed662c9239473fa21feaf8184"; } ]; } From 38bf731db45c5736b3de387ec3a2b109f01573c3 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 May 2018 09:09:36 +0900 Subject: [PATCH 275/369] firefox: 59.0.3 -> 60.0 --- .../networking/browsers/firefox/no-buildconfig.patch | 6 +++--- .../networking/browsers/firefox/packages.nix | 11 +++++------ .../networking/browsers/firefox/update.nix | 6 +----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch index 83f9a1329bea..de278152f978 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch @@ -1,7 +1,7 @@ diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp --- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 +++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -40,10 +40,6 @@ +@@ -36,10 +36,6 @@ nsIAboutModule::ALLOW_SCRIPT }, { @@ -20,6 +20,6 @@ diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolk content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html + content/global/buildconfig.css content/global/contentAreaUtils.js - #ifndef MOZ_FENNEC - content/global/customizeToolbar.css + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4c17f2c98069..09572ecba7fe 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,5 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchzip -, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: let @@ -19,10 +18,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "59.0.3"; - src = fetchzip { - url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2"; - sha512 = "0wcvs0lzdddbrxp8prg1w1g4xq9xqzvqlgs9r22zjblfnp703nw82zr09ys7jd63mr77g3rgglhi3d5k42aqrbmsx1r5dn5qqf5jlkz"; + version = "60.0"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 997bccbe9a95..8cc03cf8212a 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -28,9 +28,5 @@ writeScript "update-${attrPath}" '' sort --version-sort | \ tail -n 1` - source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'` - - shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1` - - update-source-version ${attrPath} "$version" "$shasum" "$source_url" + update-source-version ${attrPath} "$version" '' From 873af991ef77952b475a8e7d5cb9111c0a69563a Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 May 2018 09:10:15 +0900 Subject: [PATCH 276/369] firefox-esr: 52.7.4esr -> 52.8.0esr, 60.0esr --- .../networking/browsers/firefox/packages.nix | 27 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 7 +++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 09572ecba7fe..33bdb62929e6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -39,12 +39,12 @@ rec { }; } {}; - firefox-esr = common rec { + firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.7.4esr"; + version = "52.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "971ac97a749e5d322fec95ca1e86af5b633deab37d2d8fb49ab129c7ba20753a802c620315bc5b92a0a7ab7afe00e71aca04b3238670c4732d8e6816c645f53a"; + sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1"; }; patches = nixpkgsPatches; @@ -58,6 +58,27 @@ rec { }; } {}; + firefox-esr-60 = common rec { + pname = "firefox-esr"; + version = "60.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "20whvk4spdi4yb3alb492c1jca60p4p70mgj2bypa7r8fgjqn57pyh9rcvnci61asar0zvmlihq46ywzrijm1804iw8c4wmlv7qy8dv"; + }; + + patches = nixpkgsPatches ++ [ + ./no-buildconfig.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-unwrapped"; + versionSuffix = "esr"; + }; + } {}; + } // (let commonAttrs = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a356be18a8..f51ac0aa3557 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15737,11 +15737,14 @@ with pkgs; }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-unwrapped = firefoxPackages.firefox-esr; + firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; + firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; tor-browser-unwrapped = firefoxPackages.tor-browser; firefox = wrapFirefox firefox-unwrapped { }; - firefox-esr = wrapFirefox firefox-esr-unwrapped { }; + firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; + firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; + firefox-esr = firefox-esr-52; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From c0e48427c68c7e4128f3da2f8cf49ff32bc379b2 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 12 May 2018 12:19:20 +0900 Subject: [PATCH 277/369] firefox-esr: make 60.x as the default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f51ac0aa3557..0d337c92efd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15744,7 +15744,7 @@ with pkgs; firefox = wrapFirefox firefox-unwrapped { }; firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; - firefox-esr = firefox-esr-52; + firefox-esr = firefox-esr-60; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From 4320c1151d985dd2ed0fdf6d4cdb4ead91503144 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 12 May 2018 11:43:19 +0200 Subject: [PATCH 278/369] nss: removed aarch64 patch With the update to 3.36 the patch introduced with e96473b is no longer required. --- pkgs/development/libraries/nss/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 840b349035b1..29d6e9a5670a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,13 +1,6 @@ { stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: let - - # Fix aarch64 build, shouldn't be needed after 3.35 - aarch64Patch = fetchurl { - url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b; - sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq"; - }; - nssPEM = fetchurl { url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; @@ -29,8 +22,6 @@ in stdenv.mkDerivation rec { prePatch = '' xz -d < ${nssPEM} | patch -p1 - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - (cd nss && patch -p1 < ${aarch64Patch}) ''; patches = From 2cedd441750b205b832eb2b78d3c2d880784f592 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 11 May 2018 01:27:57 -0700 Subject: [PATCH 279/369] poppler_utils: 0.63.0 -> 0.64.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poppler-utils/versions. These checks were done: - built on NixOS - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate --help’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite -h’ got 0 exit code - ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite --help’ got 0 exit code - found 0.64.0 with grep in /nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0 - directory tree listing: https://gist.github.com/117a95ee3c53e7aa2ec1e2404a22f621 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 11dd8ec32910..a96de20ccfeb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.63.0"; + version = "0.64.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; + sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj"; }; outputs = [ "out" "dev" ]; From 0c556f6f60a50a49577800146acf6ced5553f3a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 11 May 2018 01:21:04 -0700 Subject: [PATCH 280/369] poppler_data: 0.4.8 -> 0.4.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poppler-data/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.4.9 with grep in /nix/store/vcpqkfixqx9gdd3mf07lqil5q7kivlfm-poppler-data-0.4.9 - directory tree listing: https://gist.github.com/582309ee358dd7c8e622f5b89fdf8f88 --- pkgs/data/misc/poppler-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 5c8e0970518b..d7a5ce33bd26 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.8"; + name = "poppler-data-0.4.9"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh"; + sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; }; nativeBuildInputs = [ cmake ninja ]; From 926dc3881eb4e69dab6000c4bff473c658608a7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 May 2018 23:31:50 -0700 Subject: [PATCH 281/369] gnome3.webkitgtk: 2.20.1 -> 2.20.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/webkitgtk/versions. These checks were done: - built on NixOS - ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver -h’ got 0 exit code - ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver --help’ got 0 exit code - found 2.20.2 with grep in /nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2 - directory tree listing: https://gist.github.com/e3496e2d8a6b933a107141f5caecb92d --- pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 3cc26b512c89..8b25a20d8eb9 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.1"; + version = "2.20.2"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23"; + sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz"; }; patches = optionals stdenv.isDarwin [ From 280fba591d8839919110081839b542133a5dbf9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 May 2018 05:08:55 -0700 Subject: [PATCH 282/369] wayland-protocols: 1.13 -> 1.14 (#40312) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.14 with grep in /nix/store/ibl7b0wvz8l75vrp86mbm80ds7xzcwkb-wayland-protocols-1.14 - directory tree listing: https://gist.github.com/f3bc0989bebcd51aafb53ff19f920d69 --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index ed9866048191..c1065b20e6b4 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07"; + sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n"; }; nativeBuildInputs = [ pkgconfig ]; From 108cf05ff06618a5eed65267bcb68a140acc11dc Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 11 May 2018 17:04:52 +0200 Subject: [PATCH 283/369] poppler_min: pin to poppler_0_61 poppler_min is only used by texlive.bin, which doesn't build with poppler 0.64 and blocked the update poppler 0.63->0.64. Pin to poppler_0_61 (which we currently need for libreoffice) so we don't have to keep 0_63 as a third version. See discussion in #40327 and #40180 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a356be18a8..e03ec7f207af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11011,7 +11011,10 @@ with pkgs; introspectionSupport = true; }); - poppler_min = poppler.override { # TODO: maybe reduce even more + poppler_min = poppler_0_61.override { # TODO: maybe reduce even more + # this is currently only used by texlive.bin. + # pinned to 0.61 because texlive 2017 doesn't build w/poppler 0.64 + # TODO: review poppler version for texlive 2018 minimal = true; suffix = "min"; }; From 5829045fc55302480f6b637127caa1d4fa403695 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 12 May 2018 16:47:58 +0200 Subject: [PATCH 284/369] dbus-glib: diable tests Test fails in sandbox due to some path impurity but passes locally. Not worth fixing since dbus-glib is deprecated. --- pkgs/development/libraries/dbus-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 5d78e084e983..c8bc96f80fde 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--exec-prefix=$dev") ''; - doCheck = true; + doCheck = false; passthru = { inherit dbus glib; }; From d000198ab7f845406e055bdfd4d4ce4f76aca890 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 May 2018 10:02:30 -0500 Subject: [PATCH 285/369] darwin.architecture: correctly install headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’m not going to fix all of them but this is the best way to do this in Apple things. Just add ‘EXPORT_DSTDIR’ to the installFlags & set ‘DSTDIR’ to $(out). Please do this instead of the patching! --- .../apple-source-releases/architecture/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 8b3eb2017e27..4a155a4c403a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,17 +3,9 @@ appleDerivation { dontBuild = true; - postPatch = '' - substituteInPlace $sourceRoot/Makefile \ - --replace "/usr/include" "/include" \ - --replace "/usr/bin/" "" \ - --replace "/bin/" "" - ''; + installFlags = [ "EXPORT_DSTDIR=/include/architecture" ]; - installPhase = '' - export DSTROOT=$out - make install - ''; + DSTROOT = "$(out)"; meta = with stdenv.lib; { maintainers = with maintainers; [ copumpkin ]; From 326d0bf2aa86ccff1611f8350969b0213857174a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 May 2018 10:03:48 -0500 Subject: [PATCH 286/369] darwin.libSystem: cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want to rely on a certain output so just use ‘getDev’ so Nix will choose the right output for us. --- .../apple-source-releases/Libsystem/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 9759810ef686..152f3c5bae38 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -7,6 +7,13 @@ appleDerivation rec { outputs = [ "out" "dev" ]; + bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture + libclosure CarbonHeaders libdispatch + ncurses CommonCrypto copyfile + removefile libresolv Libnotify + libplatform mDNSResponder launchd + libutil libpthread ]; + installPhase = '' export NIX_ENFORCE_PURITY= @@ -17,9 +24,7 @@ appleDerivation rec { cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include - for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ - ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ - ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do + for dep in $bundledHeaders; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done From f14841f3ce734b27988a605fc9775a035d313d23 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 13 May 2018 00:01:52 +0200 Subject: [PATCH 287/369] Revert "darwin.libSystem: multiple outputs" Broke the stdenv. This reverts commit 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85. --- .../apple-source-releases/Libsystem/default.nix | 16 ++++++---------- pkgs/stdenv/darwin/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 152f3c5bae38..386480d62902 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -3,17 +3,10 @@ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: appleDerivation rec { + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ cpio ]; - outputs = [ "out" "dev" ]; - - bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture - libclosure CarbonHeaders libdispatch - ncurses CommonCrypto copyfile - removefile libresolv Libnotify - libplatform mDNSResponder launchd - libutil libpthread ]; - installPhase = '' export NIX_ENFORCE_PURITY= @@ -24,10 +17,13 @@ appleDerivation rec { cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include - for dep in $bundledHeaders; do + for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ + ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ + ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) done + (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o) cat < $out/include/TargetConditionals.h diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 98102cd56545..9563f52ea263 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -225,7 +225,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]); + (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); overrides = persistent; }; @@ -263,7 +263,7 @@ in rec { allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]); + (with pkgs.darwin; [ dyld ICU Libsystem locale ]); overrides = persistent; }; @@ -383,7 +383,7 @@ in rec { binutils.bintools darwin.binutils darwin.binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ - dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale + dyld Libsystem CF cctools ICU libiconv locale ]); overrides = self: super: From a4b7be9e847c8cd2c3394f20aed734918c03ba45 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 13 May 2018 13:00:24 +0000 Subject: [PATCH 288/369] perlPackages.DBFile: db -> db.lib fix regression after https://github.com/NixOS/nixpkgs/commit/4b0638394d9fb0c4ce505b1187cc4ff3c5f54a10 --- pkgs/development/perl-modules/DB_File/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 7dd04463d18f..b6158a61da5f 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -12,7 +12,7 @@ buildPerlPackage rec { cat > config.in < Date: Sun, 13 May 2018 20:12:02 +0000 Subject: [PATCH 289/369] perlPackages.GD: fix build on staging (#40449) --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 509cb405ff61..d9e11b54b7c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6461,6 +6461,9 @@ let self = _self // overrides; _self = with self; { # Patch has been sent upstream. patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; + # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; + # tests fail doCheck = false; From eebd455dc0bcc9f0d4fc8372811611ba3af18bcd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 6 May 2018 14:59:50 -0400 Subject: [PATCH 290/369] linux stdenv: Update gnu-config on all non-x86 Not just Aarch64. Other non-x86 platforms might be old enough, but I am about to update gnu-config to handle things better across the board. --- pkgs/stdenv/linux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9e19d199a5da..63b4c8ecc244 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -255,7 +255,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -297,7 +297,7 @@ in }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; }) # Construct the final stdenv. It uses the Glibc and GCC, and adds @@ -327,7 +327,7 @@ in extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; cc = prevStage.gcc; @@ -361,7 +361,7 @@ in binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] ++ lib.optional (localSystem.libc == "musl") libiconv - ++ lib.optionals localSystem.isAarch64 + ++ lib.optionals (!localSystem.isx86) [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: { From 29db8170036d3e6a04ad6d77c62ec1050e50f6fb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 6 May 2018 15:07:04 -0400 Subject: [PATCH 291/369] gnu-config: Update to support ARM and 4 quardruples I recently upstreamed - https://git.savannah.gnu.org/cgit/config.git/commit/?id=50a0413a5ba9684aa9247444c60a5cea47c4435d - https://git.savannah.gnu.org/cgit/config.git/commit/?id=09df750b994963a47f7c450f74b7e3f8567a6355 --- pkgs/development/libraries/gnu-config/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index b46523071c7c..a14d7486e96f 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: let - rev = "6a82322dd05cdc57b4cd9f7effdf1e2fd6f7482b"; + rev = "b75cdc942a6172f63b34faf642b8c797239f6776"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "1yj9yi94h7z4z6jzickddv64ksz1aq5kj0c7krgzjn8xf8p3avmh"; + sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; }; configSub = fetchurl { url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "1qsqdpla6icbzskkk7v3zxrpzlpqlc94ny9hyy5wh5lm5rwwfvb7"; + sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; }; in stdenv.mkDerivation rec { From f472dd7652c22a848670b419b9d8d45ee174dd48 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 26 Apr 2018 20:20:37 -0400 Subject: [PATCH 292/369] Revert "Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception"" And there's more reverts too. The previous commmit d838afbc9376bdadb8c690eb00b425f3eeccdf2d to gnu-config finally solves it! This reverts commit 3ed545ab31146e607c57649936c75869d6aa9ba2. --- pkgs/development/compilers/gcc/4.5/default.nix | 6 +----- pkgs/development/compilers/gcc/4.8/default.nix | 6 +----- pkgs/development/compilers/gcc/4.9/default.nix | 6 +----- pkgs/development/compilers/gcc/5/default.nix | 6 +----- pkgs/development/compilers/gcc/6/default.nix | 6 +----- pkgs/development/compilers/gcc/7/default.nix | 6 +----- pkgs/development/compilers/gcc/snapshot/default.nix | 6 +----- pkgs/development/tools/misc/binutils/default.nix | 6 +----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 36b48b880211..0482ff772d6c 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -240,11 +240,7 @@ stdenv.mkDerivation ({ ; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index dea8b912b272..060683860709 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -282,11 +282,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 343d820fa236..1fab985473ea 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -291,11 +291,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0d9565de0a77..6e3e7d0b0993 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -311,11 +311,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 29f2bad7eac1..67b7cf61c5ae 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -315,11 +315,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index e75e22efce1f..2a034954f73c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -311,11 +311,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 609d418693d7..693474bfb5e1 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -283,11 +283,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 549eaf5253d3..31c86c785c2d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -91,11 +91,7 @@ stdenv.mkDerivation rec { else "-static-libgcc"; # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = [ "--enable-targets=all" "--enable-64-bit-bfd" From 106bba65a6840dd75c2545c93b51e8fcd148228b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= Date: Mon, 14 May 2018 20:44:54 +0100 Subject: [PATCH 293/369] parallel: 20180322 -> 20180422 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 093633e21142..9bb09d227c4c 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180322"; + name = "parallel-20180422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"; + sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx"; }; nativeBuildInputs = [ makeWrapper perl ]; From 330ca731e88ec015181c43d92ae8f7c77cf0226a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 13 May 2018 11:31:24 -0400 Subject: [PATCH 294/369] treewide: Get rid of all uses of crossConfig The hack of using `crossConfig` to enforce stricter handling of dependencies is replaced with a dedicated `strictDeps` for that purpose. (Experience has shown that my punning was a terrible idea that made more difficult and embarrising to teach teach.) Now that is is clear, a few packages now use `strictDeps`, to fix various bugs: - bintools-wrapper and cc-wrapper --- .../bintools-wrapper/default.nix | 1 + .../bintools-wrapper/setup-hook.sh | 2 +- pkgs/build-support/cc-wrapper/default.nix | 1 + pkgs/build-support/cc-wrapper/setup-hook.sh | 2 +- pkgs/development/compilers/ghc/7.10.3.nix | 6 ++-- pkgs/development/compilers/ghc/8.0.2.nix | 6 ++-- pkgs/development/compilers/ghc/8.2.2.nix | 6 ++-- pkgs/development/compilers/ghc/8.4.1.nix | 6 ++-- pkgs/development/compilers/ghc/head.nix | 6 ++-- pkgs/development/interpreters/guile/1.8.nix | 15 +++------ .../development/libraries/fontconfig/2.10.nix | 13 ++------ .../libraries/fontconfig/default.nix | 13 ++------ .../development/libraries/gettext/default.nix | 28 +++++++---------- pkgs/development/libraries/glibc/2.27.nix | 13 ++++---- pkgs/development/libraries/glibc/default.nix | 13 ++++---- .../tools/build-managers/cmake/default.nix | 30 ++++++++++-------- .../tools/build-managers/cmake/setup-hook.sh | 25 +++++++-------- pkgs/misc/uboot/nanonote.nix | 21 +++++-------- pkgs/servers/x11/xorg/overrides.nix | 31 ++++++++++++------- pkgs/stdenv/generic/make-derivation.nix | 5 ++- pkgs/stdenv/generic/setup.sh | 4 +-- pkgs/tools/misc/bc/default.nix | 2 +- 22 files changed, 111 insertions(+), 138 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index a5084808c3bc..17ec2ec7ad75 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -186,6 +186,7 @@ stdenv.mkDerivation { else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); + strictDeps = true; depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 48a00b0b9b07..a093ef8f3b45 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -8,7 +8,7 @@ set -u # native compile. # # TODO(@Ericson2314): No native exception -[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 +[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0 bintoolsWrapper_addLDVars () { case $depHostOffset in diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8de2366ff5f5..7cd02c4b24c6 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -201,6 +201,7 @@ stdenv.mkDerivation { ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; + strictDeps = true; propagatedBuildInputs = [ bintools ]; depsTargetTargetPropagated = extraPackages; diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 29a7306b9b7e..6e6354860780 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -60,7 +60,7 @@ set -u # native compile. # # TODO(@Ericson2314): No native exception -[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 +[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0 # It's fine that any other cc-wrapper will redefine this. Bash functions close # over no state, and there's no @-substitutions within, so any redefined diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index e4bf23c6e9e2..4c227f561155 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -129,10 +129,8 @@ stdenv.mkDerivation rec { "--disable-large-address-space" ]; - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; nativeBuildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 7d11ffb66c60..ca3b128df15b 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -128,10 +128,8 @@ stdenv.mkDerivation rec { "--disable-large-address-space" ]; - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; nativeBuildInputs = [ ghc perl hscolour sphinx ]; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b2a1aafe6131..c8b8451ea600 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -145,10 +145,8 @@ stdenv.mkDerivation rec { "--disable-large-address-space" ]; - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ]; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index f232e0b47287..14c94887d62a 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -144,10 +144,8 @@ stdenv.mkDerivation rec { "--disable-large-address-space" ]; - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 51497e0d9cee..da38230d4854 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -134,10 +134,8 @@ stdenv.mkDerivation rec { "--disable-large-address-space" ]; - # Hack to make sure we never to the relaxation `$PATH` and hooks support for - # compatability. This will be replaced with something clearer in a future - # masss-rebuild. - crossConfig = true; + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index cf42c9a7b683..658b2cce77f9 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { setOutputFlags = false; # $dev gets into the library otherwise # GCC 4.6 raises a number of set-but-unused warnings. - configureFlags = [ "--disable-error-on-warning" ]; + configureFlags = [ "--disable-error-on-warning" ] + # Guile needs patching to preset results for the configure tests about + # pthreads, which work only in native builds. + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--with-threads=no"; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (hostPlatform != buildPlatform) @@ -34,17 +38,8 @@ stdenv.mkDerivation rec { libtool ]; - patches = [ ./cpp-4.5.patch ]; - # Guile needs patching to preset results for the configure tests - # about pthreads, which work only in native builds. - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="--with-threads=no $configureFlags" - fi - ''; - preBuild = '' sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c ''; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 5fb0ea4429e7..b02d9ccdcef8 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -21,19 +21,10 @@ stdenv.mkDerivation rec { "--with-cache-dir=/var/cache/fontconfig" "--disable-docs" "--with-default-fonts=" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-arch=${hostPlatform.parsed.cpu.name}" ]; - # We should find a better way to access the arch reliably. - crossArch = if stdenv.hostPlatform != stdenv.buildPlatform - then hostPlatform.parsed.cpu.name - else null; - - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="$configureFlags --with-arch=$crossArch"; - fi - ''; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index ce41f1ac7ebc..dafd4834a94b 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -53,19 +53,10 @@ stdenv.mkDerivation rec { "--disable-docs" # just <1MB; this is what you get when loading config fails for some reason "--with-default-fonts=${dejavu_fonts.minimal}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-arch=${hostPlatform.parsed.cpu.name}" ]; - # We should find a better way to access the arch reliably. - crossArch = if stdenv.hostPlatform != stdenv.buildPlatform - then hostPlatform.parsed.cpu.name - else null; - - preConfigure = '' - if test -n "$crossConfig"; then - configureFlags="$configureFlags --with-arch=$crossArch"; - fi - ''; - enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9c3024ce25fb..b6855a7e26d4 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -16,12 +16,19 @@ stdenv.mkDerivation rec { LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; - configureFlags = [ "--disable-csharp" "--with-xz" ] + configureFlags = [ + "--disable-csharp" "--with-xz" # avoid retaining reference to CF during stdenv bootstrap - ++ lib.optionals stdenv.isDarwin [ - "gt_cv_func_CFPreferencesCopyAppValue=no" - "gt_cv_func_CFLocaleCopyCurrent=no" - ]; + ] ++ lib.optionals stdenv.isDarwin [ + "gt_cv_func_CFPreferencesCopyAppValue=no" + "gt_cv_func_CFLocaleCopyCurrent=no" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # On cross building, gettext supposes that the wchar.h from libc + # does not fulfill gettext needs, so it tries to work with its + # own wchar.h file, which does not cope well with the system's + # wchar.h and stddef.h (gcc-4.3 - glibc-2.9) + "gl_cv_func_wcwidth_works=yes" + ]; postPatch = '' substituteAllInPlace gettext-runtime/src/gettext.sh.in @@ -33,17 +40,6 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; - # On cross building, gettext supposes that the wchar.h from libc - # does not fulfill gettext needs, so it tries to work with its - # own wchar.h file, which does not cope well with the system's - # wchar.h and stddef.h (gcc-4.3 - glibc-2.9) - preConfigure = '' - if test -n "$crossConfig"; then - echo gl_cv_func_wcwidth_works=yes > cachefile - configureFlags="$configureFlags --cache-file=`pwd`/cachefile" - fi - ''; - nativeBuildInputs = [ xz xz.bin ]; # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; diff --git a/pkgs/development/libraries/glibc/2.27.nix b/pkgs/development/libraries/glibc/2.27.nix index bb057ae899e7..bf63b97635a0 100644 --- a/pkgs/development/libraries/glibc/2.27.nix +++ b/pkgs/development/libraries/glibc/2.27.nix @@ -71,14 +71,15 @@ callPackage ./common-2.27.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln - + '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi + + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + for i in "$out"/lib/*.a; do + [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" + done + '' + '' # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 976dbcde47ff..ea443ce9a246 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -71,14 +71,15 @@ callPackage ./common.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln - + '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi + + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + for i in "$out"/lib/*.a; do + [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" + done + '' + '' # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 97c02cd9cc12..b40b284b759e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -80,19 +80,23 @@ stdenv.mkDerivation rec { configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; - configureFlags = [ "--docdir=share/doc/${name}" ] - ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional (useQt4 || withQt5) "--qt-gui" - ++ ["--"] - ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ] - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - # TODO: Why are ar and friends not provided by the bintools wrapper? - ]; + configureFlags = [ + "--docdir=share/doc/${name}" + # We should set the proper `CMAKE_SYSTEM_NAME`. + # http://www.cmake.org/Wiki/CMake_Cross_Compiling + # + # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and + # strip. Otherwise they are taken to be relative to the source root of the + # package being built. + "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" + "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" + "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup + ++ optional (useQt4 || withQt5) "--qt-gui" + ++ ["--"] + ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c796c31cb70a..003f900c9541 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -29,20 +29,17 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags" fi - if [ -n "$crossConfig" ]; then - # By now it supports linux builds only. We should set the proper - # CMAKE_SYSTEM_NAME otherwise. - # http://www.cmake.org/Wiki/CMake_Cross_Compiling - # - # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and - # strip. Otherwise they are taken to be relative to the source root of - # the package being built. - cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags" - cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags" - cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags" - cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags" - cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" - fi + # We should set the proper `CMAKE_SYSTEM_NAME`. + # http://www.cmake.org/Wiki/CMake_Cross_Compiling + # + # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and + # strip. Otherwise they are taken to be relative to the source root of the + # package being built. + cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags" + cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags" + cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags" + cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags" + cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags" # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index 2783927ef57c..fb3b98f478e6 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, fetchgit}: -# We should enable this check once we have the cross target system information -# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux"; - # All this file is made for the Marvell Sheevaplug stdenv.mkDerivation { @@ -30,21 +27,19 @@ stdenv.mkDerivation { sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h ''; - # Remove the cross compiler prefix, and add reiserfs support + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + # Add reiserfs support configurePhase = '' make mrproper make qi_lb60_config - sed -i /CROSS_COMPILE/d include/config.mk ''; - buildPhase = '' + preBuild= '' # A variable named 'src' used to affect the build in some uboot... - unset src - if test -z "$crossConfig"; then - make clean all - else - make clean all ARCH=mips CROSS_COMPILE=$crossConfig- - fi + unset -v src ''; dontStrip = true; @@ -59,6 +54,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = [ "mipsel-linux" ]; + platforms = stdenv.lib.platforms.mips; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 18189ba2e68d..42831dc40642 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -5,11 +5,9 @@ let inherit (stdenv) lib isDarwin; inherit (lib) overrideDerivation; - setMalloc0ReturnsNullCrossCompiling = '' - if test -n "$crossConfig"; then - configureFlags="$configureFlags --enable-malloc0returnsnull"; - fi - ''; + malloc0ReturnsNullCrossFlag = stdenv.lib.optional + (stdenv.hostPlatform != stdenv.buildPlatform) + "--enable-malloc0returnsnull"; gitRelease = { libName, version, rev, sha256 } : attrs : attrs // { name = libName + "-" + version; @@ -101,7 +99,9 @@ in libX11 = attrs: attrs // { outputs = [ "out" "dev" "man" ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; postInstall = @@ -138,16 +138,19 @@ in libXxf86vm = attrs: attrs // { outputs = [ "out" "dev" ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }; # Propagate some build inputs because of header file dependencies. # Note: most of these are in Requires.private, so maybe builder.sh # should propagate them automatically. libXt = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + preConfigure = '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; outputs = [ "out" "dev" "devdoc" ]; @@ -188,7 +191,8 @@ in libXft = attrs: attrs // { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; # the include files need ft2build.h, and Requires.private isn't enough for us postInstall = '' sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc" @@ -198,7 +202,8 @@ in libXext = attrs: attrs // { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }; libXfixes = attrs: attrs // { @@ -221,7 +226,8 @@ in libXrandr = attrs: attrs // { outputs = [ "out" "dev" ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; propagatedBuildInputs = [xorg.libXrender]; }; @@ -232,8 +238,9 @@ in libXrender = attrs: attrs // { outputs = [ "out" "dev" "doc" ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; propagatedBuildInputs = [ xorg.renderproto ]; - preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXres = attrs: attrs // { diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 46df958b8396..e108e3f156ac 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -52,7 +52,8 @@ rec { # InstallCheck phase , doInstallCheck ? false - , crossConfig ? null + , # TODO(@Ericson2314): Make always true and remove + strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform , meta ? {} , passthru ? {} , pos ? # position used in error messages and for meta.position @@ -156,6 +157,8 @@ rec { userHook = config.stdenv.userHook or null; __ignoreNulls = true; + inherit strictDeps; + depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d7a4781448ae..bfab19dd9737 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -501,7 +501,7 @@ activatePackage() { # the transition, we do include everything in thatcase. # # TODO(@Ericson2314): Don't special-case native compilation - if [[ ( -z "${crossConfig-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then + if [[ ( -z "${strictDeps-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then addToSearchPath _PATH "$pkg/bin" fi @@ -551,7 +551,7 @@ _addToEnv() { for depTargetOffset in "${allPlatOffsets[@]}"; do (( "$depHostOffset" <= "$depTargetOffset" )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" - if [[ -z "${crossConfig-}" ]]; then + if [[ -z "${strictDeps-}" ]]; then # Apply environment hooks to all packages during native # compilation to ease the transition. # diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index fc60a000e36e..52bd28e9748d 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Hack to make sure we never to the relaxation `$PATH` and hooks support for # compatability. This will be replaced with something clearer in a future # masss-rebuild. - crossConfig = true; + strictDeps = true; meta = { description = "GNU software calculator"; From 5a860c20f3030df890084d00d7d487ded735326e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 14 May 2018 20:05:48 -0400 Subject: [PATCH 295/369] stdenv cross adapter: Don't define crossConfig All its uses have been removed. --- pkgs/stdenv/adapters.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 734119491a0b..18a9c7f38098 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -87,8 +87,6 @@ rec { (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl") pkgs.updateAutotoolsGnuConfigScriptsHook ; - - crossConfig = hostPlatform.config; } // args.crossAttrs or {}); }; From 26abaa02571b408a6bfe706f553bd67c24182563 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 May 2018 15:18:46 -0500 Subject: [PATCH 296/369] thin-provisioning-tools: 0.7.5 -> 0.7.6 --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 8b9fa4f2f3fc..26fca485fec2 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thin-provisioning-tools-${version}"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "1ibg5wxrbqg4pr3f6aacqm42fxpwn5q00j8ldy9mw4an3ck41cwa"; + sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g"; }; nativeBuildInputs = [ autoreconfHook ]; From 42e4f90afb6476faf5245e175a0d68bd383e4ac6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 May 2018 14:51:52 -0500 Subject: [PATCH 297/369] thin-provisioning-tools: fix build w/musl re:PAGE_SIZE --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 26fca485fec2..64b059bbfea0 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ expat libaio boost ]; + postPatch = stdenv.lib.optional stdenv.hostPlatform.isMusl '' + sed -i -e '/PAGE_SIZE/d' -e '1i#include ' \ + block-cache/io_engine.h unit-tests/io_engine_t.cc + ''; + meta = with stdenv.lib; { homepage = https://github.com/jthornber/thin-provisioning-tools/; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; From de810b8180fb0926b82c76694a7e5a97f3ca3469 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 May 2018 15:23:32 -0500 Subject: [PATCH 298/369] thin-provisioning-tools: enable parallel building --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 64b059bbfea0..163e783e9e13 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { block-cache/io_engine.h unit-tests/io_engine_t.cc ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/jthornber/thin-provisioning-tools/; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; From 4056b41f95fe172036f8c003afe70b83ecee0f1c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 15 May 2018 14:01:41 -0500 Subject: [PATCH 299/369] thin-provisioning-tools: use patch, comment --- .../misc/thin-provisioning-tools/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 163e783e9e13..b4683167f334 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { name = "thin-provisioning-tools-${version}"; @@ -15,10 +15,19 @@ stdenv.mkDerivation rec { buildInputs = [ expat libaio boost ]; - postPatch = stdenv.lib.optional stdenv.hostPlatform.isMusl '' - sed -i -e '/PAGE_SIZE/d' -e '1i#include ' \ - block-cache/io_engine.h unit-tests/io_engine_t.cc - ''; + patches = [ + (fetchpatch { + # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2]. + # This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically. + # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value + # dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct. + # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html + # [2] http://www.openwall.com/lists/musl/2015/09/11/8 + url = "https://raw.githubusercontent.com/voidlinux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch"; + sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy"; + extraPrefix = ""; # empty means add 'a/' and 'b/' + }) + ]; enableParallelBuilding = true; From 0ff650a39206141adca544183a2541179e85c412 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 15 May 2018 15:24:22 -0400 Subject: [PATCH 300/369] cmake: Fix build and setup hook I screwed this up in 330ca731e88ec015181c43d92ae8f7c77cf0226a. I'm sorry. --- pkgs/development/tools/build-managers/cmake/default.nix | 9 +++++---- .../development/tools/build-managers/cmake/setup-hook.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index b40b284b759e..c8a66b1a5fe2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -82,6 +82,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--docdir=share/doc/${name}" + ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup + ++ optional (useQt4 || withQt5) "--qt-gui" + ++ [ + "--" # We should set the proper `CMAKE_SYSTEM_NAME`. # http://www.cmake.org/Wiki/CMake_Cross_Compiling # @@ -93,10 +97,7 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional (useQt4 || withQt5) "--qt-gui" - ++ ["--"] - ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; + ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 003f900c9541..00b33e6d3652 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -38,7 +38,7 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags" cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags" cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags" - cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags" + cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags" cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags" # This installs shared libraries with a fully-specified install From 44101ee9d67095af06a977eb7f64ba72a2faa66a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 May 2018 07:27:35 -0400 Subject: [PATCH 301/369] curl: 7.59.0 -> 7.60.0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5980392267b0..3d8cdd2653b7 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.59.0"; + name = "curl-7.60.0"; src = fetchurl { urls = [ "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" "https://curl.haxx.se/download/${name}.tar.bz2" ]; - sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm"; + sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 780d122d727423542213b202f5efe8d1cc3d3a2a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 13 May 2018 19:19:55 +0200 Subject: [PATCH 302/369] firefox: fix build on aarch64 with version >= 60 The firefox build fails with an error referring to ssse2 which doesn't exist on aarch64. --- .../networking/browsers/firefox/common.nix | 4 +++- .../networking/browsers/firefox/packages.nix | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5b88a61afce6..9a3da4307146 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -28,7 +28,9 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `privacySupport` or `false`. -, webrtcSupport ? !privacySupport +# webrtcSupport breaks the aarch64 build on version >= 60. +# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 +, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 33bdb62929e6..35a818dd6c96 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,6 +12,12 @@ let ./fix-pa-context-connect-retval.patch ]; + firefox60_aarch64_skia_patch = fetchpatch { + name = "aarch64-skia.patch"; + url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch; + sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; + }; + in rec { @@ -26,7 +32,7 @@ rec { patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - ]; + ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = { description = "A web browser built from Firefox source tree"; @@ -68,7 +74,7 @@ rec { patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - ]; + ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; From a6d8d54e7927bff4d478a27aa72f3b9ce1bc001a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 21:19:33 -0500 Subject: [PATCH 303/369] sqlite: 3.22.0 -> 3.23.1 https://sqlite.org/releaselog/3_23_1.html (also contains notes for 3.23.0) Adds CLI support for SQLite archive files: https://sqlite.org/sqlar.html --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b8b7d0c701dd..a3e61e3c0ac2 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.22.0"; + name = "sqlite-3.23.1"; src = fetchurl { - url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz"; - sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918"; + url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; + sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; outputs = [ "bin" "dev" "out" ]; From 1d6a14e24a65d41e30c824d1e339a372060d171a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 May 2018 21:33:42 -0500 Subject: [PATCH 304/369] sqlite: Add zlib dep, needed for sqlar support. (and seems generally useful anyway?) --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a3e61e3c0ac2..ff2de38f98bc 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = lib.optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; From 8c755ad7b361952e4c7f2992eacae82959aa4fd5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 May 2018 13:03:12 -0500 Subject: [PATCH 305/369] sqlite3_analyzer: 3.22.0 -> 3.23.1 (to match sqlite3) --- pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix index 1feedb94c158..2c9e69ac741c 100644 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, tcl }: stdenv.mkDerivation { - name = "sqlite3_analyzer-3.22.0"; + name = "sqlite3_analyzer-3.23.1"; src = fetchurl { - url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip"; - sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv"; + url = https://sqlite.org/2018/sqlite-src-3230100.zip; + sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; }; nativeBuildInputs = [ unzip ]; From 39696b6d56fbe93834a8997057b3507e8cd2a234 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 15 May 2018 19:09:29 -0500 Subject: [PATCH 306/369] qt-5.10: don't use features that require new-ish kernels, stay compat Before this change: $ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so Displaying notes found at file offset 0x004a7778 with length 0x00000020: Owner Data size Description GNU 0x00000010 NT_GNU_ABI_TAG (ABI version tag) OS: Linux, ABI: 3.17.0 After: $ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so Displaying notes found at file offset 0x004a7dcc with length 0x00000020: Owner Data size Description GNU 0x00000010 NT_GNU_ABI_TAG (ABI version tag) OS: Linux, ABI: 2.6.28 ----------- The above paths were before rebasing the commit onto staging, and it'd probably be good to have someone confirm the same happens when built on a hydra builder or other non-dtzWill machine :). [dezgeg: added comments] --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8887e05704d2..28b250437d08 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -327,6 +327,12 @@ stdenv.mkDerivation { ] ++ lib.optional withGtk3 "-gtk" ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" + ++ lib.optionals (compareVersion "5.10.0" >= 0) [ + # Without these, Qt stops working on kernels < 3.17. See: + # https://github.com/NixOS/nixpkgs/issues/38832 + "-no-feature-renameat2" + "-no-feature-getentropy" + ] ); enableParallelBuilding = true; From cab0bd00e185dbbbe6642e89d8db7fb9d7759399 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 18 May 2018 16:13:19 +0200 Subject: [PATCH 307/369] staging: fix eval error (undefined 'ncursesReal') broken by an apparently faulty merge in ddbe9191ef1549e7695e5e02e545b1b3db46edb4 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 805f42d67d94..f74f0a384cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10766,10 +10766,10 @@ with pkgs; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - ncurses5 = ncursesReal.override { + ncurses5 = ncurses.override { abiVersion = "5"; }; - ncurses6 = ncursesReal.override { + ncurses6 = ncurses.override { abiVersion = "6"; }; ncurses = From f4152ea6edd43bb0325eb8b00270f785a3efafe4 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 18 May 2018 14:24:24 +0000 Subject: [PATCH 308/369] firefox-bin: 60.0 -> 60.0.1 --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 478728cf09e5..32adb56c931c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0"; + version = "60.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ach/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ach/firefox-60.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "1e7d2419e488a14eed5af7f2aec9a0092f830cea256f69cf654b2bbf783b192ead4512538fe3b2566dd55061cccaced91a7aa54732fc0987a4b24f676b9cabd9"; + sha512 = "ca1638e32f121b1f366d89934e5516ee23cbe249596a7600f5ba1986fcb014d9125d24d3d7a38f251aa9fb527d368001ccc0af80063a7f3abb02a2a920bc7fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/af/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/af/firefox-60.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5714025668a2a9856571c743870f3401f0bfba66bb216936df7fbc977d9a935ae8b66fcb3042e45a934584a2571289fdac4f8fe8af2ec6a52c93d6fbf21484fd"; + sha512 = "f693b42ee4380fa6c0505fb7971984dcb466ef2a1ce90c09e8088e758f1aef5d3ee790ac578737523ba93f2866dcc92722852579cf4cc5898e66adf28ce17495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/an/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/an/firefox-60.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "678a060be20453e11fa2e8dc92db8a510789082d026a768dfb6cb3ac6a77924a1f6a9cce4e8c83e19a4aa6702b1e7e0b17846c52d2de2719dc5f8141a95d1c47"; + sha512 = "4858341f974d45c982a9c3c8285de2932db81c8dbdd124272e7aaafc0e4712f613aec5e4929ad0182c1801850fc394ebeda38f08a40e71e29ce111c17abbfc7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ar/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ar/firefox-60.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0c8e9cff9d7a349dfb18e3c5924efb068e1f9f145347b08feb158521b3ebf331ee01b035052ddb889d09b728745465fb6b7ba79c3608719c6f14a36e1da061c5"; + sha512 = "dcbe81e9b0910c44530f9b8f33876c8e2df6ca314172f268c9b5cc53010f5f4024b37929a726d4c138033596d904596a6040b6770e796d20a9a8999ff3e84ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/as/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/as/firefox-60.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "0ec81546fa30b6ff5fd8b66df5b97eff25b359ea0ff258cd24aeab63cc87ecec3deb5f4173d9da46efbf82f70a3fd1579aff819de4e299a464abe289e7c77890"; + sha512 = "4420f102bc6d665ddb568d3a27001cb91ddd76ac20ebe65c4c6fe58d92b2b9406a47c492c2f5ed4da42a48355e30a982c81da2b756826d239d443179bd6deec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ast/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ast/firefox-60.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ca9eceb89df3d618756618d961be5115846c1c6426f7f145379c2a127c807ba17c4796e9a16395e6f2d05b5638366b7f0a77ca19a75f89bbdf6a2a2f93269c74"; + sha512 = "5294a33939e40bc868041952830593fafb27f7be2eb7fc163571a6d08c7ccf19443f177bd73e4a3bed96d73103d2fb696810982648abfe300973c7ca7c6677d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/az/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/az/firefox-60.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "e99295b469fb85cba099424700267f875e7d4ad9c3e8398c7ed8bd4427a3d173feec957edec2847ade3735df77a7313ca99a98b66b67c158b33bd17e39fe98df"; + sha512 = "272fe5c3c276e9f3cc9554ebada40a90762af24cf6652a5fb9541f41aad964358471f2c19f94b3c1ad59eaf93a4ee507617f4ec299d4601c41d72a6620d0cd3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/be/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/be/firefox-60.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ce80aa81c5b04da5f0f89d9e527b8e1d7ebc287ddb05d2ecc08994c0e31ea8860b68316af5e00f59e1ba85a4abb29e1e9403cedde40faa294af6b130be2a4ef1"; + sha512 = "75689bbdb2f678ed36b265696d21d6f9becd7658001e15bbd8bd306e683b69d4762ac1cb27ddbb12638f7e626927e36fc0a16cc7b98479c5f2e21769dcd9cd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bg/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bg/firefox-60.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5a5f0fa8745c9c649dc26e8d235729bcdcbc397c4deb56bc0d8bff954ec64c2acd9f4d9fbeab9b0484d3fe91ed3717f8e37d5602f139fb5bc4fb22d0a372b926"; + sha512 = "33b7aa767bb6c234dcb8406eb7eee3160424192dc1a76b9c1c7beee1de42d1c623ad009ab714e60c62e07bbb087cc1b08feec7628361739380a767bb7b43a020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-BD/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-BD/firefox-60.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "62989d16accef0717ec9360d66cd169d89847701cab64f06fae6290b9be6d67acb0dd6c5d7f0e0c79107301512f57b44da04ce66096232291c5947a903e446e7"; + sha512 = "3c6fdfe39d61fd681fa3d30a4ea1c1ef7988a1345912592a79b9622f18d1106ab96e099fe56b428568467c0c63b56e2cc09bc5fe2a9705478f458d5de0f36433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-IN/firefox-60.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "fd75cfe4d3e9e7534d4b99452c05e4ee8bb45ddeb0b6cbac979b65db0a783f342b346204428c9b0787ab4e1bcccf4d4f056f4043a906dee41e7753ab8e53fc9a"; + sha512 = "d9c67926f2df8faae64a6d9848a3823bd4968cafa1caaaf8b2713db2656c0a6c82dfc16eca9741c274994178ea46a7325b5f72a11ecafddacd8cf4df45683a89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/br/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/br/firefox-60.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5c17a47e0fcc7231e6d1a9fb632f5f55c6dcb4dbfdf02ca6607ddcc54db3e198d563b0247fd4e95226ca29dfda25bf092e1b427d1b532b6544c2f2c5c498ee02"; + sha512 = "a0ad58a34f85b254d5985a1bc6a2a0003a91773ba43408a45998098b98fe104b9f09e4d4e9bc9ab7ec9cd378692beb6e9f7aa4d2e55b49630c807bf0f9d158dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bs/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bs/firefox-60.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "290f57558d2d0b6abee4e6220047e0e6082f328bf3c1c7ba02474d7885ad3bbe77ead7875ec2726ae5ab4db25bf9659147c5abe9fea771a54acd4a9cefa18c8a"; + sha512 = "3c24cba1629f4458832d09df121c897fa08c6c3a02ddb42d4e232207086525ff0dd01adc8e133c4ed2b6fc909907efd87f985cf0bc1d27fed18055ec566403f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ca/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ca/firefox-60.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cfd5654a3ac3a50885621bc4be9918f5e71dd8150e4fe4e54acf35685a42ea82d6115e8a50593866e186860c7d5de5408c5a0e7325050b1bc39d6964e828a3e7"; + sha512 = "75d63bd285257a1f8a6dd97981914fbe0886d77abebc237f08abb498a34bd1f129e38afd6fdbdce3da3d7dab5a7138e1da883ffad0ca31f954da68fc3d273ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cak/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cak/firefox-60.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "479d713253b99a19c6ec305e7986062b3a1ee476afb8968dfa2f57c52f22b734df82661bf487ad1fe7e706dfb581a99b247ea4128e89c9105b719b96f37e1cc2"; + sha512 = "d79aaa1c8833f2fa9c9612efb8e5b7a02805c37f1fc45db6f7fc2f6288c48f75880ff46b9ddd96be7f05b674a8201f3c1bcbd36d0deafd9072aee5dce8f18ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cs/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cs/firefox-60.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5139f4a2820ee921bd3c02acca7f57c5c2cc510c0e364129ecc07f17843cf92c565770fd0829515bfae94f96f6c9c68e8eb05c87fe5800da0be64f2400bf876a"; + sha512 = "8b01b051a92320457c9364ab0f28761a7dc574b35777098bb773c9b0ec64d8947a76a2bf3c58b3b4a073e392f7d07b4f804994854c6f625a9e9dc51cad9bf914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cy/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cy/firefox-60.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d26fa97dae91eaaf0b09a580880ff0bb70f67c473cd8dd804d835823ac6cd97306b0bfab9b8fabd45b35330ddbef72e779dd09b47580b0347d4d857dd04182e5"; + sha512 = "9f0e601b41e8f698de134d17d84f1b43d8f91d3319041482fe698fce34c8bcaa0da31e1e113fde72e1760bd93dc11dded02fbc917d69cf1ab008518e54c491dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/da/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/da/firefox-60.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "66a187b067f2e71f8ef43e3eed3eb12d02b407a230692e653111407c2dec82dce552eb5f9716733b0b3112d2d07ba6d917e4166e9bdac030dc0569a8630b566e"; + sha512 = "dc4280c4e4f7e51befe4adc002d6875f9bdc7d4cb592335134d5b0df18462b6fe54817dbfa2815375e8947bf76d81ab9ccec31b7b36f07ca2b11ec04b3bbf728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/de/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/de/firefox-60.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "aab4cfcf1c47d99c01cc93b0e26babecb4619b67df65a2400259249a870aa765152b7e4be625a9708e3e44b90f5a20b77f282b6939f2d092cc0bd180d8167c0d"; + sha512 = "f9c7e6f1b83616883c74ba8fca5d21b793a811868e15e40611c93312f76ca8d8c37c4222454a8a71bce47d1d30e8596ed5907eb9300c3b5a957ae49249808c7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/dsb/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/dsb/firefox-60.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8726bd887b610e74b8b7073b8e797a98e009150594f2dd5e0f301f375b7bd6af02b5c8915c444145fadc6ae3e77f494a6c39632858d172b6324a2e4c84c0d6f0"; + sha512 = "fc41281038372262d135de8004a1d7b03a3c8047fc20ab0e6856b696eee3260328a64b59212a809eb03cad7efd58fadda422e44153e7c8e33415d0efe5321c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/el/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/el/firefox-60.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f67a778f0aa15bac7450a210287f8e1e29cb9f4abc0f9e3c037d15a0f9341cdfff80b38a936724e5d18b5ceb373233fd8d038579e3a044c177887e05f5834310"; + sha512 = "5a5f2d3f2f83e8c3a4bf358cc9611f1279fbf218f24c4e5aff69efcbe4b27ae08b955bafafe3a73ae1caa05914bd4ad739f1292344d9434f1f486f5e615645dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-GB/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-GB/firefox-60.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fecd277c434cf3d4509371a5abf09fad81aba3fc7807470fcb91975939fef0d1384a97c4322411a787bb3fb27e3b043f9dd3ac182e41d35ea59824d109ff483e"; + sha512 = "19b09722af085bdb016a12cc586ec9d32371d293f3c5be660efdb792e2d894d339600cef27325759f0489a0b3a4000123685c19db5b6d933d3f4f51244cd4f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-US/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-US/firefox-60.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "263b6e827b8e6f8757c82a2ca24f78bd649ee07254cfde454e6d6ed879cfe816ed61c94aab3c10f3d63a38f83f391bf66bc578ae958343327298801fc30eaf3f"; + sha512 = "2f7c14e1ef94ad4751c7382d7b012fcd36787ee1045918226cb3b0fdbb08508fa986181f54e304df12fdb8d49aadd62afc936f5855939437a7f9d8860976398c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-ZA/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-ZA/firefox-60.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "6ffa936e9f5e495309ff535fa9775200f8110bc0162d97f8d8bd00cbf3606c47b88b566114224f882a323c6e9538150ef79e1340e1e1eead8ddaf030b4ffb3fe"; + sha512 = "04661ad52e94ad5e8967e21a460fe1e25cc08f9f0f108e9fe55633d4fdaaf23df133b1b73388146c496285d8562b57d38603100f45c4d81787ec02d4c4b6f0f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eo/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eo/firefox-60.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f65bf2b40299c5260cb857c781445c9213dea8a49751d6701f43f6dd11fccec206b5850d54e96a4eba544d59b6a470f21b3e15b60116615c343d78726e7402f4"; + sha512 = "bb1bd451569e1a4f116b458bb9d020d046b556c7335589dd6aa13f2a941b4ebbd197fa25728607f8bcfeacb610a94943d01d05b072f212346a5b74e96071f157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-AR/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-AR/firefox-60.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "50a912c5d4cb1e73bbe5b4c6cd8a112cf88377ca78cb45a073bfe74b4b5618a39fe088c908e278eedaf50308e70e63d38c06343c4d60fdfc346684ce7042a5ef"; + sha512 = "8b175a74a9688a50adc42a13b4ff4c137b34f09c571606d9a25080a8134640bfc8e0ef757ff88e90428153002d5c71f6dd339c54320520976669c264004a6743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-CL/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-CL/firefox-60.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b12f0fca0d307b280ec2a44f9dceed0073b0b9e898e05a55fdfd15623e022eac7b937e6b4ce470c7892e9ed429fd98a4d09141a5e1141fe05e3b21ab838a21d2"; + sha512 = "7561ea580fa411d7c4a8c4cc6bed455f3287a55a843484d20431aa81f7d08b42386287e3cbf5fe7751f528945d9ed70b922cbaaa0f5cde74ff030101d897447a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-ES/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-ES/firefox-60.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "492aed6ef8fa3e51ad1604cf858dd1223ccc8a949b3cef4ec37be1596640421b057f50d3ad1827fe139230013ba4c040466682e61ebee59e7b6c168f35a14b1d"; + sha512 = "3f7dea40f758a29ac6cdc8dc9e78ab4fde698c7f8d5369670ae31ef3a09819dd40e28296e2c05caa57e95bf4238f6c162fb81fff6d2bcb4a2ebf26eaad3a225a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-MX/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-MX/firefox-60.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8f12520b74b0899c58f29217f9ecc6223635b627ddf525e3d36b7a0616ad2ea39e239bdb3cf3e0570ba4be03ebd93a2aa2739cb7cbfb851e84d2549970fd0bec"; + sha512 = "2ef05c4095c02c22769098c837cabc435d2d84ec60b7ce09682c6625117c93e294bd00877379561728117e33d5991a0272cf48044a035964eb5d9df6167586d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/et/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/et/firefox-60.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c24e822fbd147ae85a8f02dcbb070764c31b96056a07b2b344f85641517e1e8fa78fff860bc7e951675f9ba30616dcb567e279db93638f241a75632f7fd97b9f"; + sha512 = "445158a41339640365d8101bf4473dc77df38f8c965a75f66ba8ef48172e6bd21d6813025192a7f98d451b50078faf5485f95b826af566c3e5215a10df2cbcce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eu/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eu/firefox-60.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "61ebe8e2e353419f7ed3ef8f944f4d8ae54d3c1c21ed7c1707212ac31e20c6f0607c00d0f3039e83c1aba832653f9c352b4976af4100b968045ad103862cee6c"; + sha512 = "7760ad9243be37fbf1aa727afda348f8b4460eb4726d1402e2da82b3165f208eee21b786adde20e7c11aeb5567c6e379210874b0eba75a86f5c88486b4c48c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fa/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fa/firefox-60.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d47f63bedfc12a2e14eab57eeca7f946513b3067ea84b7931237a32841c40e477dfb4f3979fdd617b6b43787631f97fa4e28f996038f3eac7c2be7c82f8edfaf"; + sha512 = "38fff9451b7fc7a027a5cf646ea6666a9519ae57f31ea77da8560777e485fcafa27e5203ce184916a725449384ce7531f41ba5f38d30a05004093c932c052ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ff/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ff/firefox-60.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "91fbab65d71da4416df7501ef392154844a6e5fafde529e9a9a42f01b44eb87ad248d83387b68fbda5b964b8d18b1b22b978dac8751cd73bf30c46d3cafda868"; + sha512 = "efed066528af1466f750af19ac816f64031220618cd1c35e8c2041b6d94e0b3fe894780dda51c22e75eb49d4a0f3013c6de9557167de22b85ab4d72bb44d6729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fi/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fi/firefox-60.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "483408626eaec192e753277b02de5c5bb68ca6056f35756fd7f80ff6c6ab3e6ff15f23d4cd5d1a28c8e662bc278ce7cb285513504663340451b912126e4d4fbe"; + sha512 = "95d8c34ba47b0fbf2b112764c5f2dff684f9e207c839eef45a2443500de6f30b72ded618e116d784b6b315028df8cceb1efe11d3dc08b1af4a0466c016854c73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fr/firefox-60.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "adb7d295ba37c0cc7b51e312ffc3f60e8ee13106bacbb833086d160535504fa2f8f859ea3c1d30eb6a823ed9c2c6efc97bb691dde8cdcf991090e29e15d5c21b"; + sha512 = "108fa3054bec0877f35594c6c5f22d5d5bce3eaf5e74e5a1843bcb7592ff84b67160065b32962497577cf59b5375f0bcf75d4676c4e7201712589050a018e00b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fy-NL/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fy-NL/firefox-60.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ff44abaf4ec57162bdeb3197c3f75f312029934a8546018dab76aee8bab44cf2411c59d04a4dee9bebd618f26b466fd074f7533d839f1202e643d255e97e8015"; + sha512 = "9dddf9cc3be7557e495e712f542f5f3f40ef205c893b5773217ff13e93cc83d35c7d7fa3611ebd1223a9cde4308cc8b4d0d0ba8879072e9dbc1d1433b972ae15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ga-IE/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ga-IE/firefox-60.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "5d511a4dbc00b39199500b30c98ecd6bc009217644b82f58beed9fbb74699fdeca7cc31b59a046a7c56fa57c53c2aef7cc55232fedbca751b85347460c014d3b"; + sha512 = "a2539cd2e7ec2f8898c98a27e7e70772d42a14a435279e33f2fe192189253e8c0d92814d25d3b2e5a5c66ac02ba6745b5feee1045c965398781fa86b19c68b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gd/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gd/firefox-60.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c7c893d0acb97541d9545a35c031aec967405113a4855d6833b5ade0418004fb8b6efab82abb551499c4b4f8a32010634b64a96e8c9b12f27b764dc50b33a23e"; + sha512 = "dbfcbdd6bf0ddcf535821268d0c7fe59541387647124a7b95243babb1ba02e34dbfc3956808aea1bafe5f301a7c31382eb958e3da21a476c7961f44b4055bd4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gl/firefox-60.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "aadd92086094860936f1c0436bab9742170533a1b233022313439c9aa968269835b2f63bf33226c1fc52bafbcbe1e00677e8f1e04579193c474600e5dc3d94c0"; + sha512 = "743c417dcb7bfb4027b0f56ff9c2561888bb7a66b0399e713bc65255f6283f9f33736abbfb449030cada641b085ed9d6a5a7010c60ada1002802f4cf6f3fedbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gn/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gn/firefox-60.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cf566c8adb01873712708f76bb976a92a3b729459639faabd22ab5515cf59951142af734c9eab7d67ec4eabf9590f1d7bab65787f70908dbc01aece73bf52277"; + sha512 = "319eb86fac5e121e27a55386d3b9b79a07e4c766ac999ea387e03619f85e1c9a194dc4bc6cb56d66203ae647f6cede6bba81e65c4bace35baec986a18d79045f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gu-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gu-IN/firefox-60.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ecc4afe4acebf476fb0c4bd089679d8fdfb88c06769a75dc473ca3cefae09c01c8e71f88cf3c8130f4576eac17445032223f2713327ef6386fda6a2e3f588bbd"; + sha512 = "37a5b54f94b5532d8bbaff537642bce1ca3822697821b84df523d9ecbeecd991aa2302c65a1f31883e7a0f9519347a3bb5995bc17208e1a56d8c98897fd1d2b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/he/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/he/firefox-60.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "604048649305e7abe426b831c8b3fd0eb3cb26cabc7b055f85b7fcad8d0f9cb8bb06a431a28013ae8fd24ab4b21d8f8e68053dd7397a88546305f241adab476a"; + sha512 = "7a9cae5f7a7aebbf25908509efae41430f6f24d91d406964f83da585762cc078caf508750a562683e1f782bd805ba24b59327d1807badf63462a19955230aef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hi-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hi-IN/firefox-60.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1f1d56c762166cd8c099f636c610c361ca94d388bd4d627ddae6d94e4424074686b5fb6a3aae5562e9250dc82576bc52abac4e1b09386dc2f81799a1804bb7c9"; + sha512 = "99ed2ea7f0aaaf214d3d4e60ff1fefefee09c42d5aaee85690d0c4e9832cab67f23b4d3f5eff8f46a936ab91922bb32ccc801db06c1cfaee4bdea3e60df3a2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hr/firefox-60.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f5968a481d92aa0b57ed6319e7bba0d11ff00e0ec8beab9c6b66e18f4a6d128979ce1efaaf6fa07d4202130698216e58b8580833c13e1420dcfadbcda925b908"; + sha512 = "ea4814ad10720b0685713ea2d670c65713e453693b1d6ab95eb55e1ce418f398549ffdbbec172955d0141f275caa424c75bbcb326b736013dd8741511cba9488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hsb/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hsb/firefox-60.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6dee0423afa3ab5c173568aa91a2e92927cd6aae390033f34d8e63ad224d813b3f688a0287872cd8b08efad823b05804ddf54efcb57d1503bb70731391fafebf"; + sha512 = "2e89edffaebcf69580fdb83c92830b091956d2ddd2d523885d0cbb858f3a958661c47e65e82a5f4f832751b215d568f985632a466e52cc23254ebf0b0276cdbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hu/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hu/firefox-60.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "688103282fbc64a541bf6b914f757ef4cdf58ac6eaa942f45bb8b20b661136913b62735b7352c2118643118c48d94dd9a7cc18dcac184c3080e078d6bafbb278"; + sha512 = "d00f603275a624ad6ded66f71b287e38afc8c4904b194fa0c71ab4f148ce2ddeda286eadc1b2395c316a4ace7aa7ea39e6f50ae8b8177bcafd60774661295e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hy-AM/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hy-AM/firefox-60.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f836cd764ddd7f9f48295c103b4ec0c091c8eaceb756825fbc9f4a03b9dab786fc94781903975167d93c8d9ee73940a6607403ae6d0ef97a7c83b89989ec628c"; + sha512 = "da238fd6afbb3bbd7586f9f057ccb53d5dd8068fc12ce6ced6602384ede890b71e964c0c516b776154f5de358b1bf6b06daf91526dd8fd334bc6fb8fa650bc1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ia/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ia/firefox-60.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "61ed80fa61e7e8247ac1b59dd26582b063fd1313a02bf1ab73c696389cdf5f3d8bc0c3b58a15fd9ff08ca9514e3a3b53fb16aa532758586d412a8155131fa457"; + sha512 = "dad9d2b95fa47fc1b34aa9bd47f785e7640eaf44ee51dc0cee8df6897939e3c77977c60b7a8fd3427b23dddb10bf4d0758b3ba08d305c61f7b42dab6b490a6fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/id/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/id/firefox-60.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a87de8f34c82d35a5bfc77ba7a5be2c5afa6b5015d79f25280d162f9563cf8e48ff54386c03b67e4743a376c0d679f1d90b7f87924126028f2a4b990e7d28182"; + sha512 = "17f8ceee4f31a8a37684d1319f9b84685c05f3f2aa0ba3a8801c4132c2f61755ef9427eeffdb38420829e92fbbd24dcbe54906de59d89ff149f055ede61b751d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/is/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/is/firefox-60.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3b51c777930363c3085f11f3fd54a58a3ebf63a1a35384ec8d324acd670cb35e8bf8f9d1bd3b6ba735b63b5b2f0901d064e7802c5fea6edd5b36d7cc022cfd94"; + sha512 = "9dc8a651bcf460e48a64661dea924d56d48e37424579b369ce4bce113d3a3405fd65f542096c8d199a2a3db42463dc28964fe92c42419c8aa5020084b82059a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/it/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/it/firefox-60.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "84ab4fc30b8753fd7586239b6f7313828862793581932aba00394ba59f6070a5ce69455a102f2ad05fe19e8cdfcd78de82d488bc31918b63f4d8aa810db2be76"; + sha512 = "49a8881a2ae10544db31aba2a8f54bce5948ad25a47f8bd221d8982f12fa66cc7caa43e8c1963cc3ed156ded31bcc331ca0b2f784655c7ef0d8af89d7fd2c271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ja/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ja/firefox-60.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "345b9ed332637d74064064894d34d32263725af9d288da3de3b2c05d2e38ee97355bba5a871698980d772a7b6847642c19716e00514d2965900f12b8a5d7a633"; + sha512 = "9af0675507f54ec12924c29e051fa4727ea7b380ebcbb8fac1a91481c0405585b4e593324f72b4778538f0acc0efe8878f21f16a02272c5b02acc5ba7be7245c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ka/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ka/firefox-60.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fa3baf6c474e883c94e5d862739e2124980e3d7cb7692dee8507d13bd1aaf389c849b218ec0cde02f60db479c1ecd32e8e444afe3e09c6ebb4e7afa0b273a2a4"; + sha512 = "c5b52b448bdb19945baab604b820d383f48cf75a3fef2b8d734f0874d7aa8ba1e3ac6493e9892d8003371fde1bec8405cb1bb0991656b8d9d537e8c0b77a062d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kab/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kab/firefox-60.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a86ccc40c7a7460acf3242a8ab85fdae4146bf0efbae20ea44fb0251f18bbc803f55748348022ad5196c2347e3da7b79a03418ae281835af184d2245e4bb7635"; + sha512 = "7f93bb78f7e57004fc22863d7dcd40f9407e32a606ff07bbc20a3e4e8d348720fff541d72d962d119eab70998925cdb81ab816086bb8d95c4724a9c02a723587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kk/firefox-60.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "420956435202d7166c3d29c795974034b43c758fe19d0d55dfbd207e4e1862272a55a6770294ffa54a4cb9259985eac7f17a290e13a49006661b18beb7f27a23"; + sha512 = "fc60ad4c8c2db9252e4975534a50b373bd5b223ea8ae6e6d2a7a07bbaa4834d078ef2756b40dcbab2cc4dc1bdb5feb1def890021c1d44620a179dbb10ec2ab28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/km/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/km/firefox-60.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cfc262238316cd3dcab2e2a11647cdf3a7ba38004d4fa18f83286d6cf1320a78534cb88727635c330e6ca8c8608aae748786a83fb68484f6d2f6ee23cff603f1"; + sha512 = "c6a544c825f3895ec390275e823da876113d74e16fe3c61838c55afae38b9ba7abdc05e28d1b66bdd3477be0e4b0b792fa2244eb6dfa7aa4a189da438badd823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kn/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kn/firefox-60.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "27c445445080f6642d4f95022d8bd07824ea81549f80da041ad1273db6d4a0eccb9e1bdcacb89e269e69dc63a33af2c131f193545624771e25444e212592c45b"; + sha512 = "c42366e72d38cbe3301d52ec5c6e34d5b623d5f1a06e8309cdacb5ed6b6a3a356034cbe95ccc5c6a8b320dd41e8a92564b66effddab4a03476dacf00acab3fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ko/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ko/firefox-60.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "21f8dedddbcc5da3788abbc17ae07c422b2f1476fea3c45f173376b1ba38736f1a85b7d11bfc0e50ad610d605680b3333c39b18b89e9e4990086a782f8559881"; + sha512 = "4e05c5d8956661956581acd8bbd93eebaa84b6d5972da34b976bb6f654a06d1d0286504350b89dc43988675a3a9c57890dcec81c4a39ad87e0fbd0593a0e1d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lij/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lij/firefox-60.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "706bb394d90ac405773448cd4869c8880a649569d15af420e15851131194a014b0b9f72a9b60b2f621596d4215f606b3b81e0409ea4eff5da0c04a91691bd99f"; + sha512 = "68120d34a56f65afe99930e32c0b35660c36b38d61e5f60f7ad5da131b1c95d02e241124379c11b6287d2f8794191d27ef1fff1f5c4eed5dd3a5df6f5a2183cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lt/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lt/firefox-60.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6cf1735fb80b7fd945a2b993f1963ed14c903791dd720fb9821a728251b0c006cfda12f80f55e96bb821c7988f7e73144254e7e3a3c92a4a66680be9293771cc"; + sha512 = "149ee7cedc772534427202309ec4060e8187a847b79dd686096d5ec2c44b1a0656e8c3099606e921942e8c426d0206551fa5952dc0e9abd1d510320fee26926a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lv/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lv/firefox-60.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "5feccbfe1088ed569e67e3a54f9cff0f7fcac91dccb8fa447febfd96ef2a4f25a2f51b8dce2f397b2b09fd8654bfcf292339cc5d25140a1892894425f2d86e3e"; + sha512 = "0e630d9a09895fdb06c6893d7f9f3bfe3c3832d4a1682e2f12ee89611570b6bbca695bafd8dcfa583525645db86a156bfcf97afb575c44c19f801a43edd824cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mai/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mai/firefox-60.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0b75fa47591f6ed9cdab76ceda17636a7f666b6469e2fef948d29c77f559328320cb1108105590a240a0004976cc922439eaa800a5234f7064396e2d56e5a45c"; + sha512 = "6c3dc9e2230a3f7d74390e00e661eca28306996cb8d5379ee7fde818dc09beb813ae5ccf09319510a1df84e3ebd45b7f1a8a08e776d046e39a69f724fbd79da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mk/firefox-60.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "bcecbd3a82a66abc1918f03ff0c5da822526f3c1a8ad72ca9a021d5c036a382734251513dacef9ca6f290b130b67edeea5a79a37606ac34f34b27528ba7cffac"; + sha512 = "60353c437af1ed116c5d16a4e5d57a1b99016a36eeca8f8e4e8379553a5374cea543dd8a9864e448028b2f188ae16180590da7e199ef96fad604e172fa1f6e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ml/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ml/firefox-60.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "14d844aa0c430376d17224e0172234bf028f1bdc56b931aad2455c221affb93f1048866b8bb3418dd10fe12367178e7504842762fa9fff381a21ef8599bf9f37"; + sha512 = "6065d13e781728dcf587a1389d3893ee69e7e49b601cccb293e2c13dd5e0b5b039ddcef5de3b8b61baf30aa0e994f44eed6f29b38c94b3b24df88f102b0721fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mr/firefox-60.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b25b3aad52c6670c27c977084cacaf526b4c64b24c679dd7f45f4ab583a80799912b6e6b9eac195ba19c94d70dc5a1fcdac46e2c1234fac777d706fa51008221"; + sha512 = "ddaf770f926ffcb612bef6169cbf073ed4c624635d00db6edd3ac6c6051ebd9ab926ae48f2a9b92a5816c6aa2e6b5ed33ea90827f18c70b7364bc33d6ff9174d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ms/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ms/firefox-60.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "5df8c5ca3e8dec6b84066ce0c4e2db00d12cbf7c0c51d229a88072653166359652caf4c51e7470f06151d9ddda0075f8f53eebe2bd83e25bec9920db7654a97a"; + sha512 = "4b9f1e63cfce7b99e05d54f99b7d42255f2e2875718e2ba0e173a7aa53113ed990f1547ecafd508a8547b696f036ec88826260545ab7a6b03d4acde8afbd1fc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/my/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/my/firefox-60.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "eb35f499f6d2ad6e71eb780767abef864b2611e8cf83669e1a8a08f6fdd098ea183234e157a5ea442773c45348b13c55b2811398a2440d5e579cf57ffd1620fe"; + sha512 = "a82103f7dc6880e8e81ec3f0f9b07af4dc13de369eb87398dc977f2935387e489c6e61ff2f5a2c883d5d69ec24cd556bc44c722592d432a3a8f82420fadf11d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nb-NO/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nb-NO/firefox-60.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bf8b5d719d507faed5f2f9c34d6a78471b16f0452286ab3f79d63d516bdd6af54186cb4cd896d09400da51ec4a923f711791e4040048ed546a0d30a065dac129"; + sha512 = "4a68aabf3a6a085a8a7abfe705ee67b724243696e63bbd5a9324a1a39c2765db0c75d1fd8b652b78982702702fa1997831945e2eb56b059efe55d64d351723d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ne-NP/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ne-NP/firefox-60.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e389da15177b36b9f480630e88491252b37ae1c4b9874804eda96a259fd8d0dd5c53975056246dbfb1ec8b5d47c90a9eddd2dc665c19dda64d35fb1af4d1a531"; + sha512 = "760c819b44b1b2d694ddd5841a97f586c46fe2661c18a2d9f6831ae24a1f67a90beaf5592d8dccba35868a0e608f80b0a652f9c3af8e01601dbfe771d35c38d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nl/firefox-60.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d4b4978889d9acd79e60c05f9e088c8850ef234e475bc05b27abe79596f74db47da748fa228b0b9706ff8f7e747b28edda36555dca8a3c8a70bb3a2ee147b8cf"; + sha512 = "698c765c19647bbd6cf55e3812501131720ffdb485058e90e79446b5310d056ee09162253ee334535ff0eff2d544748385ea88d3bc1fb3bfa0044d4eefac8f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nn-NO/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nn-NO/firefox-60.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7f27fefba306c82b7227889f56059d271623ac40af272ecf810c53224cdfca8a79225bdc1dbf267be8b8a4db4a5c870f5f969f0e30cb3bc6488c8ce101c43bd5"; + sha512 = "5cd75409e8f952a681cf7485860a0c45bcb77a9b6f3d645f27b34560802772917a8d29eb465b8eca2fafdaa5db1cfd5a37ef2219cd14444296c81b1c53008375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/oc/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/oc/firefox-60.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f5dd23837b4c6d60a3efece4f70fa4ad2c69a0d560d2dba884ca0bf004619c26aca11348e4eaecebb0a92c46a835ea766b09a9734f7ae34dab88c4849aae5151"; + sha512 = "765bee0da88cdf168a37521e94249e14dfc80f72248e9d6805b098af8d99801ba38b96eadd6461bfa523fc2bb9999652ca2309ae9fa9202a5e5e00d4aecb506c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/or/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/or/firefox-60.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f3224d03f3a264498167e62fa8df8b1d4ad0cd9de07f9bfe26eb85977214a00d64daa0d3ed8ae9d2d4ba30e606bb006a0399918dcda34d6eb5b9009eb3db6dcf"; + sha512 = "06fdff27a007b45357d17f77fb22b589bd2f0d07866e0f64f00af46a1403f7375df82cda101997d008882232ba34043f26e0e8db0f796bfe30d442eb990ddfec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pa-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pa-IN/firefox-60.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "47b347b899f7300a9bc9fb15f00ea5b05ed26f422b4836d24da1a795b8f35fa8cdce292fcd92b8730e54078318794cf942b27425c367ed4090f3ea9237611cb1"; + sha512 = "8a416b28b1f2d73865d151480ff329843e53ad45dea6a1e931fa6426d1d448d47b6ef2e8cf2125d7e03c69bbed90351bf6fe65036be490dbe7688598eb01a8ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pl/firefox-60.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "844eb1c7e46ef7bea66317220a6a57daa0cca6022457da4184550974cb9f616bc25ea01ccd8f158c3d195d39e74cab4d04f51d41406a9cbaffb423c87ea24b3c"; + sha512 = "df635d41fc27ccab2eb30d6b73effe6ee33a44f543fa0f7cdfcb9e2ba8a70ba3a5608a914bb80bd4f450b623d3d6b05e0d9cb250a660560cbefdf98d501425b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-BR/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-BR/firefox-60.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ba3418e27df6f0e037c37d1afde5e96c5415257fb0ad70f95bec98d50084f8f0aaf1a5d8752163bfaf00b390db6d0dfb88867d3afe48bb246664e7a9361b2d87"; + sha512 = "b5e23c79428ab50ee97ceb79305331cb36b19f9f76b8473a53f83e669178eecbf06fcf79d067923147fda14863d56bdc157d1123b50cf64841ef3d8fd77f7cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-PT/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-PT/firefox-60.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6f675e939407e19ddea4962e2f8cb0fcfc7f573ff76689d1f434416b02024bf8786ad78b03fcd4150301309fbfbb91be078340a47d9fa413d2312c6b8aebdb8c"; + sha512 = "03e3dc135b4d0d8c74ed9cd087edebdf26b256768adbf42d3a8e6745b438a9e617d717d9fa68533d9aa5e7c07c64ed42540b5005cd1b36fa04e9912b4e046090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/rm/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/rm/firefox-60.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d6623710addc98457977ff62337a3aaccf1953874e6df5fb6d4ecfe2d7650920d5c1d4593793f37b5397e688ee3e745ac7007f3925e0982b7ce168f5a1fd90ae"; + sha512 = "74884aa4baf61bef8707eb94c9cd523707426ee5c5e280a2f18ddc1cb5535d15a83c7125b4734e3472c9e0ffcf2a8aa7837b9c150ecfc2b1767ee42750cd2a3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ro/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ro/firefox-60.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "38c6a14a6ac375ce700cea3853b4fa208929ab6814bf2037c2b9d03b15d85ce81833c09e889ef5a8966c61658055fc11e4d1ece2a16370e7436adb52ab321bc5"; + sha512 = "d245c0322e0a4d94b3a837c75c8b800505c82472363202520fdc99d0db04b2830bbf522bf1cc63285d103a0fab22083b8dba93c1117df78ec8ccb6c03cb36633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ru/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ru/firefox-60.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "730d26ce8e54b9b4e8379c475e6db9bfc293cd6bd233f566ac54ef6512f3f3bcf687b18f8a31f3869821a9fa1d26cd8e6149e3721b5950ff7633a645df4df8fb"; + sha512 = "1ff03c04e419498d3e2ea565c02f4716f41370fc97c24166e54d6a07d92ad6f0ffb6ba13f708e4079d00a4c98fc24e36c278414c7b638e29cc7e5f2891417348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/si/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/si/firefox-60.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "37b72c9fd02ca03087458b58080da505fd334fd7059291a7d83557212af0e30273ef002a3fdd9a8797e76f1178fba731c127a28051b1bbf74f570f13d6d8064f"; + sha512 = "4467d0a6a69d7ce89e1849d1cfaa81f2588cf8019e50a5fac6f292a2a50c55750130e885334659f834190969636ab74a3af97d6175be5f88e45b97cb772a55e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sk/firefox-60.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5ad4c596575cf5ee63d7ee6c9df3f9b9dead8fe41fc66dd09c010755d069f2c6dc2a920ce4cd82f23df7a22d600aa502b3accbdb05976ad5f08f1ec19772fd51"; + sha512 = "1060fbd4bf7f83c851d74773ce0277ebcb7f22769ef95b75775d7546b3fbad930e2a04deead17d37e5bee69f39aa978b65c41e20862235209528bb91a776550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sl/firefox-60.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "5c7181d319b5bc4c9c731640360fec12a862975fb8d6b59f913a9a113b88a65ab3b9db9ff759f9faef6088f25c5f59462f0f82b62a8e5115836f498289478f6c"; + sha512 = "75f0d0a4af65fc3f3992cd859c7f7f7a9292aa4f0e1906fd4e7bb4106edad80f3cf086cd843bb526cf2958cdfd94403fd110c83d232c533b105e7a79b6b01b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/son/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/son/firefox-60.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f1ff760bc5516ac6a5beb251d541e38cadf0652ff51f9f1798b9677e9d3e33c844d56e6397288c898ba38c6bfc80129c7318e1e9cba3ef9ab4b9f07405dd628a"; + sha512 = "4f5a8dbd2c60874a4158a4f78b66377a193265751c1f7629836c789ce0abb83de85ff1bee97ab8708ef86bb123d0d2ea5bbb2bb21fcdc52950e1c1164fc13684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sq/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sq/firefox-60.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d57cd7cf4669cb537d96d6b9b4bc81446d7e54d6cc294776f2155b1280352289c1afc3d0b2744973280bc980c4f6200a0cf114e449c15c339535cb30ed153766"; + sha512 = "5b226608e43a7fe4ae8f23eced67af9f512adda9f70c4f33b81f0a4e779e78e9301bb5e95a4b4362ee79a04ac5da81c36005c5b4e903d40f6f4af84b5503c113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sr/firefox-60.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2aaaa459fc730feb75428dc4af773d001bd18fd0afbe564d919925f159cd95abc22a21db9919a0c3f16f12ffdb30e8f0d91c0d3c113578804c35a1764b86af1b"; + sha512 = "143de2c6f87385f71deb0faf6db20cfa5680c5e3f682e89456602f05494624d22db9c577b92934cda98e041f27682103d1755864b0dec5bc3b2b6d9121133532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sv-SE/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sv-SE/firefox-60.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "223f00e509c53a88f102c2f9da9b75640bea329307251b59aaf2ccc759fa0246701b1877c400f3fef2337099f2c070f33ffb92c8313612a384e7f5ec7cf66ffd"; + sha512 = "09e52958d73ec2b32331109a1f1d9798493cecae739fde6542dc4d6ba026b4d2e1d1f3816b4d2b16d71faa3a3840417329b97eb7a8c0fac2cd168b159a61eb7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ta/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ta/firefox-60.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "910ff3e81fda8c94989b3d6cefc5ade22ff0dce21a81907e84f1573d631253ca3b3f45383552193fb46875e09b770ff8e28fe945558fd897bf0b64bfb4e01004"; + sha512 = "72b0e1a7b94eccade119f7e4b251b803f4f0c54783faeb506649b9048d663698e084e15664baccfa79ad2f6c6238a19c1bc61bcf840fbf003df94cd62ef38deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/te/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/te/firefox-60.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3fb89f3620d5a39a44cef228a9fdd11362bb3bff59fc64815468376221bc151e3538f929023fe634a163e0c7ec47c45c54388d4f5dc911b53a3f2565caaa6edf"; + sha512 = "0478768a0e6b228ad924dcda9dca83fbe2d51646503db931ae4600bd107fa15c8f1bcfd4034b6201a72debf561a815c28c54396a45100dacb68d9f04c2c0a45f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/th/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/th/firefox-60.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "78a66d69b6225ee29c5c1084c9059a9f1bb867c22886ad42e628fd7e0316bc2eb8eb02522972817508557f1be5369e00ba489260b7b6882a4f12448808b9af16"; + sha512 = "499aa56d62d5293e050bc67a50feefaf5019385291e4d3a602f35c1e8b58937acaea893a36d4d77e0e4eacacc3c406054b9e81bfe8cdb27c687b4cc6efcf1b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/tr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/tr/firefox-60.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "afb9c372e5b1f0f69c53b4c0ea9dcd8ba73672c163bd63cf88b7d8c9bf24af3656a924b29c6b3e28f826ea710c452cde789ee68e0a80bf269b034428ca2de577"; + sha512 = "8c3f26b9d37e47e3445fb14ca547f143961f19eab66c93ee4a560828a4bed3c773fe09d2e77c350effd76e0a0c447a0121c9ed29774a5ed93de3d707891a024e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uk/firefox-60.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ff3cd139b34652446807063c4d68f4a5ff8b5643bfe786527114a11a4cfe2838f64ff151d5d77ffc9c51e4b057d3f1058dee1dde521ea95bc9f17392a641c5ae"; + sha512 = "ef7a776d6aadd6d9c70594260679810325a4cbd11002bedf5e7d58d36bfc82f72c3c2c352f0d693292992ad6bf9fc323e5947183f6c713f85c353ebe72203b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ur/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ur/firefox-60.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f075ecd1d15e9737ea6079c2dad94f7e3bda9503ae8a17f017fba27c166f1721ff9e5956c3a7a3704594d8f4154f9e11dd2df19630aa735aa7d3e533283af43f"; + sha512 = "9096d21d134c2e55d694ea9a6e06a669e636b15fc4532bcda12b9944d38eef325e256106004e6f9fa503f5590e5077da5f72a535b8887501a53d4a8c9c0c4c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uz/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uz/firefox-60.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8c885715f9df669d79fa4c0b0bc054c4e760916ddef288deda943ce372dfc85693a2297ed591b4f540f618e4044321fd3812c9fb037561969a11a7b472dba2ca"; + sha512 = "d856195097a7923d42a7efb257a9758ce4bb5ec3d93de798bfcea1ff20dbbe1664d71fcd8bc72dc9592bb4c4e8e45a041164fb9b9174c2c75e2c04ade968e532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/vi/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/vi/firefox-60.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "19b398ae13e9cb74f61fbfeefe68fa8fcdf8785fdba2dece9e2674900cd9ab71b401029e1f1fb91174c9996e65522eabea975d3bf9d46de0f76c29d0ff6d3812"; + sha512 = "7ce9b59b89c77e289b56ee8b358409aa6bca3c47b6be004a38037f7c156834213dc5704e1ffabe3fa86f1ba89243abb6efa2fba31eb5bd1f4d95e0f225d0253d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/xh/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/xh/firefox-60.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e236beb0e0d5a7fda5c6bde0141884a0d5e09628e579ad0e31280db64d2f373946bba15fa1fc40a7c5ac7d468896d9e7af41b587378a999dd7fc1d9b89d7a11d"; + sha512 = "7dfc5627038c97188e4875af30cb88baea359463d5bd47d11440c9f33f84ad4168d860e947e90c104ac647a09f3134892a394b8a8435639f71f7bb9edd92bcae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-CN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-CN/firefox-60.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d4865b13e94ed4ecaddee1458700ad6ac3850aed5c5298761fc1dee3b483a302a60256ceae15fb0b8d2b212420aedf1e66345b951dc90e5d8368242bcdd0cebb"; + sha512 = "75d8a96eac39c0c60814718929997e9d4a60a2fd273ceab744bead7164d6bbdbd8057a94a3310709da7b6287549cd44f6d7dabc4bba1bfe1f48f3345193cd142"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-TW/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-TW/firefox-60.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2165c1971c390be50a8af0e7a17766952a28c62355ac6c017c0871696b4073dd164795b3a347c3db99fd6b625f02c7e1ab8dfedb48943bcd50a1fcd46aca797d"; + sha512 = "d0465db2b3aa8a52d8e60c480605c069c31f0fcf80cc757980022bb538c0509b99563ce7fd06f2660dc8169dcd3fb6a8681859218365a3ef2ea822eebeb29e12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ach/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ach/firefox-60.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ae783339b7f51f9e7fdddd36086fee47545b0624d42498627b65233bdc157cd30b2efd2272e27699e495b617b888c6c0a179d9026b7e22b5f96112f9cb520837"; + sha512 = "7770772e90d57f9bfe30a5f965cd89fe367ded55c4fc146da547d150c85d0fbe906fa092c2a62ae8df3cccd5702e6a7b1b1680e0522e3164d1df20d2538993e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/af/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/af/firefox-60.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8591da90fb08f30445457e84464219f47e685b973b118829878e5c9bda41a58296190f34959549bec9cfda400cf4dd29b2bff99b8411a3f255b04da4f67789b4"; + sha512 = "c615df0582484ce23cb16556cda202cdd81056d197a78be02b31d3f71059644378c2e24cd42b4afcbb0b610a3f25d87aa1178671ba04437a0885cd90b0954f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/an/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/an/firefox-60.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f60502441cc1d58194329d9853cc5d893ef1255dbf0d07a9344d9d49ebf328473bc978a5cd8ec43de5b57751b698774e090c2ee471ce65423f5a33750262c280"; + sha512 = "ab0fd2292c5aac5ec5e1669c49f0aa6568f0c8d0bbea8c20c18ead6a52e88ddf08e3ca44e24386a9a0102f0bd7eec12b9e2b9e6713a3958cf13bd978106f7009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ar/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ar/firefox-60.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c0174c009dce15fc2836d28cf80063e04ce34d12c04ce2230c5a9e01bbdcdc8073856601db45158bee68b410c4b9d9c53c78bfbe24c8293536c866b2cd13c3cf"; + sha512 = "dac0df9a18f1a7d01c1caf05e17edbffa6029733c6d439c26fed0b12d1fa8ad325fa10ccca51cde25ada1f76e338c0e6a8792e400f0ae44771231a3a49a33a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/as/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/as/firefox-60.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "19f81fb36908e5959818c74c0534d4189025b061222bcd01745033891321a2931ffcfec76a893249a8e7026489ced55497c00ef0dab156416a644a9b88c72a05"; + sha512 = "d57627a4cfad823602cf5e243c5a1c1d8e5e7fd5cbbd345cac1db7ca23947fbe0dfc8a4dad223c6af8b5059f3544a34afde8502ea29f9ed6e41623ce4d856f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ast/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ast/firefox-60.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a9bcf4be3e09509d34f70ea2cbffd4ecbf3aeb15f535080851c63aa2cc8e473fcc9453ef76d25fd525ae79f74eb76a6269919261aff5e8637cac139587b92c95"; + sha512 = "32bd3dcfa0a8c63605aefe54a3c96f2dea826d41edce8c71bdc4da5eaffc2b303c8f1c057ce0a4c6ce5d853d4ef55484b5dacb51f27dad5e50b96cdeaa2298c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/az/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/az/firefox-60.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "14dc7149a69e6dce184e4526cc31f1a8d2f5a833c49ffd1c0ec51d67e8746d27334fa49abf9d487b7656b9f1e71ee0f24e7ef69b9888e6da640ffeab1da12ef0"; + sha512 = "e94f419ec6a34100242babf4afbbf23b98106748b7c2f02b83ff4b0a396bf5e003ec1bb3ed36feeeff82c79fb17c18918ee6e9ddc038ffccc0e121dcaf0eb1f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/be/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/be/firefox-60.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "38dc8e028feb9a523190346b01b9342e865af18db67eda7dd65189087ec1302085a141c708da5834339f5abb36e5eb91cf727eab1dd4feca3b4fda8035f8b423"; + sha512 = "b23cc179f2c4c5b3d79f6009d87f4772dedba67150e014b792a5d892fd1e09a413ed405d86f82e9f74a1c2e36ab76b2a9e41bd49dc7d16483749d195b56791de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bg/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bg/firefox-60.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d8f0df46d689c512996623657d3b2e893d2a465bf22be0679c1ff9204e8e773172f6a857d392fe2278c59c44e91eb588ba4b035b1dca1540ed59645a9d8708b7"; + sha512 = "0d8abaa490719185579d4c24b02ce38971191ec13bdd1798966364c2f9fc118bf46dfa4ae0621d1c6427beeb03f487a1ebccb0a4e49d6ec93372397de56c4851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-BD/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-BD/firefox-60.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "98902ccb5f3b34e3dfcf101c6f1333428a6a1579d5c5c390cfc134fcf64ae0b4fdb493094bd654c39e9e6708bcdb1ffab377003544432a73e4d80c150a17e871"; + sha512 = "db9e15472c21880a07e1337e92fde44ec19a8f6297992b589f20bc05ec37140c41d65097f1759734b9ac13b75c806996e17c70bd5fd0bbe65e3acd6a0bb0a854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-IN/firefox-60.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d2582614773a08192d0ef87eba9392dc4023c15affbfd14227b642ff93bffa8339fcafad0ef0ee8428c8d5f84a4e84f67af376cbd2e14f187c37a294e710dd12"; + sha512 = "2017273b405a8ff2b9bb1d1c1120c74679a1583ddee9f32e4643f62ef22fd3174e4e01f22e374af92b9821a550b8711d2b65987c71b44215236c161827f679b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/br/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/br/firefox-60.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "62457d015c193a77d12bfe58dff76a23c8b71e184965130699d7d97ba9dcdac47cdbbe9858e5a571185e4c56621f5aa4d8ec01a8c081f6157a98c6ef68ee90d9"; + sha512 = "9e7648e312d78397bdc06b0a6921f76acf1916c28c8ae05aa9dc7c70c83d522898ef7e2e847cc3c0cbb19553a572ada7914b60424a46d57c0d7fc207941af3dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bs/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bs/firefox-60.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5fe3bdeabe8804b4604440541565fd45854c82f421714a182b93f5b455935743ccb8f29d7b177316513a3f86bf31f549bfbda296c68f5808071dd3f74744fd4b"; + sha512 = "6e93cd48d03f87e027e913199e0e7b99f5d66d2d81a4d7da52b8f6a38b9b1e43d5ac5ffa56a6eb46c921a695f1826c6f5b936d4622aab3501e6132da26395888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ca/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ca/firefox-60.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "05240abcb093d8a643e636f05fc24f58cd79aebdfd9050dbea00cbec8f25bd61f521f4f85492df0bb4b7db1a69b0d73a322604a0d3741ebd88a3c961495924e8"; + sha512 = "0e49140d11167e2b6c7d15f75f2b121ab44afffaf1af9135012314c9234af25555a5e18a7ae866d3219e6c0c6752f7ae313f66c7312959fc101c32e417feaed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cak/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cak/firefox-60.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "9bd35d87ee4b3e0d867088c5c788c3871ed6c1bdfb5443d7cc4c88501a59a2cd16d58ebe38343d7e9789292ef9ba1392d7a26d86dc56ca916330cf91e7e859d2"; + sha512 = "75c5532e9ee936aa24c5fad77c96fb8aa9e84d3531ac6d36330fd3c324c8bdf13f2e7f815d844e639fd06096c6203e4253c9d97e0c7a564b0b393543a892e56d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cs/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cs/firefox-60.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "643daf0dabf25827872158e746355b2cce1df12b696e03e2e1e1ee9beb70339eae1175c3eacb31bef8af45d82772310bbcda00fa4d19219421c636a79b85fd0f"; + sha512 = "32835014bb3b7acb93d566710bf52ebb3bde52f9c17f4b4de64ec598e4a40b9ee8644a2c1866a48aa6598ace07969912eeb09a47811d67d6cb317078e8e99e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cy/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cy/firefox-60.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3742cf47692ef0a6cc3597678601c260bbbcedf1828286ecef73c55b51113b63954d8f1577050f7db647fc5c520c080fd476e2b714c1c7fc4d2a2eb7bb5ef450"; + sha512 = "7b29c7e69a18e817828fd7cfc05faee51a9f9bd1b229a1943443cc3676b4a3e8daf4b52232633c713f0cc3ec4d9ef43a6dae0ec1dcec66caf0ab9d67b1be9467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/da/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/da/firefox-60.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "500ac0b682d60e92a695da8b63c87414f2d86f48fea269946b978fe2e1adb79583c813764d039e2201736d367c86dd91a2ca62a555d3355d25b7c4dc96f9fea7"; + sha512 = "41aa2e220651b92b8aef3e868d1b9080d1872841d5b82cafa7c1f2d1b0db063c487198949643d89fa0121bfa4287b7dcda99c245f8095b1f3dd86bfe960ab257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/de/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/de/firefox-60.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4d0e210832d9a3290271b804bcf3a64c125764c6236bb84af88988c8ffd0aa57ba7e1060985005100476f36a4a93da93469717634665a634d726a1eda372cf73"; + sha512 = "7d25282bb59a627dcf09b39ca15777253593c4b91e61e6f9d4d2138426cf8ee16f6d8e509398824d8697e42eb301db29e6843eebfad5eaee1fdaaba5fbe7f76c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/dsb/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/dsb/firefox-60.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "39b5f2aaf2617a021d15a9da5a3bdb9ce5e56b28e8d61d7d422d5e95918fe10b5608aeb255595f9f92879fc48686337dcb93fc5b8e4a04610523156c8097f579"; + sha512 = "1f1245297135c1c1550db1ceb110546bc0b436ceaf364bbcd531f6df4770ab694c1602de9f39bf0d9083dccdefa1d5fea21cf9f4e46925cf1357bcc5043f8926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/el/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/el/firefox-60.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "bc8d884f1b850d0b76625d4abf1a919481d23a0632e89396ade24841d7bbc9e23eeabed768b7d937bd7d69adeb2146551e25065251d65021240459f197a6d533"; + sha512 = "58763f729f19722446e87dc7f0e8044993f9cff5b7f707c3d1256628d00011c48973f4408a8cbca67551b621f67256a9596d91f353ecd82482e3b9278fe8b687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-GB/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-GB/firefox-60.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "905394e0add0e530b4a0202237ce6c77bbc124543f2fada77ff6d578b52deeb90861ce4b7df907b9be0c12863b4aea9f545ad55729b83e713cdb556c7d1c4404"; + sha512 = "d51d6942aaed323fd82eb833a84ee13e4ce8b2d7c461a5bd1f2f48b2b1ae8c9d900280bd21a2891455bf17711f01cbbe70e793f18e3a0c2e9b15cec274c3da1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-US/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-US/firefox-60.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "75d3f38d13033717486a7b9cd686cdda1dc15d2064f47311b1bc4c7cbd4c1fd783fb1b8298751360f1513e74dcd1f9eefd73967fb248dc52e26bbc92f5914b3e"; + sha512 = "6c849a9fe358e06c9db01fcc1f811c9cce59cfc150423dcbf8f83eb1407113378b25641de67a8ce8bfeea4930937fd0ff4e919648ef80b219f84eebc3ebee546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-ZA/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-ZA/firefox-60.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "9ce1abed9f7bc0debbd34e70c036ae48afe36d87b1cd4df108fd5ff698b3d8e8b32cdf5c8d9ba8b9bba2c7113eddaf9f7a5d015e1b908b47c98f066bff644b40"; + sha512 = "42280dcb3627c457097887b51a2530eaf32850c4b01e25c62fde1c89e3cc8392ad29ee72ed8cdec11d78f776e4d720235e4f33b21883cef0c4c99823f26c7c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eo/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eo/firefox-60.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bf671aa74bd9f22d56864b46d12ac131255c43b2820cda77264f08c48223627e4dff88872240b39d6404a7cec2135788ce5b08506eeeee571c14e2d933d8eb35"; + sha512 = "0ada2ad4b8ef63b0881d1249b29a39aca65bf2714614e5c074d80d8901124a54d63ec5af4301ffe1483f4e70c6cfcb62db398042b8d12005aca7d95079588065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-AR/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-AR/firefox-60.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b282c35954eed46ddf46ed1f0e0ad52440811f6bb0b351337716eed5bd595c519792853003a6f7a742f83beb5231abe8f11deaaa176febe2dcbf84a43eda4077"; + sha512 = "5c548ab1b0ddbf832d0ae42ff5bc6457ff7aee08b8ac3e94ef65a0e3ab326bfdf6f85be8745fca64e66efd2b45ee992499ccfff963ae21308519fca1bc72cfb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-CL/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-CL/firefox-60.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "278245defd36da337383e6970b8afc59c37b207248638db8947a8fa970ca025620dfa8c8045ac2c0f53b4f3e8167425c2f6dc2071574931b43190560ca511ad5"; + sha512 = "509acc1e54e03aadf6c2b1b21d0366d52fa02a51f1983107ef88a7a175226021a574bbdeccc5715bd63ad596f934fa69e1c10bc0122359409632d06bde63f14a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-ES/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-ES/firefox-60.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f0fb467bbace051bc229fbe07f21f29db492d35f3901cfa9b488c72f303a5dcc85a7969517165980ea7182a85c45a3758a7ceedea3c51bb8a31b9e81ae197214"; + sha512 = "e23028c9a8234744001b267ba43899b2740b63e5655ff289d1e45b1132f3fa97e28d7d800bdeaf2d016ede782432db8f7cae1dd8598eaffba3899c9f7a99ff37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-MX/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-MX/firefox-60.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9a0bfa7ec953da8564b34d0e17efb6935bac51399f604ede83f4c0497494a93ce087ea35daa8ba0c52839e8722ce3bdbceb2e1ed17810f5816c5dbc9778bcd72"; + sha512 = "a5974914bf0e664ee4dfc0ca2697be5971563e24249adb6b7a7528be67329ec43005fa77acf9bd51970776e9da110019d8bc353a4d6cbce3a27c122399c88cb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/et/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/et/firefox-60.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "12209ad383627aaafdc4a89b462494f23eb239c736d5f3a1f2541b0ebd5487d6348ac63ccfd4da40df9c8bb929c02a9a54563bd6c53ec5dd87edfdeaece0bb5a"; + sha512 = "9701a3d97558c3a6946294aa3196d816ada9c721d72993a2b10be24640d48ec37c5675abe3a42df9ca986e8b92f3fffabe0649d3be335e2e557f39f63d454997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eu/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eu/firefox-60.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "afc9e8e0fed835420c385f0c19e81d1711a8c99a7b02f1a8e09218ac2a30aac6380ed88040e96a36edd39a057b98581cdc3a043d6222aaf30bab92ca81669729"; + sha512 = "119c5b59dd5520017334db3ff95511ca8ab2d674dfbc85f0cd6f77fac919bbc0e99af18c59f05fb6cdf75f6015cb83ac24d15d0cf4ae3a2b5ed7564c8bc7bf9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fa/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fa/firefox-60.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6e8821bc7678a1d486693b2043031064618ff06309cd5b0dcaad0c9b712a312e43cb948bfa0e5e5af1eb54ac8e258bb6a5464b1369c9759ac72803709f5d86b3"; + sha512 = "c45fa6ace31733812411d597362bc56f4672fb7a8bd9b127eb288d7ddd2de3e129721c2ec44a08d8adbc8c15672328ef62384e0139a1e37c6a12ba9ae35ceb7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ff/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ff/firefox-60.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ecf9565c6d6e8442836dfb50f1ad833cf88ea9eab884dd3d2fe6f1296d6230658093f27e30e953a51c2bd6ba5d69823f1f4e3f5457cc40a4e516b14baa17d884"; + sha512 = "cf96e6cdc941ec347036b5d737d0060a892220ebe6f72a71354a21099a7c82a0fd337bfeb6e6eba53d95af88754687888abc4dfa307348d5073315692a4f3496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fi/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fi/firefox-60.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ca10ece92ea7114a4c91bdebadbab97933232f8610719b5130e2658600b9ff7667834708a992500f31628249bca5c585f08fbced1e98ff31e318a20b68d3e27c"; + sha512 = "0b4bc6fc0559c05b92e42bcd11513ae20d2101384189ffcff337cb017bfbc5a90151e5c4b8bfe29442ffddfb48eba552a06b3a1db24f7dbb78ff45bfc6a4b5f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fr/firefox-60.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2458452a4c239cdc36e744e4116791a310f2a300b913b61dee64e20349dbce8c0290e544027f0b9eca6d50dcc57561e63f4c618ef5ece9cc05815337ce639498"; + sha512 = "0ce803471b565c8ca715b1700a54be80894205434060751c31d8696d1716f3d3b8fc19c5a0baa82e78f7ffe0df462780e479597c975d2c476b10540de1e98656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fy-NL/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fy-NL/firefox-60.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "51cf096cd74d98bb081f9d397ff7eebc4624bfc4b90de8000bdf07dd739a441543d631dc783af1bb8aa3c639492aa1e402541ea979fd7837535874d8a4adb771"; + sha512 = "3dae49cc320f46622ec92d7ad948455a1861f8986cfe9b98bc73035fa41ae44c9b150b9223c037c87c42c5d93c62bdff40784010d2e7f8ee6ee8fb7725c3ee55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ga-IE/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ga-IE/firefox-60.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "680c47e14f7c6a1abd94ac73bba738a44c0bab8745176639283efea617974c40efecf5b43538940c43599bcdb21ff6c4cb380c3c53c0c9915fc542cc647240d2"; + sha512 = "9bc562d1e432e6e45e56de1238b61f27303fe5b475f0ab0528e44f7c15424911b6b699b08e0386dec8cc7c15df9345b7690361b24b9d467841df63d5677392f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gd/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gd/firefox-60.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3702012b6a32bb9878747d85a0a66c69ee68fe2eac25be428b9e07081a90c867cafd70d2cae32b48229fb333c3f3dddc339f43212aaca29508db33f5807ee6a3"; + sha512 = "fd343b25a8f07fd3d5f276372bdeea05bd9692b761051c9fa968beafb6518619ccc40e2d69ef00737ed4da23f092363ba575099137aec85dfb7f6a813384ca7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gl/firefox-60.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bbc4986b7d03bd11041e969ef8341023a95e2f4a524c6cbd2290555ced2669edaf89971bd58b30b8193dd880a068d9bc8b2c0a3b16310a678b19e3f5e60c3c65"; + sha512 = "2be7fd719d946a96325e684a14247ea344e9c5e096378f02629f87bcc1180d01010cf46f3baa4edc2cebeb4fb99aa5e1d79c24e7b2d1c4d5da1c747ae884be3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gn/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gn/firefox-60.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "a27c80bd7041fc80939716b55c631796e2421a5bdd05843d411d6f0dda84a636fbd366cffa214fba133635332318af2d2e67f5e03c719b12368437dcb4341142"; + sha512 = "d19176ca380d778ed407db04712d51098b57090487564ffefbe0d2e25c4a35596e3ba2b10b9d179e886f38a4d3a4fbdfa7454116a49ec82b6701678c3af7d8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gu-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gu-IN/firefox-60.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "14edc663057b200f32f9a4437c0141d079fa5b77eeeee357d3a09342299643aa0ee5146c6dc2fe0a178285d39f530c58c456f8bf6533e7f901cba551ad84f1fd"; + sha512 = "d219e58d9699ff8b3d87822421f032fbcb4f8c3dd7c13b928e7e8a1661d0672cc1582ea55fb348fb168641307d430d66aaa7912e32a9ac1c78091e3f46867723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/he/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/he/firefox-60.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ce57395416083abb353c45050b6f6fcc8c7b9affe81d6e8504b8c6264b806ce33a44bc018918df92cfcdef047d31c67640074c63447a76c65f5928fbf6b0f50a"; + sha512 = "cf2e5f7f7da94e75f26be5fb6c9e90d089dbab94779fa026ab61f87bbbb0e6ae75e16160c65f19de809bf6527b9d8a92bb0cec97ad18657b07ebb107b88edd6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hi-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hi-IN/firefox-60.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a3621b49b47f835381df92712044a1d9d4655bb0d4a8502841761a60c8d00f0fd0288b8a6574aa2baba88ab8cfbe714c866bbb493aaa1bb382f75ca069f1a97f"; + sha512 = "08626ae0313f7227eb144bd264a6f9c7d2e041b88fce8f1ea182bfdf438496ecc1899d9caf76bf00b6ea25604fa6032807766a93de088764e17a2c8449bd548c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hr/firefox-60.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "49cb57fc321b67e1b5c9e516b72d36025d22abfdc49bda180cca0194cdc0465be5c0e7edd9b98714eb3b1a7c0a1946bd28d8b9ae59e2ac4e9f45d48916cbfeb2"; + sha512 = "1c9e3ae0e271ed1ed332fe1c6f820cd0ebf0cb01e86ec713b9523a7247efb8ddd4c6d5f0dd93d5522adab2e18e1bcf9ed44ed2a86be03643f1836e260b498524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hsb/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hsb/firefox-60.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c8488108906636a4a93447ca28176013e161c56e86d16b535cd73bd27dc568ce22fccff1d26a520a76578c31d870637afcf04ae9e104fc6b347701d4021eb98c"; + sha512 = "669c3c36fc77359edabced7532e558d0f4e24fef66766b49ca71b4f32d19cc3a1856fc92b716de8507d742905fcb82d6d23f62d542f5adf151a95b99068c7195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hu/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hu/firefox-60.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "69bc30e00e39f2c3ae4da333fbd48a595dcc84f7e9e2cc0691e04658ab02e48d2ac6a1e9194faba7a0c28df3637ff9d213708812436200213721136775243d91"; + sha512 = "c84788b5f7c670e0a0afda91f47d91f51a40e4441522e049b850bed89908363c74dfea7c9023bf3d54068c1fcdb7752f327f57b6f8812e880363881434f893f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hy-AM/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hy-AM/firefox-60.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "155c1a34a252cb1789c85ce4d757f483cc51b62d1f8bbe6179adfe5642a9693f1d202240a1765c5966602c03f95dba5c8ae58cd9a0c98edd65da101e61593cfd"; + sha512 = "ca81e92cc2ddf30c55dbf7124c4f11f0c2dc00466d17e8f518d2969ae57e04e2a543118756bae3e55bc72e668bc9e78ea1e11d952fb233e43941560720cfa90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ia/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ia/firefox-60.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7e603f5d72c0b060404d6639858051951a4aef9d61f3e1e813e8c0167896e15a4b837d6f0eae5da8b26acd8b5899c7a557e5e259a797b096a6e6d8eca2cc7177"; + sha512 = "8914b9e45e37602eec6aa20a77ed5c9cf618b0c5d789fbe1821d13ea909148606923d1acbb79006c3fc3e38a4657e926eab02d91a1f47717a9b6f527c935c629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/id/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/id/firefox-60.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "82179d401af39f949057153062190214bf294445964a6d1c63102da1a7f94ce3327351e6257e82bd66c4586791a73c11e2394207514cab6b8ac76fc7f4a2f147"; + sha512 = "ccdc3eceb51e7ee33f3a49bbb752055bd000152dfe3af1bf9bd7d8a617e217c8615bea4c3ce1d8bb51ab60477956867f5ce93bad472da47fbf47404ab0db9524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/is/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/is/firefox-60.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "20237dc74245241a289a4a51964d19ec0ae60732c2a528de412d5ae70aebc1b58c4d4ad514109c01bfb1bbd83d4be22bfcf18b89361eeff0e9024bd07acfec35"; + sha512 = "802c8d9b77678bdf051633b19a452544028a4be76fde686240a78fad9d25dc7ed38de0c58b54fbe214bcdc46e0cd1b6f2cad5ec646a8fabe3e8c7072b84b627a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/it/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/it/firefox-60.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d15b7b6a4e56676a45d2a0c55612de6b57a5d90558bd826d3c9047db831551893cc288771826b95a0ceb587b9bd82e5b30c914f9dc7070bb09a93073222e2bea"; + sha512 = "44cc35fb9e6375739c5e88bc8e7489c15a80faa9d0327ffb2793916d2674cf71a4b237a41073f05477fcb142bdac8d4ada684ce2101027f551a7241eb46bb7b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ja/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ja/firefox-60.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e47706e58a216f0f468bd6972d0373c3795a33318f811064b1c7dbf78a955bc65a62f8f27d66c656b002a4301043485abeaef8c5ef28622e65bc355cb1fa05db"; + sha512 = "8daac42dcb02ad640a56196ce500b9528c4fbc2a562549f08d76bfd990e51dc2c938a99becd26860c659e4bdaf90465d6c9c909f6cea95030c61839adc79a4a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ka/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ka/firefox-60.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "84c141262f4c2a7ece6ae6effb47ac2ce277da9db4bf1683dfc62e78dea5a0daac52647279da7ef19e439c8622678e235fc90763a0e19dcbf156aa0e2b30d8d0"; + sha512 = "2cd50870e0ebad8d385b5e1feffa546dbdee31c2916277c36afa9835d01f9e9dc1d7d4c0f386d4baca38eef11a6c0b1cf1657bc7588a1cd5512e894b12acb9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kab/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kab/firefox-60.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d5ca56b0d58f9acf8577cc1a69f1e0213a2d9e6c6ad70f6ef2b234d6ca87ae4b37489f69f7d8003a71a7992c6443700c8aa2739c58bafb34d3f99ecbe2b9aca3"; + sha512 = "8c292f95480d21ad521df9e4fbbd580306c2615705a37a75ceaffc8f6ca5a24648fa1e0bc97006c34a38b6e58a523a487953c414395c1bef8f58c11b68bdf5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kk/firefox-60.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8b892727929298025c9f7c212da27c6941afbea15a07b5212bae363b358c05ca5373a1fcaf487e2f4f2aa5a491ac0a244e74240b22d80125140ea563432bb7b8"; + sha512 = "285e6bb268d6b9968d9a0d2cda10c82a790be9d0dde686ba3c0230d84029eae28943e1edf70188fb32c96a7712f13ed9087eac57d690bae222736593515e80e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/km/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/km/firefox-60.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "11326282020f7b673b78490452fd47bfd932c99ed523b87ef4d99b55a189069665d1e8cb7d39d0f45a673e1e36e0bb689b9454c9047c1f701dc1c9b18055f043"; + sha512 = "a939d51066e185a68170bd7c3d21523c4e3c5d69189822496ddbde0bda46ffba3728211efcebb89808ca6d70d76ba12547bfdea8c8fb3420000dbe39fecb8232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kn/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kn/firefox-60.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "842005f68c58fbfc6c831a7515e0ad5078697e6eabf40294fb1c0b8bf45497549f0636b6a9d53973f64d0d522d601cc0d872ce6f515c4a488c2aaa563b70da60"; + sha512 = "2207b6883e5dc506d556f8f79bc773f304168029b3282835282296c8b2104ebee6a12e5b1f3887645d366339bc026e53021a004bbab893e3e0362ca28921c78d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ko/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ko/firefox-60.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "aa8bf2c373fe549a59f3412e3b155164c3f4953257f7adb6535c3e4cec494e1191f25dfff9475fa610cd3ab765c10c4a303c895c78b35720483677a87613923a"; + sha512 = "02b13260a74edecb18543679e8d0f969d95b40f87dc237f39465399ddfb5cdd66293408ffda594a53a6514a83ee120c464f3827064b6a286187916109eb0cb03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lij/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lij/firefox-60.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "fbcfad4fae4dcd132ccbc2fdbf7cb6f0deb49357c987c52edcf87b25d55684732b5e6a834d0263996620c2b4149e06b5e82a097807d8673a8b7df6c0cb9a0561"; + sha512 = "2386a05577d90599c48c04083ef1305d84b7a88b6cf22eb331fcda80ef5678755f7d60f418c053dda9aa992aab5ac6ada99bc5e76afca9cec1dd0d250313d277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lt/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lt/firefox-60.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f388751a01ed0214c284ec1ef1045a7c66c7a201901ad48370d7fa3c0e06e2b66c3ecc42357c781b58f6308efcf74e6b0c3902a8db46b11d0b39435294eb5e42"; + sha512 = "6eac885d100539167429293655033e86387d50fddc6d6702f5b9e8ee6f21758e3bf01e340c4dee702958851cdf89c3159ed940545b2d439f8d32a90bc3c272a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lv/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lv/firefox-60.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f932a06b7667762f41c410e394b4ec5cd91116cf82a774899b48045143c6fe88840ba472d91c71f7088f420563857b185c99cbaee884acb2ad760ce7f83abcc4"; + sha512 = "984840eff4cf03915d04ca12ed78ce06db9c765db069d2cb647d3b795f8fbe6927f6abfa5d8ccc1c2806f10ab45fa7d612a08f4a0aee1b129c9aa4ad31bf4613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mai/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mai/firefox-60.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "34da4ab327eba8076fd9944ad1c86b6e0e300df870b5a7ce906c7666df8c8ba7c76c792da7d8776150710bf2e8098a0ee9de86c273b19f6fdeadb5978258357a"; + sha512 = "b063a79532ec9345751d69a41a1e3542256c2b623532a524724eda4f04aba6f5174c568cb45f60e332b1224f3cc0f9a0e641e455e3668cbbb52048571715a559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mk/firefox-60.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8b92fd90754604535c641286e465b720400505e86d778d554364ba6e3fea9db038607bc0638e426123760de59a4a920d21fc4522d8e3e155f47d834ef7db4cd8"; + sha512 = "944882edf6c53dc02682733d50dd09c1df3b06c8bb32e05ee1307504936ced2d408623b7ec6588aac3a26e5c82861cf5bb4db44cd4462c9fd8d9fe62dec19743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ml/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ml/firefox-60.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4ce610e4b8979027e12dc07cca350f467d9f48c9c8cff1f52d08452616cab30dc8c49ce967ee49afca1c4905121d93ec00be9892b7b613736f1daced144f4347"; + sha512 = "b206d4ceffcf460c73b31326ce2a7cc5d8fefd851a3d824a0012793d0bb0cd773b6abfda81cfcb721f11b3f6b4f38de727a04ab2a32a56f3f7ab7abde6632d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mr/firefox-60.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1c1092ee47d62addc304dc81ddef6fa2987afd778ed8deb2796c862496bba584812a9acad11deb045c050fe80aec523de3b007488bbd23fc039767254b8f5918"; + sha512 = "965c85edf69d05c96f3f23b987376c3747dfe9694af92f925c405a42544ac8a2992782c7aea60bce3fab4072db153b37e0f2873a4f42e564e821731eefd05400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ms/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ms/firefox-60.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d0e4257f953e907c2ebdeafb7c60e3407906f908a9724ce6674842a2c87692963d0d932ba16e92ab0506cb91461ad07712178914f38feeb0662cde7b0fe035c8"; + sha512 = "ae5938803a9acc6871577d6629579c0bd5ac4d7404e87cfe373876b94204d5af1110425400f9a7642b13bf2a68f32f2c485c8b9e3565f4d3c49ffd967a8e6df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/my/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/my/firefox-60.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d77bce209f0b333abf132f9d8220b5d808e7aa45930f509278b9666c4f0bf03d09cd9a38752af7924a66f3c1171260a92ffee2ed550c75c304065e413d9d25ac"; + sha512 = "4fb3ac47fcd3b7b36bb66fa24ac82bf9ade26fbadf8eea125b78fced6222ae0f2c3c45638b3511b630b50e27fce70739733fbb357744ba89febd16544703b356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nb-NO/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nb-NO/firefox-60.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a1d86b6859599df2680e68e166e411590eda852923117051e28c14832c061a975dd535b11439639e44b1ea85bc4b409aada94e01bbda8847d4ca5239268306f3"; + sha512 = "c469e49346a29b8b2bb87b6d3be37f72be7db18977a9085240184a66cced8da5c8a62d09c84424985418e106d8cc1a2359ce8778e515430188ff6921d403b42f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ne-NP/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ne-NP/firefox-60.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5cd668f8c4295bffd14d769557f0be86b643ade50990497d72f15f5da15e1b4e82cb9b671045f445e87987f13fc97d05d04970d9fb559db1edc0122bf08871e1"; + sha512 = "5374a889f9ae7934c4138b4742dfe50c360858e460b7e348be5ba7196f001453466c84b8bb55e8c1178a194e9500831684f50866c13ccfdd6228a8fb4d17e607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nl/firefox-60.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a0aac7fda38ac8f85ba341a11b1e90bb21dd5827e5201c782adc854a5b159a5555eaacc8df78bd6ccfe6945fa4502711b655688e61bf1d24748872da7830f522"; + sha512 = "f937a25191c60c973b0676cc9ad993c07c221dbdc3c3f794c8cfbb2981ebe4d85b0450702b5c7270f47f6daa7b55bb4fb617e113686bc7b496811f5304ae8053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nn-NO/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nn-NO/firefox-60.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e40c0bab77e5437c77a2db272444d0fe6874b9e153f84033f0bbc21a3d987562d77b5e37da82accc1e996682b8cdfc8eb67c104134191414e6a86f755130aac0"; + sha512 = "d95de4ef017c0fb951fcf8c90488acc63f5fa82ec7c72bc87f02aa4f2f4f75c2f4cf1a805958fadacd65759e68fef1be21181ad8511c6d1158bbf331c72b97d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/oc/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/oc/firefox-60.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "86a2193d5d442dad54fa55d83f0788d3e30b278370ef6b5836ad06e36307b599155ce2bef6760e6c73c56f4badfb1ad63073d3348395c598e13be73b2fef762d"; + sha512 = "d4757d7a79b953a9aa92363c7fc40a7545fd7dcfa5ed03ee45af2b48b71b74a0fcbb841fd580244e6ddcc392c6fd105fbaaa03e42256522e2b51e6b18f433fb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/or/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/or/firefox-60.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "b10a8f799764a2933d6a3843848028bbd8f6cc7fbe2566550426c2f066699158f654bb6913e57585fd695bd775efa29c054c5b7992efd1110d3e7135723ce206"; + sha512 = "e5d6ec46f23bb31fd32ec5bf58049d7d948fb7632a198fdac34c004c23b58d2bb08c163e4b53e789529d1f6232fd050142a0c84d7d43d1d334ad3b66857a747e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pa-IN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pa-IN/firefox-60.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "5b0e9b50dd17472919cbcbc04dd8edcdde706d08421723e7afeb978fb31422e49751a4377a414b330ee81a6ad0e6ecb508db28d9a6a9fddd6e915819c1895fe5"; + sha512 = "bc2d7ef61b866fae30e6b2fe6c542e206e879d4d0edeff4764a635c9927430cd763e6e907d8676914a5dc95d7a670958f332a62d09517446cfa1a32ebbc858df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pl/firefox-60.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "49f9ff7f27dd04ff0c05b82b82d9f3864b3fa10cc27fe86099773e4984f6ae8d6ab8be964d345801a4bbf84b5fd28e794eb850d67f5e82d8a1a693ad77e8f396"; + sha512 = "c8ee365012576e66468c848d232af3d28796fc7bb8a2971e953ae0f4783b3eee06bd4c1da5725732ee5bd964c2447d1d3cd11041f5d56d88877fc36a6a568dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-BR/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-BR/firefox-60.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e4e6a6b5017297faff42ea399519c414530b2a281a9e8d20858c10b464e06d989f145b78b955e653fa5f11895a2b375d549bf8bad01b10fb4b8c88e7b5aab2e1"; + sha512 = "e708e25ba08c0ba92981c0abd27b170086fd7e54be5604ba5b6c4be47012d4cc467f5ee81e5a50ee1ccf413d5e4e3fa29fafca0ce84d4b35001e59e46afa796b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-PT/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-PT/firefox-60.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6acb042f4e22f67afb66a2a34f7c3865b77fa59dee2e163594f87c0aff0e409d3f252ffdb1986a4f7d776ece974ccb8701c90e72ee4782ea774298f801782271"; + sha512 = "5a227d1954a93f35d83b7f89b48d6fef10f1ce09c239eb84a3fbf76b2c93f03ecb0890a9c18bc2d2edb01fece405aeafe16ced0420ef8b8ff90efb232d13569b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/rm/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/rm/firefox-60.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "822ca52c4be4a5ac19fd1c0436603d587816b3771f39ba1c6bb9e2e047b8e5fce8d8b4ae5109a07c79cbe35ece397cbd9644a45b4a8dd3d79d0e5162bdc6f68d"; + sha512 = "9f2caae925cebb42c49c4c2b139dcfd961174aa8a4dd4d323b65d84b6acbef5beb1e5c844f09454d6fa3af882758137d452ba1cbad5cf017a8b54766f4967ba1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ro/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ro/firefox-60.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0c85d51248e95ba3a6a871b99e97dad557af06686949616990aca8ff939fdc1e4fa3414f91c03f7c9f6b8b1a90d13d8b080bc1a04af40daf57b01681efb8ff46"; + sha512 = "a24ffa5fb4f05bb700025df13384ca5f57183eb94d9826fa82560dc45d50a05c3f96c7c58fb1f609e1efdf3b9d3b86bd720a044d5c5c0ae8886e1d4218189635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ru/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ru/firefox-60.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cf2b8f766237534342c31f6227e653fbe171222caeb4ba8a234dd23389ac5fd4e1ff7a75cb9fa66d25a3022e73c148cce9872f976cc9e0f8b275c828cb30fd5a"; + sha512 = "e256695c13cdce7fbd0650561c2e68ca7b3c6eafef5c451b54db67ebd6dc0c14f1c84622cc2550a573932b4ef1ffe20d1608a2d36d3fe0033ec18399ca80448d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/si/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/si/firefox-60.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4b480cec371499a48f01455a908b1acc90525b8f92a7cc0e0a4dbb7f81daac6ee60b96ef2c8439dd3e8b38d721317b07928afd59ac329ec80575e10d16579f67"; + sha512 = "b42ffbb1c3948555320d89e7732c145061b91453ed6f70a7d334754264ede63759201ff36bf94b1e33814c0d171541e450f8eb53ef95e8c5320d0e408475ba5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sk/firefox-60.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "415a8231ef4303fabe66b9e4f3e34ec8fbabd1d56feb5a2f7e9c63dd30907786255992f56ce340609fdfccec6eb88583c00473fdc52245456aa16078cfe6a834"; + sha512 = "d224b3ae2edeea852e2d26314b3f8d22d7c048eebd540107281b2863c23dd7c7caeab9ec814c90434da515e912acfea35d5331beede5b9e6bc74ec77ca8e8781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sl/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sl/firefox-60.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e3f4374669d2ef1cb029695ac2945147f7a47d6b97a711f99a0e622aa6919dc30505f19879018f6df4c1f3086937c5317ad85945770ff3cfd7d86e89bbd22886"; + sha512 = "c3c1ae0ce8858d1dfeba2e56d9b92769ab06585c86519f754f3ac97a527816bbf7c56df6e8055c04e7b06370c1b9c397ca522991c5f23371ef4e76fb3811cd23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/son/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/son/firefox-60.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0ca8209e1ca51d4529b6dc20b7c7d15f8e5307a4b4b292a6c6eaabf4919d91c35a6d35694031eac5889ea17ef691f34683210de3590c9bc768bcc5f444b6a0c4"; + sha512 = "7622a3c211e34c48185e5756168378d60bbfb52784cb9b4e1b37d9e985d92d3d88ba6b29b750578136db9beb5f2123cb1b7c9f47d4b8139b0441b92884620c4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sq/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sq/firefox-60.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "27613a71060a22665d6332b2f8e5e3c91c98a8cd3207b94a67ebfd08b8604c7bad834e4cc2bfab10f9f0897696925e19addee42eb45eaca9b358fe15136c09a9"; + sha512 = "8f4f30bd858bba7c2e90655821395522f6a96e38ff169334b034f182162294af8ca2d00da375e03c3e18e1c96c113333ec4f7d41ac01d385a12a7acb3e188653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sr/firefox-60.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6234e96196069614a25ddf751f820f5787e77f75d0adf91c9a479749471c75cef114d4a3816b4d63227344c4ae9915756c81e862aca3282d467f86fd42faee99"; + sha512 = "00b4b3ef5d8217d7acfb2504c86338ca729f9ca3b69f2a0616def97ca88bcf61f2669f1a4e4acf4ccf5473db08de53c4308a342cc3ce944634743fdc1b8e5a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sv-SE/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sv-SE/firefox-60.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3b5f8c85ffd4037aea0f8de95c77ac29f227e6ea02cbd8fdebbfc50ef6a03c6b7d31f695c7e0eb54dbd4d1d5471edf0c4793bf39e78b846c287f35ffc5a01aab"; + sha512 = "287ae1efdc8ec6a34165bd4588b51c0f81203685d47ed59c01922e87d7d9aae9ab23b1351a7297a493d45645635c2da7458b245ef56991e7ec928fe264576e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ta/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ta/firefox-60.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "e965954447ea2b47b949b74c06857c75b31edf724987559fc13ec25c4eb2766811da9929f0430297d4c7354ffe8bc9ee2b8ef7274bc47d1a07af3ed3f0ceaf61"; + sha512 = "fde55160176bf7f5c016d7d780e8a78e556ba6d04e1703e6fd6e90ffa278b23822855e8e26a7b86ff38cf006dad3042ea9cd7d4f75b810efa5f543ac28126f6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/te/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/te/firefox-60.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "05b795c817f46fdbb1b15055203f4622fc231d5344993d96db81c98466724b72e99f8293cab8d560e9c297f7b4197e3cc0449e037096455c480020817aa24a0f"; + sha512 = "5cd75ab1ed134ceae22c0020d753cae351caabf513a025dfe30ab3b146f5c693cdf202f5cb4f48a00fafdfe6584ff693d383a5a3f973e307e9ef056e61bcc43e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/th/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/th/firefox-60.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6e10c20163819045bafd07216f7d29ef4d737bf60c9f38e4981871fda4c19112b19aa628ede00f45b71c7b549b2611c2cf74044a1d153fb9fab9b9014184bf84"; + sha512 = "037b7e200bb6246e3d95983f5cd9451a10c54be0fcbbf30ec35ddc115395cf8fda3274a212285bbb1dcadd69f3efaab60606345765ed3f69471c5ea2d47c467e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/tr/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/tr/firefox-60.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1ed74dc5b302c70c9d980f6c19dcda00b399879034f6d49368b0a859434d5ba3097360e15de8d47b136dccd3567d60dbef1f0ac20cdcea3ca8757b2dc189a19c"; + sha512 = "d2cd7b818c64a6529387d5bf540174aee44b5e863479978b15aac20fe62d102f231d2f1367454c5ddf9f3009776e6176fca8d96eeb221730a477c4fced4b45d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uk/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uk/firefox-60.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "be15de40cc87999b145178e5009e144aa1a68d6c7c422dd3f7c1669bdf8c200787ffe650670d29b2ab8230dd25a3ece9bdf9dc5b93331da96df6f28bb2388b1a"; + sha512 = "4f8ed8dbd4f7bc8184ee4c128382a5ccc5dd6b93840199657a6a2ce5e6ffa5b192d7e17d50ea4a4631f2ef0a5fa225506de953a03e92b4f51e731c436d4d2b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ur/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ur/firefox-60.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c4d853ce32374513df113fc95e28c26c2dfdd4e7d2f4771cd23fbad78f29068cd003fd2aad657ea582a5229ee217d3c05c2acc0ee248c10b1630c0bd8b521625"; + sha512 = "4c8db3bf7affc403705bcb5c4da7685a43cc6119e02f3efe8fa499bc22da18a6f43f7d720fe07c32d226d97e6f92ea1611f153d85f7ebd25c038e938acaa3da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uz/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uz/firefox-60.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9912cef59e3f2457126a6623f0e3913248335b29d5c5412b6ddd451aa32e455cf3d4a752f975c6b06a9a4dcbb2511cff6cb918b0bf3564c8e8c37a06f79e862d"; + sha512 = "933c279629ce254da1f7886825a934413a129e2371eb72a8999dc846e0cee12648e68ea9f3b01264aea4c1b5fb2f9081e039b02bc7f5c808307135e8675e05f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/vi/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/vi/firefox-60.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5ae557d429613cc9bb3fb4220d3242fad8b7b5a625b01bbe662283b78153b9d96f4d27907e63488500a766606196d8292b61614d007c6c5a4391dc8f88332e5d"; + sha512 = "c2bd138c1edd4425ee7f9cf341cb01d2ef04c1924185c8632a7b2e8ce3c87b4847611827dedfd826ad12028d486a27536c2053b9a677edcf74232183f36a49d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xh/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xh/firefox-60.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4fac1b8bce8770812566dd05460d7d580f2fca9b4b006c5aefe50ecb8e24d104f725c0fe952e59492d438e5c98e683bf4b55df12a18748eb3daffa59aa4de35e"; + sha512 = "2ee93f40b882c52b80297075864a079b9a91ad30f9fbb64d64d4eeddf9cee31b717d4fbf59d25c8fd40944a2df2f0b67e95d1a57cb1031277429a7fe97be0d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-CN/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-CN/firefox-60.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0f1adcc43685a0da2e855ad8b679270be7131343f92c4f3f19048049696ce75b03e5a8b508a0d025b1348a66f18e65ccbb7def6382d3bb51152d7b9389f53656"; + sha512 = "1ab340e9827d84d757f7b88c165ff07ab2d6202cdf939b6a50d40e23d09c002a49daaf9d4e7b90fdf20cfe36160e2d6518fcedf455de5a9f49c05badd6f0cb69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-TW/firefox-60.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-TW/firefox-60.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9a53a37523125ae165f2fd71957f748841302918812b0dea1b1b088eb56906524ddb0a3dc27bbfe7e0b9e7adec2823d5656561eed662c9239473fa21feaf8184"; + sha512 = "3886ef200481d8f0dcb4add628144dfda705edeea37f1560fdeee7a45e797b75b885a2e590193d59f84d13b2c848c42d0e0f94986d3f4c514a9410e6924a71f4"; } ]; } From f2b3cdd9502e535e203fcd8adbe9a817453d21c6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 18 May 2018 14:24:44 +0000 Subject: [PATCH 309/369] firefox: 60.0 -> 60.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 35a818dd6c96..87034085c816 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -24,10 +24,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "60.0"; + version = "60.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3"; + sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn"; }; patches = nixpkgsPatches ++ [ From 2f076b403adceb7133ad312b23bdcd3438fbfbcf Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 18 May 2018 14:31:32 +0000 Subject: [PATCH 310/369] firefox-esr: 60.0esr -> 60.0.1esr --- .../applications/networking/browsers/firefox/packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 87034085c816..f5c20a2de32b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -59,17 +59,17 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; }; updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-unwrapped"; + attrPath = "firefox-esr-52-unwrapped"; versionSuffix = "esr"; }; } {}; firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.0esr"; + version = "60.0.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "20whvk4spdi4yb3alb492c1jca60p4p70mgj2bypa7r8fgjqn57pyh9rcvnci61asar0zvmlihq46ywzrijm1804iw8c4wmlv7qy8dv"; + sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b"; }; patches = nixpkgsPatches ++ [ @@ -80,7 +80,7 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; }; updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-unwrapped"; + attrPath = "firefox-esr-60-unwrapped"; versionSuffix = "esr"; }; } {}; From e1a538c0da9107c67dabb5b649b21d575fa1d812 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 18 May 2018 10:39:29 -0700 Subject: [PATCH 311/369] e2fsprogs: 1.44.1 -> 1.44.2 (#40681) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/e2fsprogs/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/chattr had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/lsattr passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/compile_et had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mk_cmds had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/badblocks had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/debugfs passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/dumpe2fs passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2freefrag had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2fsck passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2image had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2label had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2undo had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e4crypt passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e4defrag had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/filefrag had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext2 passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext3 passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext4 passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/logsave had a zero exit code or showed the expected version - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mke2fs passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext2 passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext3 passed the binary check. - /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext4 passed the binary check. - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mklost+found had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/resize2fs had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/tune2fs had a zero exit code or showed the expected version - 12 of 26 passed binary check by having a zero exit code. - 0 of 26 passed binary check by having the new version present in output. - found 1.44.2 with grep in /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin - directory tree listing: https://gist.github.com/78b13b077d5f9da29fc2b256af44e638 - du listing: https://gist.github.com/356acc8c1a54a78ab93172cac717d3d5 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 1c8835a2ed4c..8497dcc0a399 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.1"; + name = "e2fsprogs-1.44.2"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55"; + sha256 = "0s3znfy26as63gdbskm6pxh3i1106bpxf2jh9dppd8d9lidmmh75"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From f07c44bb7c8e71123cab80134eace62bc7ecc6dc Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Fri, 18 May 2018 23:41:42 +0100 Subject: [PATCH 312/369] houdini: Fix libGL (#40736) --- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 7477e5c0af2a..b92012a29ddb 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU + libGL xorg.libXmu xorg.libXi xorg.libXext From fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 19 May 2018 00:55:41 +0200 Subject: [PATCH 313/369] Revert "houdini: Fix libGL (#40736)" This reverts commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc. PR was incorrectly based on staging instead of master. --- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b92012a29ddb..7477e5c0af2a 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" + "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU - libGL xorg.libXmu xorg.libXi xorg.libXext From e385ca7ede12dcf6b115920aa7d7c41d3af5e24c Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 19 May 2018 17:44:17 -0400 Subject: [PATCH 314/369] pciutils: build with dns query support This enables `lspci -q` to look up unknown PCI IDs via DNS queries without needing the `update-pciids` script that the derivation doesn't include. --- pkgs/tools/system/pciutils/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 3cd00b3394cf..c4b5699ffc29 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib kmod which ]; - makeFlags = [ "SHARED=yes" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + makeFlags = [ + "SHARED=yes" + "PREFIX=\${out}" + "STRIP=" + "HOST=${stdenv.hostPlatform.system}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "DNS=yes" + ]; installTargets = "install install-lib"; @@ -26,4 +33,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it }; } - From 75e78eda1fd85ac7306acfe597eb5f55b7f60a55 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 May 2018 18:27:38 -0500 Subject: [PATCH 315/369] cmake: 3.10.2 -> 3.11.2 Fixes #40751. --- pkgs/development/tools/build-managers/cmake/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 3871600f4463..4675014880ba 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash -, majorVersion ? "3.10" +, majorVersion ? "3.11" # darwin attributes , ps , isBootstrap ? false @@ -17,6 +17,10 @@ with stdenv.lib; with ( { + "3.11" = { + minorVersion = "2"; + sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y"; + }; "3.10" = { minorVersion = "2"; sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; From d9dadce7589a77f9cc2d3ca763b6bf4ec082a004 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 17 May 2018 20:57:32 +0900 Subject: [PATCH 316/369] libnl: 3.3.0 -> 3.4.0 --- pkgs/os-specific/linux/libnl/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index c79a4314d6f1..52b5b272fb60 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }: -let version = "3.3.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libnl-${version}"; + version = "3.4.0"; src = fetchFromGitHub { repo = "libnl"; owner = "thom311"; rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv"; + sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be41d5eef493..64f9178cd871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6951,6 +6951,9 @@ in { pylru = callPackage ../development/python-modules/pylru { }; + libnl-python = disabledIf isPy3k + (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + lark-parser = callPackage ../development/python-modules/lark-parser { }; lazy-object-proxy = buildPythonPackage rec { From 0d17a57afab1d33874d03e2fe397116cec2dcbda Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 17 May 2018 21:02:27 +0900 Subject: [PATCH 317/369] pythonPackages.libnl-python: init at 3.4.0 Netlink is the userspace <-> kernelspace communication protocol. --- pkgs/os-specific/linux/libnl/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 52b5b272fb60..1caf91b0bb69 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }: +{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig +, pythonSupport ? true, swig ? null, python}: stdenv.mkDerivation rec { name = "libnl-${version}"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp"; }; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py"; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { @@ -21,7 +22,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ] + ++ lib.optional pythonSupport swig; + + postBuild = lib.optionalString (pythonSupport) '' + cd python + ${python}/bin/python setup.py install --prefix=../pythonlib + cd - + ''; + + postFixup = lib.optionalString pythonSupport '' + mv "pythonlib/" "$py" + ''; + + passthru = { + inherit pythonSupport; + }; meta = with lib; { inherit version; From 60a666507c1511ce48cf933ce6d4e8d727899d91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 May 2018 17:01:49 -0700 Subject: [PATCH 318/369] srtp: 2.1.0 -> 2.2.0 (#40849) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsrtp/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 2.2.0 with grep in /nix/store/6zbhr84zjcsvn8rjngwyqlhy1592pbcm-libsrtp-2.2.0 - directory tree listing: https://gist.github.com/87b0811e10da29e42c97917be0858d86 - du listing: https://gist.github.com/2e969bdfee6739383f70f7509c074b3b --- pkgs/development/libraries/srtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 29ad55eb9d92..c9073fc0b7e7 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libsrtp-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "1q2rf1d2bsypdnw9k8ag6hrh9vbinfa504d1f42fdgdqw31d6lib"; + sha256 = "1ac7xs1djb03j131f1gmqyfmrplblid9qqyxahs0shdy707r5ll6"; }; nativeBuildInputs = [ pkgconfig ]; From afc439d57b3866cb499fe68b94f969079aba7963 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 21 May 2018 20:26:37 -0400 Subject: [PATCH 319/369] binutils: Always apply Aarch64 patch Otherwise various things which depend on `--enable-targets=all` lib{bfd,opcodes}...like LLVM. --- pkgs/development/tools/misc/binutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ac055171658b..fb780734bd7a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -64,13 +64,12 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch - ++ stdenv.lib.optionals targetPlatform.isAarch64 [ + # Version 2.30 introduced strict requirements on ELF relocations which cannot # be satisfied on aarch64 platform. Add backported fix from bugzilla. # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch - ]; + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; From 9eb0301eb24883e49e3264b7bf6c574c165b033b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 21 May 2018 17:08:43 -0500 Subject: [PATCH 320/369] freeciv: enable on darwin --- pkgs/games/freeciv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index a1c1aa9b671d..ee93d162396d 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext +{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk2 , server ? true, readline @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib bzip2 curl lzma gettext ] + buildInputs = [ zlib bzip2 curl lzma gettext libiconv ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] ++ optionals gtkClient [ gtk2 ] ++ optional server readline @@ -50,6 +50,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ pierron ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 9b8b29f17518ff64c128d04d3fda37da99301877 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 20 May 2018 23:45:56 -0500 Subject: [PATCH 321/369] gtk2: fix GNOME bug #557780 URL: https://gitlab.gnome.org/GNOME/gtk/issues/303 This patch will fix the assertion generated at startup for freeciv on macOS. Conditionally applied on Darwin. Gdk:ERROR:gdkimage-quartz.c:250:_gdk_image_new_for_depth: assertion failed: (depth == 24 || depth == 32) --- pkgs/development/libraries/gtk+/2.x.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index d35e47f312f9..d87cf25e690c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -4,6 +4,7 @@ , cupsSupport ? true, cups ? null , gdktarget ? "x11" , AppKit, Cocoa +, fetchpatch }: assert xineramaSupport -> xorg.libXinerama != null; @@ -28,7 +29,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; - patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; + patches = [ + ./2.0-immodules.cache.patch + ./gtk2-theme-paths.patch + ] ++ optional stdenv.isDarwin (fetchpatch { + url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; + }); propagatedBuildInputs = with xorg; [ glib cairo pango gdk_pixbuf atk ] From 0fd461d5b5da30462dfbcec3d3a2bd426700800c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 22 May 2018 16:47:28 +0300 Subject: [PATCH 322/369] db: Use more conventional outputs, also split bin --- pkgs/development/libraries/db/generic.nix | 2 +- pkgs/development/perl-modules/DB_File/default.nix | 4 ++-- pkgs/servers/ldap/389/default.nix | 4 +++- pkgs/tools/filesystems/netatalk/default.nix | 2 +- pkgs/tools/package-management/apt/default.nix | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d4398692a4e6..06dde2ad4078 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { patches = extraPatches; - outputs = [ "out" "lib" ]; + outputs = [ "bin" "out" "dev" ]; configureFlags = [ diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index b6158a61da5f..9d189de77c4e 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -12,8 +12,8 @@ buildPerlPackage rec { cat > config.in < Date: Tue, 22 May 2018 01:26:56 +0200 Subject: [PATCH 323/369] perlPackages.BerkeleyDB: fix db dependency This fixes a regression introduced in 4b06383. [dezgeg squashed in to fit the changes introduced in "db: Use more conventional outputs, also split bin"] --- doc/languages-frameworks/perl.xml | 4 ++-- pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index 2fe64999e139..a675e6665863 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -109,8 +109,8 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db}/lib" > config.in - echo "INCLUDE = ${db}/include" >> config.in + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in ''; } diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index a6af84a6581d..72e27ab9a0dd 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -9,7 +9,7 @@ buildPerlPackage rec { }; preConfigure = '' - echo "LIB = ${db}/lib" > config.in - echo "INCLUDE = ${db}/include" >> config.in + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in ''; } From 7c8705256c3daeeeb062a2c965b77d841ef99a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 01:51:49 +0200 Subject: [PATCH 324/369] aprutil: fix db dependency This fixes a regression introduced in 4b06383. [dezgeg squashed in to fit the changes introduced in "db: Use more conventional outputs, also split bin", also patch .la file] --- pkgs/development/libraries/apr-util/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 7e7864cef52c..3c2ff777608d 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ optional (!stdenv.isCygwin) "--with-crypto" ++ optional sslSupport "--with-openssl=${openssl.dev}" - ++ optional bdbSupport "--with-berkeley-db=${db}" + ++ optional bdbSupport "--with-berkeley-db=${db.dev}" ++ optional ldapSupport "--with-ldap=ldap" ++ optionals stdenv.isCygwin [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${db.dev}/lib" "${db.out}/lib" \ --replace "${openssl.dev}/lib" "${openssl.out}/lib" done From 9a100e3e31a0dd0c7d462787b0aabaaf3fc23a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:28:54 +0200 Subject: [PATCH 325/369] heimdal: Fix db include [dezgeg squashed in to fit the changes introduced in "db: Use more conventional outputs, also split bin"] --- pkgs/development/libraries/kerberos/heimdal.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b72a00d242e9..36ee3fe2d3ae 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { "--with-libedit=${libedit}" "--with-openssl=${openssl.dev}" "--without-x" - "--with-berkeley-db=${db}" + "--with-berkeley-db" + "--with-berkeley-db-include=${db.dev}/include" ] ++ optionals (!libOnly) [ "--with-openldap=${openldap.dev}" ] ++ optionals (!stdenv.isFreeBSD) [ From 020957716e2544db90628762f7561580b2b40d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:29:14 +0200 Subject: [PATCH 326/369] heimdal: Fix darwin build --- pkgs/development/libraries/kerberos/heimdal.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 36ee3fe2d3ae..24adb2a141e8 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam - +, CoreFoundation, Security, SystemConfiguration # Extra Args , type ? "" }: @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] ++ (with perlPackages; [ JSON ]) ++ optional (!libOnly) texinfo; - buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] - ++ [ sqlite openssl libedit ] + buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] + ++ [ db sqlite openssl libedit ] + ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] ++ optionals (!libOnly) [ openldap pam ]; ## ugly, X should be made an option @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { "--with-berkeley-db-include=${db.dev}/include" ] ++ optionals (!libOnly) [ "--with-openldap=${openldap.dev}" - ] ++ optionals (!stdenv.isFreeBSD) [ + ] ++ optionals (stdenv.isLinux) [ "--with-capng" ]; @@ -93,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; - platforms = platforms.linux ++ platforms.freebsd; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3efdf7de0ef4..e3074cbf80af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9411,7 +9411,9 @@ with pkgs; hamlib = callPackage ../development/libraries/hamlib { }; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + }; libheimdal = heimdal.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; From 3d4ef86766d7d00ba1b6a48293edc8363f9d9620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:52:43 +0200 Subject: [PATCH 327/369] librdf_raptor2: Enable darwin build --- pkgs/development/libraries/librdf/raptor2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 46a94e52595c..b7a78cb3daf6 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://librdf.org/raptor; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 1bf30c9223a864bd2c039bf21b83735abf06f609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:53:08 +0200 Subject: [PATCH 328/369] librdf_rasqal: Enable darwin build --- pkgs/development/libraries/librdf/rasqal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index ceff244670f3..07f560fe2724 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://librdf.org/rasqal; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 79476b58830b6edd1a0cfc801b279767255f471a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:54:21 +0200 Subject: [PATCH 329/369] librdf_redland: Fix db dependency This fixes a regression introduced in 4b06383. [dezgeg squashed in to fit the changes introduced in "db: Use more conventional outputs, also split bin"] --- pkgs/development/libraries/librdf/redland.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 402af5d6f583..766b4aa341f0 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -28,7 +28,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-threads" ] - ++ stdenv.lib.optional withBdb "--with-bdb=${db}"; + ++ stdenv.lib.optionals withBdb [ + "--with-bdb-include=${db.dev}/include" + "--with-bdb-lib=${db.out}/lib" + ]; # Fix broken DT_NEEDED in lib/redland/librdf_storage_sqlite.so. NIX_CFLAGS_LINK = "-lraptor2"; From 23a83fbf863b687d44e8cf030cc537fed049455d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 22 May 2018 02:55:26 +0200 Subject: [PATCH 330/369] librdf_redland: Enable darwin build --- pkgs/development/libraries/librdf/redland.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 766b4aa341f0..633611273a30 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl -, curl, pcre, libxml2, librdf_rasqal +, curl, pcre, libxml2, librdf_rasqal, gmp , mysql, withMysql ? false , postgresql, withPostgresql ? false , sqlite, withSqlite ? true @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ openssl libxslt curl pcre libxml2 ] + buildInputs = [ openssl libxslt curl pcre libxml2 gmp ] ++ stdenv.lib.optional withMysql mysql.connector-c ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://librdf.org/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 61a7b056fea8b25c0e5e72931060a5835cf63549 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 May 2018 09:20:53 -0700 Subject: [PATCH 331/369] libidn2: 2.0.4 -> 2.0.5 (#40852) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libidn2/versions. These checks were done: - built on NixOS - /nix/store/lqhvipkml1hdjrc7x44a9qx6ib3h7fk4-libidn2-2.0.5-bin/bin/idn2 passed the binary check. - 1 of 1 passed binary check by having a zero exit code. - 0 of 1 passed binary check by having the new version present in output. - found 2.0.5 with grep in /nix/store/lqhvipkml1hdjrc7x44a9qx6ib3h7fk4-libidn2-2.0.5-bin - directory tree listing: https://gist.github.com/e275c93b988cd78a7716800d30d6d315 - du listing: https://gist.github.com/d80481a1635867ebfce278bd1e58d900 --- pkgs/development/libraries/libidn2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 46cb579c56c4..a100b0cc5932 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1w6jycr5bbawimhb72wxf9ic92yrhfadahfj0b70myw5n81nnjv4"; + sha256 = "1f529jxmhj12q7i1gvw2d9i24zbslz3kj91kbgxac7vgi1q93xjk"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; From a7ab884128e2b95a3532b3a361dd6b6077d58c03 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 22 May 2018 12:22:42 -0400 Subject: [PATCH 332/369] poppler: 0.64.0 -> 0.65.0 (#40786) --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index a96de20ccfeb..960a792822d3 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.64.0"; + version = "0.65.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj"; + sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49"; }; outputs = [ "out" "dev" ]; From 405cb8603724defce74975e4e2ad4a2c797c417d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 May 2018 20:29:39 +0200 Subject: [PATCH 333/369] =?UTF-8?q?meson:=200.45.1=20=E2=86=92=200.46.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/build-managers/meson/default.nix | 8 ++------ .../meson/overly-strict-size-check.patch | 12 ------------ 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 298c669e690b..6022b645172c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,13 +2,13 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.45.1"; + version = "0.46.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14"; + sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; }; postFixup = '' @@ -43,10 +43,6 @@ in python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) - - # No one will ever need more than 128 bytes of data structure - # https://github.com/mesonbuild/meson/issues/3113 - ./overly-strict-size-check.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch deleted file mode 100644 index ea0e9bcd7eac..000000000000 --- a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py ---- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500 -+++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400 -@@ -406,7 +406,7 @@ - }}''' - if not self.compiles(t.format(**fargs), env, extra_args, dependencies): - return -1 -- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) -+ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) - - def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): - if extra_args is None: From cd1fb3babf420a8f85f07beb61a9769f38adfa24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 May 2018 20:59:04 +0200 Subject: [PATCH 334/369] systemd: fix build meson 0.46 no longer likes receiving both -Dmandir and --mandir. I removed the flags from the expression in favour of those in the meson setup hook. This also fixes manpages which were previously installed to $man/lib for some reason. --- pkgs/os-specific/linux/systemd/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 89bd123d9382..307ba9f43fa1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -101,20 +101,10 @@ in stdenv.mkDerivation rec { mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) mesonFlagsArray+=(-Drootprefix=$out) - mesonFlagsArray+=(-Dlibdir=$lib/lib) mesonFlagsArray+=(-Drootlibdir=$lib/lib) - mesonFlagsArray+=(-Dmandir=$man/lib) - mesonFlagsArray+=(-Dincludedir=$dev/include) mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) - # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? - substituteInPlace meson.build \ - --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ - "includedir = '$dev/include'" \ - --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ - "libdir = '$lib/lib'" - export LC_ALL="en_US.UTF-8"; # FIXME: patch this in systemd properly (and send upstream). # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount From 57200f58f476b2c7e8b1cce69f0ef069754e9231 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:43:04 +0300 Subject: [PATCH 335/369] sqlite3_analyzer: assert, rename to sqlite-analyzer, clean up --- .../development/libraries/sqlite/analyzer.nix | 26 ++++++++++++++++++ .../libraries/sqlite/sqlite3_analyzer.nix | 27 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/libraries/sqlite/analyzer.nix delete mode 100644 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix new file mode 100644 index 000000000000..4b35c457f126 --- /dev/null +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip, sqlite, tcl }: + +stdenv.mkDerivation rec { + name = "sqlite-analyzer-${version}"; + version = "3.23.1"; + + src = assert version == sqlite.version; fetchurl { + url = https://sqlite.org/2018/sqlite-src-3230100.zip; + sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ tcl ]; + + makeFlags = [ "sqlite3_analyzer" ]; + + installPhase = "install -Dt $out/bin sqlite3_analyzer"; + + meta = with stdenv.lib; { + description = "A tool that shows statistics about SQLite databases"; + downloadPage = http://sqlite.org/download.html; + homepage = http://www.sqlite.org; + maintainers = with maintainers; [ pesterhazy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix deleted file mode 100644 index 2c9e69ac741c..000000000000 --- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, tcl }: - -stdenv.mkDerivation { - name = "sqlite3_analyzer-3.23.1"; - - src = fetchurl { - url = https://sqlite.org/2018/sqlite-src-3230100.zip; - sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; - - makeFlags = [ "sqlite3_analyzer" ]; - - installPhase = '' - install -Dm755 sqlite3_analyzer \ - "$out/bin/sqlite3_analyzer" - ''; - - meta = with stdenv.lib; { - homepage = http://www.sqlite.org/; - description = "A tool that shows statistics about sqlite databases"; - platforms = platforms.unix; - maintainers = with maintainers; [ pesterhazy ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6591968ed55b..53c774c5c603 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -257,6 +257,7 @@ mapAliases (rec { speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38af4e3a31ad..36d0fd8bc169 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11588,7 +11588,7 @@ with pkgs; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { }); + sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; From 25ec13a4f0f2a05000635c1d36dae99fe220a40b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 22 May 2018 23:44:05 +0300 Subject: [PATCH 336/369] sqlite: with stdenv.lib, add downloadPage, add version attribute --- pkgs/development/libraries/sqlite/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ff2de38f98bc..ce666dc9c93f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; -stdenv.mkDerivation { - name = "sqlite-3.23.1"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "sqlite-${version}"; + version = "3.23.1"; + + # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; @@ -13,9 +17,9 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; - configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -59,9 +63,10 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ eelco np ]; + downloadPage = http://sqlite.org/download.html; + homepage = http://www.sqlite.org/; + maintainers = with maintainers; [ eelco np ]; + platforms = platforms.unix; }; } From 55807651582419dc94aa5a2a2600b88bbdea1776 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 23 May 2018 00:47:18 +0300 Subject: [PATCH 337/369] sqlite{,-analyzer}: add archiveVersion function --- pkgs/development/libraries/sqlite/analyzer.nix | 6 +++++- pkgs/development/libraries/sqlite/archive-version.nix | 11 +++++++++++ pkgs/development/libraries/sqlite/default.nix | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/sqlite/archive-version.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 4b35c457f126..a0b1220b217d 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, unzip, sqlite, tcl }: +let + archiveVersion = import ./archive-version.nix stdenv.lib; +in + stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; version = "3.23.1"; src = assert version == sqlite.version; fetchurl { - url = https://sqlite.org/2018/sqlite-src-3230100.zip; + url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; }; diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix new file mode 100644 index 000000000000..1f312ecef23a --- /dev/null +++ b/pkgs/development/libraries/sqlite/archive-version.nix @@ -0,0 +1,11 @@ +lib: version: + +with lib; + +let + fragments = splitString "." version; + major = head fragments; + minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); +in + +major + minor + "00" diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ce666dc9c93f..eaeafa741297 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -4,13 +4,17 @@ assert interactive -> readline != null && ncurses != null; with stdenv.lib; +let + archiveVersion = import ./archive-version.nix stdenv.lib; +in + stdenv.mkDerivation rec { name = "sqlite-${version}"; version = "3.23.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz; + url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; From 20c2fd73caa4a5438736aa8e649bc842ef99f5f2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 23 May 2018 00:50:40 +0300 Subject: [PATCH 338/369] apr-util: Fixup apu-1-config apu-1-config --ldflags is giving broken output on the fixed-output dependencies. This broke serf build since db was split to multiple outputs. https://nix-cache.s3.amazonaws.com/log/q35s5jba6p6dpdqlfn9qgy5w0hpa506v-serf-1.3.9.drv --- pkgs/development/libraries/apr-util/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 3c2ff777608d..4e2de01e9adb 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isFreeBSD cyrus_sasl; postInstall = '' - for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do + for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${db.dev}/lib" "${db.out}/lib" \ From aedc169d7fbdc50131f6b6a4c3ccec4376f489fa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 23 May 2018 00:55:43 +0300 Subject: [PATCH 339/369] serf: Simplify --- pkgs/development/libraries/serf/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 81dff49571da..62d8bcccfe36 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -17,17 +17,13 @@ stdenv.mkDerivation rec { sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \ -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \ -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \ - -e 's,$OPENSSL/lib,${openssl.out}/lib,' \ - -e 's,$OPENSSL/include,${openssl.dev}/include,' \ -i SConstruct ''; buildPhase = '' scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \ - LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \ - APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${ - if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" - }" ${ + LINKFLAGS="-L${zlib.out}/lib -L${openldap}/lib -L${libiconv}/lib" \ + APU="$(echo "${aprutil.dev}"/bin/*-config)" CC=$CC ${ if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\"" } ''; From 2e2cbda2908716e263d42f13b8643893319b3827 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 22 May 2018 22:49:42 -0700 Subject: [PATCH 340/369] openssh: 7.6p1 -> 7.7p1 Release notes at https://www.openssh.com/txt/release-7.7; primarily bugfixes. Update ssh-hpn as well. Switch to salsa.debian.org (from anonscm.debian.org). --- pkgs/tools/networking/openssh/default.nix | 15 ++++++++------- .../openssh/dont_create_privsep_path.patch | 17 +++++++++-------- .../networking/openssh/locale_archive.patch | 18 +++++++++--------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 42fcc842ad55..46c0ee0f2768 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -12,26 +12,27 @@ let # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d"; - sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/" + + "e395eed38096fcda74398424ea94de3ec44effd5" + + "/debian/patches/gssapi.patch"; + sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x"; }; in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.6p1" else "7.6p1"; + version = if hpnSupport then "7.7p1" else "7.7p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_6_P1.tar.gz"; - sha256 = "15b1zjk9f3jlxji1vpqfla40cnzy8hv2clk925cvpgz7lqgv4a1d"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz"; + sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3"; + sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp"; }; patches = diff --git a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch b/pkgs/tools/networking/openssh/dont_create_privsep_path.patch index b6d432d5c5de..23f3ab67a087 100644 --- a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch +++ b/pkgs/tools/networking/openssh/dont_create_privsep_path.patch @@ -1,11 +1,12 @@ -diff -ur openssh-7.2p2_orig/Makefile.in openssh-7.2p2/Makefile.in ---- openssh-7.2p2_orig/Makefile.in 2016-03-09 19:04:48.000000000 +0100 -+++ openssh-7.2p2/Makefile.in 2016-07-16 09:56:05.643903293 +0200 -@@ -301,7 +301,6 @@ - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 - $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) -- (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) +diff --git i/Makefile.in w/Makefile.in +index 04e1c8e5..9bd5d01b 100644 +--- i/Makefile.in ++++ w/Makefile.in +@@ -329,7 +329,6 @@ install-files: + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 + $(MKDIR_P) $(DESTDIR)$(libexecdir) +- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/pkgs/tools/networking/openssh/locale_archive.patch index a7f946d693a2..3fe4a21ea47e 100644 --- a/pkgs/tools/networking/openssh/locale_archive.patch +++ b/pkgs/tools/networking/openssh/locale_archive.patch @@ -1,15 +1,15 @@ -diff --git a/session.c b/session.c -index e032de6..44db2bb 100644 ---- a/session.c -+++ b/session.c -@@ -1196,6 +1196,10 @@ do_setup_env(Session *s, const char *shell) +diff --git i/session.c w/session.c +index 58826db1..658dd911 100644 +--- i/session.c ++++ w/session.c +@@ -1053,6 +1053,10 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) if (getenv("TZ")) child_set_env(&env, &envsize, "TZ", getenv("TZ")); -+ /* NixOS path to the glibc locale archive, to be set in the upstart job */ ++ /* NixOS path to the glibc locale archive, to be set in the systemd job */ + if (getenv("LOCALE_ARCHIVE")) + child_set_env(&env, &envsize, "LOCALE_ARCHIVE", getenv("LOCALE_ARCHIVE")); + - /* Set custom environment options from RSA authentication. */ - if (!options.use_login) { - while (custom_environment) { + /* Set custom environment options from pubkey authentication. */ + if (options.permit_user_env) { + for (n = 0 ; n < auth_opts->nenv; n++) { From 454edcd6c0296987e22662904cc9b1f9cb6a36dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 May 2018 10:22:49 +0100 Subject: [PATCH 341/369] radare2: add myself as maintainer --- pkgs/development/tools/analysis/radare2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 5f7b389cc2b1..5ddb03d318f9 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "unix-like reverse engineering framework and commandline tools"; homepage = http://radare.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin makefu]; + maintainers = with stdenv.lib.maintainers; [raskin makefu mic92]; platforms = with stdenv.lib.platforms; linux; inherit version; }; From f567a851a15d31be2ce95856b93a9f71adfae601 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 23 May 2018 02:06:18 -0400 Subject: [PATCH 342/369] darwin stdenv: Properly compose overrides `super` usage was very suspect. --- pkgs/stdenv/darwin/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 24dc30692fa5..951c96877f96 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -294,7 +294,7 @@ in rec { extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; - overrides = self: super: (persistent self super) // { + overrides = lib.composeExtensions persistent (self: super: { # Hack to make sure we don't link ncurses in bootstrap tools. The proper # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, # quite a sledgehammer just to get the C runtime. @@ -303,7 +303,7 @@ in rec { "--disable-curses" ]; }); - }; + }); }; stdenvDarwin = prevStage: let @@ -386,16 +386,15 @@ in rec { dyld Libsystem CF cctools ICU libiconv locale ]); - overrides = self: super: - let persistent' = persistent self super; in persistent' // { - clang = cc; - llvmPackages = persistent'.llvmPackages // { clang = cc; }; - inherit cc; + overrides = lib.composeExtensions persistent (self: super: { + clang = cc; + llvmPackages = super.llvmPackages // { clang = cc; }; + inherit cc; - darwin = super.darwin // { - xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; }; - }; + darwin = super.darwin // { + xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; }; }; + }); }; stagesDarwin = [ From 983e74ae4e9092a302ba281357e33ae9f32a2024 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 May 2018 13:25:35 -0400 Subject: [PATCH 343/369] stdenv: Avoid targetPlatform.isDarwin causing a mass rebuild We want `buildPackages` to be almost the same as `buildPackages.buildPackges`, but that is only true if most packages don't care about the target platform. The commented code however made them all care about whether the target platform was Darwin. --- pkgs/stdenv/generic/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e9ae54811a21..2eac9e58daa6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -90,9 +90,14 @@ let '' + lib.optionalString hostPlatform.isDarwin '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 - '' + lib.optionalString targetPlatform.isDarwin '' - export NIX_TARGET_DONT_SET_RPATH=1 - ''; + '' + # TODO this should be uncommented, but it causes stupid mass rebuilds. I + # think the best solution would just be to fixup linux RPATHs so we don't + # need to set `-rpath` anywhere. + # + lib.optionalString targetPlatform.isDarwin '' + # export NIX_TARGET_DONT_SET_RPATH=1 + # '' + ; inherit initialPath shell defaultNativeBuildInputs defaultBuildInputs; From 4ffa8b6125c83d6e49fbe3574edc053db7ea2ec1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 22 May 2018 17:37:29 -0400 Subject: [PATCH 344/369] binutils: Do not needless redownload sources cascading more rebuilds Unfortunately this is a crude hack that we use the same binutils source everywhere in the bootstrap chain. --- pkgs/development/tools/misc/binutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index fb780734bd7a..db0908952dc5 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -19,10 +19,11 @@ in stdenv.mkDerivation rec { name = targetPrefix + basename; - src = fetchurl { + # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM + src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; - }; + }); patches = [ # Turn on --enable-new-dtags by default to make the linker set From 446cb32ea192a650c90e5e0e20e4862bae2761be Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 23 May 2018 10:11:03 -0400 Subject: [PATCH 345/369] haskell generic-builder: Remove merge conflict I forgot this in 17316643fd1a0bca5cafddaef227327542c2e832 --- pkgs/development/haskell-modules/generic-builder.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 32e7734dd0bd..b6dcf3558eac 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -173,10 +173,6 @@ let propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ allPkgconfigDepends ++ -======= - otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ ->>>>>>> upstream/master optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; From e87bfe08b65fc150f8c9b617c72104d0aca45ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 May 2018 10:31:44 +0100 Subject: [PATCH 346/369] radare2: 2.5.0 -> 2.6.0 --- .../tools/analysis/radare2/default.nix | 41 ++++++++--- .../tools/analysis/radare2/update.py | 72 +++++++++++++++++++ 2 files changed, 102 insertions(+), 11 deletions(-) create mode 100755 pkgs/development/tools/analysis/radare2/update.py diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 5ddb03d318f9..bc5f41bf86ec 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl +{stdenv, fetchFromGitHub +, ninja, meson , pkgconfig +, libusb, readline, libewf, perl, zlib, openssl , gtk2 ? null, vte ? null, gtkdialog ? null , python ? null , ruby ? null @@ -10,40 +12,57 @@ assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; + let inherit (stdenv.lib) optional; + # + # DO NOT EDIT! Automatically generated by ./update.py + version_commit = "18177"; + gittap = "2.6.0"; + gittip = "83ef480221ec29d82c16003c61d0dc86b8851d38"; + version = "2.6.0"; + sha256 = "18jhb9w8c1m09383d2xm2qp0rc240psjygbbs222hzpx32hald5s"; + cs_tip = "37569a6874c8547b349a80823adda9284499fe80"; + cs_sha256 = "0v31367g4jn4baswl62y0rvvm2nf57y91n3731xqblvi6qxj8qkv"; + # in stdenv.mkDerivation rec { - version = "2.5.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; + inherit sha256; }; - # do not try to update capstone - WITHOUT_PULL=1; - postPatch = let - cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile capstone = fetchFromGitHub { owner = "aquynh"; repo = "capstone"; + # version from $sourceRoot/shlr/Makefile rev = cs_tip; - sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8"; + sha256 = cs_sha256; }; in '' if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - cp -r ${capstone} shlr/capstone - chmod -R u+rw shlr/capstone + ln -s ${capstone} shlr/capstone ''; + postInstall = '' + ln -s $out/bin/radare2 $out/bin/r2 + install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm + ''; + + mesonFlags = [ + "-Dr2_version_commit=${version_commit}" + "-Dr2_gittap=${gittap}" + "-Dr2_gittip=${gittip}" + ]; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ninja meson ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py new file mode 100755 index 000000000000..1f16a00905c1 --- /dev/null +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -0,0 +1,72 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix -p python3 -p git -i python +# USAGE - just run the script: ./update.py +# When editing this file, make also sure it passes the mypy typecheck +# and is formatted with yapf. +import urllib.request +import json +import tempfile +import subprocess +import fileinput +import re +from pathlib import Path + + +def sh(*args: str) -> str: + out = subprocess.check_output(list(args)) + return out.strip().decode("utf-8") + + +def prefetch_github(owner: str, repo: str, ref: str) -> str: + return sh("nix-prefetch-url", "--unpack", + f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz") + + +def main() -> None: + url = "https://api.github.com/repos/radare/radare2/releases/latest" + with urllib.request.urlopen(url) as response: + release = json.load(response) # type: ignore + version = release["tag_name"] + with tempfile.TemporaryDirectory() as dirname: + + def git(*args: str) -> str: + return sh("git", "-C", dirname, *args) + + git("clone", "--branch", version, "https://github.com/radare/radare2", + ".") + sha256 = prefetch_github("radare", "radare2", version) + nix_file = str(Path(__file__).parent.joinpath("default.nix")) + + cs_tip = None + with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: + for l in makefile: + match = re.match("CS_TIP=(\S+)", l) + if match: + cs_tip = match.group(1) + assert cs_tip is not None + + cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + + in_block = False + with fileinput.FileInput(nix_file, inplace=True) as f: + for l in f: + if "#" in l: + in_block = True + print(f""" # + # DO NOT EDIT! Automatically generated by ./update.py + version_commit = "{git("rev-list", "--all", "--count")}"; + gittap = "{git("describe", "--tags", "--match", "[0-9]*")}"; + gittip = "{git("rev-parse", "HEAD")}"; + version = "{version}"; + sha256 = "{sha256}"; + cs_tip = "{cs_tip}"; + cs_sha256 = "{cs_sha256}"; + #""") + elif "#" in l: + in_block = False + elif not in_block: + print(l, end="") + + +if __name__ == "__main__": + main() From d417ada9a6b13e4a070dd4eb7309adeb708db432 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 09:50:21 -0500 Subject: [PATCH 347/369] clang: only link if LLVMgold exists buildEnv now errors with broken symlinks. Lots of things like this still exist. Discussion in #39038. (cherry picked from commit 7b73c7f49a0a4673987b661b9d679ec595704d89) --- pkgs/development/compilers/llvm/3.4/clang.nix | 5 ++++- pkgs/development/compilers/llvm/3.5/clang.nix | 5 ++++- pkgs/development/compilers/llvm/3.7/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/3.8/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/3.9/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/4/clang/default.nix | 5 ++++- pkgs/development/compilers/llvm/6/clang/default.nix | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 10510c750354..863e7eb22474 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation { # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index f15c989ef510..b61118439ee7 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -31,7 +31,10 @@ in stdenv.mkDerivation { # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index f27e3f0089e2..a63706e95cfb 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -32,7 +32,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 0147485dd58d..c8b2fec5e51d 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -34,7 +34,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index aafe30e4c9b3..fabc6a39d9f4 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -36,7 +36,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 5531fd2ab77e..e8f025c24ede 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -52,7 +52,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 919efdc8ef97..c540a8267e97 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -53,7 +53,10 @@ let # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp From 9416f2980001fafbf6bd635fc7825830ec68c22d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 16 Apr 2018 20:04:54 -0500 Subject: [PATCH 348/369] llvm: remove libedit from clang clang should never need libedit. From what I understand this is only needed by LLDB. https://github.com/llvm-mirror/clang/search?q=libedit (cherry picked from commit 9ee69c27c9b300154f1b26c1c21737cf000656cf) --- pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++-- pkgs/development/compilers/llvm/3.5/clang.nix | 4 ++-- pkgs/development/compilers/llvm/3.7/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/3.8/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/3.9/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/4/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/5/clang/default.nix | 4 ++-- pkgs/development/compilers/llvm/6/clang/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 863e7eb22474..2c5d3524911d 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libedit libxml2 zlib ]; + buildInputs = [ cmake libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index b61118439ee7..7e0163577baf 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ in stdenv.mkDerivation { mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm ]; + buildInputs = [ cmake libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index a63706e95cfb..4ccd00af6846 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -13,7 +13,7 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm ]; + buildInputs = [ cmake libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index c8b2fec5e51d..05893704d872 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -13,7 +13,7 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libedit libxml2 llvm python ]; + buildInputs = [ cmake libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index fabc6a39d9f4..1f6d80ab3be9 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }: +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - buildInputs = [ libedit libxml2 llvm python ]; + buildInputs = [ libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index e8f025c24ede..c6538282f23e 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5aea54b5771..539e29ac5e42 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index c540a8267e97..3d02062a4a32 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -19,7 +19,7 @@ let nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libedit libxml2 llvm ] + buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ From 895fef2b19db36e841175b934ffed1297a961ffd Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 18 Apr 2018 13:13:03 -0500 Subject: [PATCH 349/369] clang3.4: still needs libedit https://hydra.nixos.org/build/72965931/nixlog/1 (cherry picked from commit 2d90138b3b90fb36db50a0954629b2f306795d5a) --- pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 2c5d3524911d..863e7eb22474 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }: +{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }: stdenv.mkDerivation { name = "clang-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { patches = [ ./clang-separate-build.patch ./clang-purity.patch ]; - buildInputs = [ cmake libxml2 zlib ]; + buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" From e28a586f94e77f22d943288ad84f88be23c587f8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 23 May 2018 19:06:46 +0300 Subject: [PATCH 350/369] sqlite{,-analyzer}: use the same src (#40945) --- .../development/libraries/sqlite/analyzer.nix | 18 ++--------- .../libraries/sqlite/archive-version.nix | 11 ------- pkgs/development/libraries/sqlite/default.nix | 31 +++++++++++++------ 3 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/archive-version.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index a0b1220b217d..2325a9c8d0db 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -1,23 +1,11 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl }: - -let - archiveVersion = import ./archive-version.nix stdenv.lib; -in +{ stdenv, tcl, sqlite }: stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.23.1"; - - src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; + inherit (sqlite) src version; + nativeBuildInputs = [ tcl ]; makeFlags = [ "sqlite3_analyzer" ]; - installPhase = "install -Dt $out/bin sqlite3_analyzer"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix deleted file mode 100644 index 1f312ecef23a..000000000000 --- a/pkgs/development/libraries/sqlite/archive-version.nix +++ /dev/null @@ -1,11 +0,0 @@ -lib: version: - -with lib; - -let - fragments = splitString "." version; - major = head fragments; - minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); -in - -major + minor + "00" diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index eaeafa741297..341474326480 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; with stdenv.lib; let - archiveVersion = import ./archive-version.nix stdenv.lib; + archiveVersion = version: + let + segments = splitString "." version; + major = head segments; + minor = concatMapStrings (fixedWidthNumber 2) (tail segments); + in + major + minor + "00"; in stdenv.mkDerivation rec { name = "sqlite-${version}"; version = "3.23.1"; - # NB! Make sure to update analyzer.nix src (in the same directory). - src = fetchurl { - url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; + src = fetchzip { + url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; + sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0"; }; outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; + nativeBuildInputs = [ tcl ]; + buildInputs = [ zlib ] + ++ optionals interactive [ readline ncurses ]; - configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; + configureFlags = [ + # Disables libtclsqlite.so, tcl is still required for the build itself: + "--disable-tcl" + "--enable-threadsafe" + ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -61,9 +72,9 @@ stdenv.mkDerivation rec { # Necessary for FTS5 on Linux export NIX_LDFLAGS="$NIX_LDFLAGS -lm" - echo "" + echo echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE" - echo "" + echo ''; meta = { From b6b8cdd43f9f671a4498367ec51e77171f536de0 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 22 Feb 2018 14:34:45 +0100 Subject: [PATCH 351/369] libgudev: add gobjectIntrospection to nativeBuildInputs --- pkgs/development/libraries/libgudev/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 1e1f3eeb4c73..54760549a164 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, glib, gnome3 }: +{ stdenv, fetchurl, pkgconfig, udev, glib, gobjectIntrospection, gnome3 }: let pname = "libgudev"; @@ -6,12 +6,14 @@ in stdenv.mkDerivation rec { name = "libgudev-${version}"; version = "232"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; buildInputs = [ udev glib ]; # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. From 89e196d971e167867318c8fc2e08cb0782c75bec Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 23 May 2018 13:09:45 -0500 Subject: [PATCH 352/369] libiconv: fix setup hook Fixes issue from PR #40139. --- .../darwin/apple-source-releases/libiconv/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 984e70955162..7ea9d51b4bf6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -18,7 +18,10 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; - setupHook = ../../../../development/libraries/libiconv/setup-hook.sh; + setupHooks = [ + ../../../../build-support/setup-hooks/role.bash + ../../../../development/libraries/libiconv/setup-hook.sh + ]; meta = { platforms = stdenv.lib.platforms.darwin; From 33b8830a85242ad09898a0c90a6f0494c34132ca Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 24 May 2018 03:42:43 +0200 Subject: [PATCH 353/369] ghc: disable format hardening --- pkgs/development/compilers/ghc/8.2.2.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b1bf249149da..6acf3f10ff49 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -171,6 +171,8 @@ stdenv.mkDerivation rec { checkTarget = "test"; doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." + hardeningDisable = [ "format" ]; + # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't # treat that as a unary `{x,y,z,..}` repetition. postInstall = '' From 16da44b5c115fe58048d7ba8aa597ed1598ea090 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 29 Apr 2018 15:06:35 -0700 Subject: [PATCH 354/369] llvm and clang 6: factor out compiler-rt, fix libstdcxxStdenv sanitizer headers Build compiler-rt separate from llvm and clang, and just add as an extra library in the wrapper. --- .../compilers/llvm/6/clang/default.nix | 9 ++---- .../compilers/llvm/6/compiler-rt.nix | 31 +++++++++++++++++++ pkgs/development/compilers/llvm/6/default.nix | 24 +++++++++++--- pkgs/development/compilers/llvm/6/llvm.nix | 16 ---------- 4 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/compilers/llvm/6/compiler-rt.nix diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 3d02062a4a32..d7842bdea992 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -30,10 +30,7 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - # Maybe with compiler-rt this won't be needed? - ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + ]; patches = [ ./purity.patch ]; @@ -51,13 +48,11 @@ let outputs = [ "out" "lib" "python" ]; # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix postInstall = '' if [ -e ${llvm}/lib/LLVMgold.so ]; then ln -sv ${llvm}/lib/LLVMgold.so $out/lib fi - ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output @@ -79,7 +74,7 @@ let passthru = { isClang = true; inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { + } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix new file mode 100644 index 000000000000..333818f7dbde --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -0,0 +1,31 @@ +{ stdenv, version, fetch, cmake, python, llvm }: +with stdenv.lib; +stdenv.mkDerivation rec { + name = "compiler-rt-${version}"; + inherit version; + src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; + + nativeBuildInputs = [ cmake python llvm ]; + + configureFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + ]; + + outputs = [ "dev" "out" ]; + + patches = [ + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 3a7b66f1ed0e..81d41673b251 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -14,7 +14,6 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5"; # Add man output without introducing extra dependencies. @@ -27,7 +26,6 @@ let in { llvm = overrideManOutput (callPackage ./llvm.nix { - inherit compiler-rt_src; inherit (targetLlvmLibraries) libcxxabi; }); clang-unwrapped = overrideManOutput (callPackage ./clang { @@ -43,11 +41,27 @@ let libstdcxxClang = wrapCCWith { cc = tools.clang-unwrapped; extraPackages = [ libstdcxxHook ]; + extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + ''; }; - libcxxClang = wrapCCWith { + libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; + extraPackages = [ + targetLlvmLibraries.libcxx + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + ''; }; lld = callPackage ./lld.nix {}; @@ -59,6 +73,8 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { + compiler-rt = callPackage ./compiler-rt.nix {}; + stdenv = overrideCC stdenv buildLlvmTools.clang; libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 7cb3e88c2f85..8877ccd11621 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -11,7 +11,6 @@ , version , release_version , zlib -, compiler-rt_src , libcxxabi , debugVersion ? false , enableManpages ? false @@ -33,8 +32,6 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; outputs = [ "out" "python" ] @@ -48,15 +45,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" @@ -70,15 +59,11 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp - - # Revert compiler-rt commit that makes codesign mandatory - patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -93,7 +78,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" - "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" From 46eeef1898ffbf57330ec31b96a6c2d89f8fcb36 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 7 May 2018 13:22:50 -0700 Subject: [PATCH 355/369] tests.cc-wrapper: verify building with sanitizers --- pkgs/build-support/cc-wrapper/default.nix | 4 ++-- pkgs/development/compilers/llvm/6/default.nix | 1 + pkgs/test/cc-wrapper/default.nix | 5 +++++ pkgs/test/cc-wrapper/sanitizers.c | 8 ++++++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/test/cc-wrapper/sanitizers.c diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..8f99da805ec1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -9,7 +9,7 @@ , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , extraPackages ? [], extraBuildCommands ? "" -, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null +, isGNU ? false, isClang ? cc.isClang or false, isCompilerRT ? false, gnugrep ? null , buildPackages ? {} }: @@ -90,7 +90,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang isCompilerRT default_cxx_stdlib_compile; emacsBufferSetup = pkgs: '' ; We should handle propagation here too diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 81d41673b251..da5a97a9bbaa 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -53,6 +53,7 @@ let targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; + isCompilerRT = true; extraBuildCommands = '' rsrc="$out/resource-root" mkdir "$rsrc" diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 41a7685ed2e0..06113e40561b 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation { NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check + '' + stdenv.lib.optionalString (stdenv.cc.isCompilerRT or false) '' + + $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ./sanitizers + '' + '' touch $out ''; diff --git a/pkgs/test/cc-wrapper/sanitizers.c b/pkgs/test/cc-wrapper/sanitizers.c new file mode 100644 index 000000000000..93dd78a903ce --- /dev/null +++ b/pkgs/test/cc-wrapper/sanitizers.c @@ -0,0 +1,8 @@ +#include +#include + +int main(int argc, char **argv) +{ + fprintf(stderr, "ok\n"); + return 0; +} From 02297beade7813c6a716e53a5f1373f1123d8753 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 23 May 2018 23:37:33 -0500 Subject: [PATCH 356/369] treewide: add version to packages Lots of packages are missing versions in their name. This adds them where appropriate. These were found with this command: $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$' See issue #41007. --- pkgs/applications/altcoins/dapp.nix | 2 +- pkgs/applications/altcoins/mist.nix | 6 +++--- pkgs/applications/audio/renoise/default.nix | 2 +- pkgs/applications/editors/neovim/wrapper.nix | 2 +- pkgs/applications/editors/okteta/default.nix | 4 ++-- pkgs/applications/networking/gmailieer/default.nix | 2 +- pkgs/applications/office/atlassian-cli/default.nix | 6 +++--- .../science/machine-learning/torch/torch-distro.nix | 2 ++ pkgs/applications/science/misc/simgrid/default.nix | 7 +++---- .../git-and-tools/bfg-repo-cleaner/default.nix | 2 +- .../version-management/git-and-tools/gitweb/default.nix | 2 +- pkgs/applications/video/lightworks/default.nix | 2 +- pkgs/data/fonts/meslo-lg/default.nix | 2 +- pkgs/development/compilers/adobe-flex-sdk/default.nix | 2 +- pkgs/development/compilers/emscripten/fastcomp/default.nix | 2 +- pkgs/development/libraries/c-blosc/default.nix | 2 +- pkgs/development/libraries/languagemachines/frog.nix | 2 +- pkgs/development/libraries/languagemachines/frogdata.nix | 2 +- pkgs/development/libraries/languagemachines/libfolia.nix | 2 +- pkgs/development/libraries/languagemachines/mbt.nix | 2 +- pkgs/development/libraries/languagemachines/ticcutils.nix | 2 +- pkgs/development/libraries/languagemachines/timbl.nix | 2 +- .../development/libraries/languagemachines/timblserver.nix | 2 +- pkgs/development/libraries/languagemachines/ucto.nix | 2 +- pkgs/development/libraries/languagemachines/uctodata.nix | 2 +- pkgs/development/libraries/libblocksruntime/default.nix | 2 +- pkgs/development/libraries/physics/nlojet/default.nix | 2 +- pkgs/development/libraries/qtinstaller/default.nix | 2 +- pkgs/development/libraries/re2/default.nix | 4 ++-- pkgs/development/tools/build-managers/gn/default.nix | 4 ++-- pkgs/development/tools/erlang/cuter/default.nix | 2 +- pkgs/development/tools/imatix_gsl/default.nix | 2 +- pkgs/development/tools/yuicompressor/default.nix | 6 +++--- pkgs/misc/cups/drivers/brlaser/default.nix | 7 ++++--- pkgs/misc/cups/drivers/estudio/default.nix | 4 ++-- pkgs/misc/themes/gnome-breeze/default.nix | 2 +- pkgs/servers/x11/xquartz/default.nix | 2 +- pkgs/tools/audio/mpdris2/default.nix | 5 +++-- pkgs/tools/misc/buildtorrent/default.nix | 6 +++--- pkgs/tools/misc/notify-desktop/default.nix | 2 +- pkgs/tools/networking/dnstracer/default.nix | 4 ++-- pkgs/tools/networking/zerotierone/default.nix | 2 +- pkgs/tools/text/jumanpp/default.nix | 4 ++-- 43 files changed, 65 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index 6ad66a24397f..a89725f6e30f 100644 --- a/pkgs/applications/altcoins/dapp.nix +++ b/pkgs/applications/altcoins/dapp.nix @@ -2,7 +2,7 @@ , seth, git, solc, shellcheck, nodejs, hevm }: stdenv.mkDerivation rec { - name = "dapp"; + name = "dapp-${version}"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index c112384f3d84..d80e8b521822 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -25,7 +25,7 @@ let categories = "Network;"; }; - mist = stdenv.mkDerivation { + mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation { inherit name version; src = { @@ -53,10 +53,10 @@ let --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ $out/lib/mist/mist ''; - }; + }); in buildFHSUserEnv { - name = "mist"; + name = "mist-${stdenv.lib.getVersion mist}"; targetPkgs = pkgs: with pkgs; [ mist diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8af..fd2c0993e756 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -9,7 +9,7 @@ let fileversion = "3_1_0"; in stdenv.mkDerivation rec { - name = "renoise"; + name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}"; buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; src = diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index a27b5a41ac70..f1ec03cb42ee 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -51,7 +51,7 @@ let in stdenv.mkDerivation { - inherit name; + name = "neovim-${stdenv.lib.getVersion neovim}"; buildCommand = let bin="${neovim}/bin/nvim"; in '' if [ ! -x "${bin}" ] then diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 770eb63dc69e..9bec148c7f29 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -9,9 +9,9 @@ let version = "17.12.3"; in mkDerivation rec { - name = "okteta"; + name = "okteta-${version}"; src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; }; meta = { diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index c3085519ec4c..9b738fe3863f 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "gmailieer"; + name = "gmailieer-${version}"; version = "0.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index a56c15bffb2a..15e3d120f20b 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, jre }: -stdenv.mkDerivation { - name = "atlassian-cli"; +stdenv.mkDerivation rec { + name = "atlassian-cli-${version}"; version = "7.8.0"; src = fetchzip { - url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index d8ce1d2c6280..85a4aa02e441 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -57,6 +57,8 @@ let in stdenv.mkDerivation (args // { + name = "${args.name}-${lua.luaversion}"; + inherit preBuild postInstall; inherit luadeps runtimeDeps; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 34ff510e1d8b..2b25d99de2a7 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -19,14 +19,13 @@ in stdenv.mkDerivation rec { major_version = "3"; minor_version = "17"; - version = "v${major_version}.${minor_version}"; - tagged_version = "${major_version}_${minor_version}"; - name = "simgrid"; + version = "${major_version}.${minor_version}"; + name = "simgrid-${version}"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; - rev = "v3_17"; + rev = "v${major_version}_${minor_version}"; sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; #rev = "master"; #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm"; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 7bf83b5621b5..0d7729684163 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { inherit version jarName; - name = "bfg-repo-cleaner"; + name = "bfg-repo-cleaner-${version}"; src = fetchurl { url = mavenUrl; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 0358f850c9ab..ce251e11d328 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -10,7 +10,7 @@ let sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; }; in stdenv.mkDerivation { - name = "gitweb"; + name = "gitweb-${stdenv.lib.getVersion git}"; src = git.gitweb; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index d0376ca7e3de..4d34e08529f7 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -77,7 +77,7 @@ let # Lightworks expects some files in /usr/share/lightworks in buildFHSUserEnv rec { - name = "lightworks"; + name = "lightworks-${stdenv.lib.getVersion lightworks}"; targetPkgs = pkgs: [ lightworks diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index d95aea26c8d4..f990575def0f 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "meslo-lg"; + name = "meslo-lg-${version}"; meslo-lg = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 63dd315e8e4e..1512ef396558 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "adobe-flex-sdk-4.0.0.14159-mpl"; + name = "adobe-flex-sdk-4.0.0.14159"; src = fetchurl { # This is the open source distribution diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix index 10c1107da026..57496d288605 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix @@ -15,7 +15,7 @@ let ''; }; emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp"; + name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}"; paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; preferLocalBuild = false; allowSubstitutes = true; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 5066b0a3250b..2f60fb7391fb 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "c-blosc"; + name = "c-blosc-${version}"; version = "1.11.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 1a73a46d2872..853d23c97458 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "frog"; + name = "frog-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 42d14d083354..61b4559ebab0 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "frogdata"; + name = "frogdata-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index a6f5adb95595..395591be55be 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation { - name = "libfolia"; + name = "libfolia-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 3bc78a96a063..b99cb4f595a4 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "mbt"; + name = "mbt-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 738e53556ba6..779ec664996a 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { - name = "ticcutils"; + name = "ticcutils-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 3ab38a9e84ac..c6c216f5abf3 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "timbl"; + name = "timbl-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index ee1579540c33..aeadb0759530 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "timblserver"; + name = "timblserver-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 8f917c2265d2..ab047d0516eb 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "ucto"; + name = "ucto-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 56b6448d2533..7defa71fc0ee 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation { - name = "uctodata"; + name = "uctodata-${release.version}"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 34ab70e0adcd..7863e596e1b8 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, clang }: stdenv.mkDerivation { - name = "blocksruntime"; + name = "blocksruntime-20140624"; src = fetchFromGitHub { owner = "mackyle"; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 974563c90372..88fafaf3ae6e 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "nlojet++"; + name = "nlojet++-${version}"; version = "4.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index a03ddb9b78a1..1578593b8aea 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }: stdenv.mkDerivation rec { - name = "qtinstaller"; + name = "qtinstaller-${version}"; propagatedBuildInputs = [ qtdeclarative qttools ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 08c95b422776..aeab7b2a040c 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "re2"; + name = "re2-${version}"; version = "20140304"; src = fetchurl { - url = "https://re2.googlecode.com/files/${name}-${version}.tgz"; + url = "https://re2.googlecode.com/files/${name}.tgz"; sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb"; }; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index f49456a86ea6..399486c4d902 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -45,8 +45,8 @@ let }; }; -in stdenv.mkDerivation { - name = "gn"; +in stdenv.mkDerivation rec { + name = "gn-${version}"; version = "20180423"; sourceRoot = "."; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index fb84bbbf1df3..3dc0d3fca88c 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -2,7 +2,7 @@ , beamPackages, z3, python27 }: stdenv.mkDerivation rec { - name = "cuter"; + name = "cuter-${version}"; version = "0.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 1d7b22ac5ee0..62f33a2d2517 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pcre } : stdenv.mkDerivation rec { - name = "imatix_gsl"; + name = "imatix_gsl-${version}"; version = "4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index da9b9df3cd4e..1cf381beb617 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "yuicompressor"; + name = "yuicompressor-${version}"; version = "2.4.8"; src = fetchurl { - url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar"; + url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/{bin,lib} ln -s $src $out/lib/yuicompressor.jar - makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \ + makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; } diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 7a6d6c3861df..0f5ee05349de 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { - name = "brlaser"; + name = "brlaser-${version}"; + version = "4"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; - rev = "a52149823373e11f918d9e6a56eda7242935c99b"; - sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6"; + rev = "v${version}"; + sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5"; }; buildInputs = [ cmake zlib cups ]; diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index 6f9e4579a147..a80852bb027d 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation { - name = "cups-toshiba-estudio"; +stdenv.mkDerivation rec { + name = "cups-toshiba-estudio-${version}"; version = "7.51"; src = fetchurl { diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix index cc1769b48df2..200cc4bae051 100644 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ b/pkgs/misc/themes/gnome-breeze/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnome-breeze"; + name = "gnome-breeze-20160526"; src = fetchgit { url = "https://github.com/dirruk1/gnome-breeze"; sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 585144f74ed4..9c133f9d5d99 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -95,7 +95,7 @@ let ]; }; in stdenv.mkDerivation { - name = "xquartz"; + name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; buildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 6596f1c34ff5..93e7afdce417 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "mpDris2"; + pname = "mpDris2"; + name = "${pname}-${version}"; version = "0.7"; src = fetchurl { - url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz"; + url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; }; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 064c836f843e..793e5c56e1f1 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,10 +3,10 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent"; + name = "buildtorrent-${version}"; src = fetchurl { - url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz"; + url = "http://mathr.co.uk/blog/code/${name}.tar.gz"; sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; }; @@ -16,4 +16,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 661f4f4f435e..93c0f5e346bf 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: stdenv.mkDerivation rec { - name = "notify-desktop"; + name = "notify-desktop-${version}"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 6d5e826c7d75..65e5c9cd126b 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.9"; - name = "dnstracer"; + name = "dnstracer-${version}"; src = fetchurl { - url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz"; + url = "http://www.mavetju.org/download/${name}.tar.gz"; sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; }; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index ec6c9c196788..43aa44809ed8 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.8"; - name = "zerotierone"; + name = "zerotierone-${version}"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index c4cb12cb6938..c4af67b3b481 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { - name = "jumanpp"; + name = "jumanpp-${version}"; version = "2.0.0-rc2"; src = fetchurl { - url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}-${version}.tar.xz"; + url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz"; sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; buildInputs = [ cmake protobuf ]; From 02de1dc70722f5bbd969d1df12cf48703f4d307f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 23 May 2018 23:38:35 -0500 Subject: [PATCH 357/369] unix-tools: add version Uses the POSIX standard 1003.1-2008 as version number. It can be accessed for free at http://pubs.opengroup.org/onlinepubs/9699919799/. --- pkgs/top-level/unix-tools.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 36fba3fbd479..f49e89d30914 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -11,9 +11,11 @@ # input, not "procps" which requires Linux. let + version = "1003.1-2008"; + singleBinary = cmd: providers: let provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; - in runCommand cmd { + in runCommand "${cmd}-${version}" { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' mkdir -p $out/bin @@ -28,7 +30,7 @@ let # more is unavailable in darwin # just use less - more_compat = runCommand "more" {} '' + more_compat = runCommand "more-${version}" {} '' mkdir -p $out/bin ln -s ${pkgs.less}/bin/less $out/bin/more ''; @@ -131,7 +133,7 @@ let }; makeCompat = name': value: buildEnv { - name = name' + "-compat"; + name = name' + "-compat-${version}"; paths = value; }; From 04e5cf666511d6d84d20814557a04f2392fa4a83 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 10:38:06 +0300 Subject: [PATCH 358/369] renoise: add platforms, derive src version from proper version string --- pkgs/applications/audio/renoise/default.nix | 24 +++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index fd2c0993e756..7cd695eb11da 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -6,31 +6,35 @@ # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. -let fileversion = "3_1_0"; +let + srcVersion = version: lib.replaceStrings ["."] ["_"] version; in + stdenv.mkDerivation rec { - name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}"; - buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + name = "renoise-${version}"; + version = "3.1.0"; src = if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2"; - sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; + url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86_64.tar.bz2"; + sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else releasePath else if stdenv.system == "i686-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2"; - sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; + url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86.tar.bz2"; + sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; } else releasePath else throw "Platform is not supported by Renoise"; + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + installPhase = '' cp -r Resources $out @@ -52,9 +56,11 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise ''; - meta = { + meta = with stdenv.lib; { description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = []; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 5da73fc3ffff3ae8519a9af906fbc84ef926bb35 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 10:47:38 +0300 Subject: [PATCH 359/369] okteta: add version attr, clean up --- pkgs/applications/editors/okteta/default.nix | 41 ++++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9bec148c7f29..abbffeb91807 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,27 +1,34 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, - qtscript, kconfig, kinit, karchive, kcrash, - kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared-mime-info -}: +{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts +, qca-qt5, shared-mime-info }: -let - version = "17.12.3"; -in mkDerivation rec { +stdenv.mkDerivation rec { name = "okteta-${version}"; + version = "17.12.3"; + src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; }; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg bkchr ]; - }; + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; + propagatedBuildInputs = [ - kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 - karchive kcrash + kconfig + kinit + kcmutils + kconfigwidgets + knewstuff + kparts + qca-qt5 + karchive + kcrash ]; + + meta = with stdenv.lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg bkchr ]; + platforms = platforms.linux; + }; } From 543c8c4eb08f35b70a3c787b69832f0a2535d3f9 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 10:52:10 +0300 Subject: [PATCH 360/369] atlassian-cli: add some spaces, inherit meta.platforms from jre --- .../office/atlassian-cli/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 15e3d120f20b..be31f5fd102f 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -1,14 +1,30 @@ { stdenv, fetchzip, jre }: + stdenv.mkDerivation rec { name = "atlassian-cli-${version}"; version = "7.8.0"; + src = fetchzip { - url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; - sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; extraPostFetch = "chmod go-w $out"; }; - tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv" - "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; + + tools = [ + "agile" + "bamboo" + "bitbucket" + "confluence" + "csv" + "hipchat" + "jira" + "servicedesk" + "structure" + "tempo" + "trello" + "upm" + ]; + installPhase = '' mkdir -p $out/{bin,share/doc/atlassian-cli} cp -r lib $out/share/java @@ -22,10 +38,12 @@ stdenv.mkDerivation rec { chmod +x $out/bin/$tool done ''; + meta = with stdenv.lib; { description = "An integrated family of CLI’s for various Atlassian applications"; - homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; - maintainers = [ maintainers.twey ]; - license = [ licenses.unfreeRedistributable ]; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ twey ]; + inherit (jre.meta) platforms; }; } From 4e049b2fd477015778817e809c0bf5544f8a1c77 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 11:02:12 +0300 Subject: [PATCH 361/369] simgrid: cleanup --- .../science/misc/simgrid/default.nix | 111 +++++++++--------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 2b25d99de2a7..522c708bf902 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -10,41 +10,37 @@ , moreTests ? false }: -# helpers for options -let optionals = stdenv.lib.optionals; - optionalString = stdenv.lib.optionalString; - optionOnOff = option: "${if option then "on" else "off"}"; +with stdenv.lib; + +let + optionOnOff = option: "${if option then "on" else "off"}"; + urlVersion = replaceStrings ["."] ["_"]; in stdenv.mkDerivation rec { - major_version = "3"; - minor_version = "17"; - version = "${major_version}.${minor_version}"; name = "simgrid-${version}"; + version = "3.17"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; - rev = "v${major_version}_${minor_version}"; + rev = "v${urlVersion version}"; sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4"; - #rev = "master"; - #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm"; }; - nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind] - ++ optionals fortranSupport [gfortran] - ++ optionals buildJavaBindings [openjdk] - ++ optionals buildDocumentation [transfig ghostscript doxygen] - ++ optionals modelCheckingSupport [libunwind libevent]; + nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ] + ++ optionals fortranSupport [ gfortran ] + ++ optionals buildJavaBindings [ openjdk ] + ++ optionals buildDocumentation [ transfig ghostscript doxygen ] + ++ optionals modelCheckingSupport [ libunwind libevent ]; #buildInputs = optional luaSupport lua5; - preConfigure = - # Make it so that libsimgrid.so will be found when running programs from - # the build dir. - '' + # Make it so that libsimgrid.so will be found when running programs from + # the build dir. + preConfigure = '' export LD_LIBRARY_PATH="$PWD/build/lib" - ''; + ''; # Release mode is not supported in SimGrid cmakeBuildType = "Debug"; @@ -59,58 +55,57 @@ stdenv.mkDerivation rec { # For more information see: # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list cmakeFlags= '' - -Denable_documentation=${optionOnOff buildDocumentation} - -Denable_java=${optionOnOff buildJavaBindings} - -Denable_fortran=${optionOnOff fortranSupport} - -Denable_model-checking=${optionOnOff modelCheckingSupport} - -Denable_ns3=off - -Denable_lua=off - -Denable_lib_in_jar=off - -Denable_maintainer_mode=off - -Denable_mallocators=on - -Denable_debug=on - -Denable_smpi=on - -Denable_smpi_ISP_testsuite=${optionOnOff moreTests} - -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} - -Denable_compile_warnings=${optionOnOff debug} - -Denable_compile_optimizations=${optionOnOff (!debug)} - -Denable_lto=${optionOnOff (!debug)} - ''; - #-Denable_lua=${optionOnOff luaSupport} - #-Denable_smpi_papi=${optionOnOff moreTests} + -Denable_documentation=${optionOnOff buildDocumentation} + -Denable_java=${optionOnOff buildJavaBindings} + -Denable_fortran=${optionOnOff fortranSupport} + -Denable_model-checking=${optionOnOff modelCheckingSupport} + -Denable_ns3=off + -Denable_lua=off + -Denable_lib_in_jar=off + -Denable_maintainer_mode=off + -Denable_mallocators=on + -Denable_debug=on + -Denable_smpi=on + -Denable_smpi_ISP_testsuite=${optionOnOff moreTests} + -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} + -Denable_compile_warnings=${optionOnOff debug} + -Denable_compile_optimizations=${optionOnOff (!debug)} + -Denable_lto=${optionOnOff (!debug)} + ''; + # -Denable_lua=${optionOnOff luaSupport} + # -Denable_smpi_papi=${optionOnOff moreTests} makeFlags = optionalString debug "VERBOSE=1"; - preBuild = - '' - # Some perl scripts are called to generate test during build which - # is before the fixupPhase of nix, so do this manualy here: - patchShebangs .. - ''; + # Some Perl scripts are called to generate test during build which + # is before the fixupPhase, so do this manualy here: + preBuild = '' + patchShebangs .. + ''; doCheck = true; + checkPhase = '' runHook preCheck - ctest --output-on-failure -E smpi-replay-multiple - runHook postCheck - ''; + ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "Framework for the simulation of distributed applications"; - longDescription = - '' SimGrid is a toolkit that provides core functionalities for the - simulation of distributed applications in heterogeneous distributed - environments. The specific goal of the project is to facilitate - research in the area of distributed and parallel application - scheduling on distributed computing platforms ranging from simple - network of workstations to Computational Grids. - ''; + longDescription = '' + SimGrid is a toolkit that provides core functionalities for the + simulation of distributed applications in heterogeneous distributed + environments. The specific goal of the project is to facilitate + research in the area of distributed and parallel application + scheduling on distributed computing platforms ranging from simple + network of workstations to Computational Grids. + ''; homepage = http://simgrid.gforge.inria.fr/; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours ]; platforms = platforms.x86_64; - license = licenses.lgpl2Plus; }; } From f2daf23137d1def839882691b7daf6738cfa9e58 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 11:04:17 +0300 Subject: [PATCH 362/369] renoise: srcVersion -> urlVersion --- pkgs/applications/audio/renoise/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7cd695eb11da..5ec7375056ec 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: +{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }: + +with stdenv.lib; # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version @@ -7,7 +9,7 @@ # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. let - srcVersion = version: lib.replaceStrings ["."] ["_"] version; + urlVersion = replaceStrings [ "." ] [ "_" ]; in stdenv.mkDerivation rec { @@ -18,15 +20,15 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86_64.tar.bz2"; - sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; + sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else releasePath else if stdenv.system == "i686-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86.tar.bz2"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; } else @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise ''; - meta = with stdenv.lib; { + meta = { description = "Modern tracker-based DAW"; homepage = http://www.renoise.com/; license = licenses.unfree; From d886a1e630d7e14c971b758a4b0472802aea5441 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 24 May 2018 11:10:06 +0300 Subject: [PATCH 363/369] yuicompressor: normalize --- .../tools/yuicompressor/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 1cf381beb617..44edf443c110 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -3,20 +3,14 @@ stdenv.mkDerivation rec { name = "yuicompressor-${version}"; version = "2.4.8"; + src = fetchurl { url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar"; sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; }; - buildInputs = [makeWrapper jre]; - - meta = { - description = "A JavaScript and CSS minifier"; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; - platforms = stdenv.lib.platforms.all; - homepage = http://yui.github.io/yuicompressor/; - license = stdenv.lib.licenses.bsd3; - }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; buildCommand = '' mkdir -p $out/{bin,lib} @@ -24,4 +18,12 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \ "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor" ''; + + meta = with stdenv.lib; { + description = "A JavaScript and CSS minifier"; + homepage = http://yui.github.io/yuicompressor/; + license = licenses.bsd3; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.all; + }; } From 73b11060fc0725fbafac8a8393bc0098f284ef33 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 May 2018 04:21:07 -0500 Subject: [PATCH 364/369] treewide: add more versions to package names --- pkgs/data/fonts/liberationsansnarrow/default.nix | 2 +- pkgs/data/fonts/mph-2b-damase/default.nix | 2 +- pkgs/games/quake2/yquake2/wrapper.nix | 2 +- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 2 +- pkgs/tools/security/nitrokey-app/default.nix | 2 +- pkgs/tools/security/nitrokey-app/udev-rules.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberationsansnarrow/default.nix index 6a5e81cd3c75..0027d44d9db5 100644 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ b/pkgs/data/fonts/liberationsansnarrow/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "liberationsansnarrow"; version = "1.07.3"; - name = "${pname}"; + name = "${pname}-${version}"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 5729561c5809..692ad63574f4 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchzip}: fetchzip { - name = "MPH-2B-Damase"; + name = "MPH-2B-Damase-2"; url = http://www.wazu.jp/downloads/damase_v.2.zip; diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix index 8cd1044456ac..9ab086f96a21 100644 --- a/pkgs/games/quake2/yquake2/wrapper.nix +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation { - inherit name; + name = "${name}-${stdenv.lib.getVersion yquake2}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index c89a8ff91479..720e3fbbc9fb 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -2,7 +2,7 @@ stdenv.lib.overrideDerivation systemd (p: { version = p.version; - name = "systemd-cryptsetup-generator"; + name = "systemd-cryptsetup-generator-${p.version}"; nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; outputs = [ "out" ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1aced2cd427d..1396e9b94c9a 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,7 +1,7 @@ { stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: stdenv.mkDerivation rec { - name = "nitrokey-app"; + name = "nitrokey-app-${version}"; version = "1.2"; # We use fetchgit instead of fetchFromGitHub because of necessary git submodules diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index 99947a0eefef..33d2dd1c8fa7 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation { - name = "nitrokey-udev-rules"; + name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}"; inherit (nitrokey-app) src; From a0f4d19925705945b2beb393239f1a9f72b5035d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 May 2018 04:21:47 -0500 Subject: [PATCH 365/369] treewide: use appendToName where appropriate Using appendToName preserves the version at the end of the name. --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- pkgs/development/idris-modules/with-packages.nix | 6 +++--- pkgs/misc/lilypond/with-fonts.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5879c0e83974..ad8bae014542 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -60,8 +60,8 @@ let # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. if actualPlugins == [] then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else stdenv.mkDerivation { - name = "${terraform.name}-with-plugins"; + else lib.appendToName "with-plugins "(stdenv.mkDerivation { + inherit (terraform) name; buildInputs = [ makeWrapper ]; buildCommand = '' @@ -72,7 +72,7 @@ let ''; inherit passthru; - }; + }); in withPlugins (_: []); plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; }; diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index 1631555eee4a..8b390d4bf5be 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -4,9 +4,9 @@ let paths = stdenv.lib.closePropagation packages; in -symlinkJoin { +stdenv.lib.appendToName "with-packages" (symlinkJoin { - name = idris.name + "-with-packages"; + inherit (idris) name; paths = paths ++ [idris] ; @@ -17,4 +17,4 @@ symlinkJoin { --set IDRIS_LIBRARY_PATH $out/libs ''; -} +}) diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 2218b75a2e0f..5bc74cb65ddf 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -5,8 +5,8 @@ , fonts ? openlilylib-fonts.all }: -stdenv.mkDerivation { - name = "${lilypond.name}-with-fonts"; +stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation { + inherit (lilypond) name; phases = "installPhase"; buildInputs = fonts; nativeBuildInputs = [ lndir ]; @@ -32,4 +32,4 @@ stdenv.mkDerivation { substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out" done ''; -} +}) From ee8fa757f36b80a34fa97f8ee686f92abe742cf1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 May 2018 04:22:19 -0500 Subject: [PATCH 366/369] gimp: cleanup plugin name All gimp plugins are now prefixed with "gimp-plugin-" to make them more clear. --- pkgs/applications/graphics/gimp/plugins/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 5b21b349764b..0c753498af34 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -22,9 +22,8 @@ let ''; } // a - # don't call this gimp-* unless you want nix replace gimp by a plugin :-) // { - name = "${a.name}-${gimp.name}-plugin"; + name = "gimp-plugin-${a.name}"; buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); } From db215a62b7a071ca54e42a497959a13d3ddee912 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 May 2018 15:22:47 -0500 Subject: [PATCH 367/369] qtwebengine: fix build failure due to -Wformat-security ninja builds some components with -Wno-format, which is not compatible with the default hardening setting of -Wformat-security in Nixpkgs. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index e798d529ce1b..dc5f2ae96b3e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -31,6 +31,10 @@ qtModule { enableParallelBuilding = true; + # ninja builds some components with -Wno-format, + # which cannot be set at the same time as -Wformat-security + hardeningDisable = [ "format" ]; + postPatch = # Patch Chromium build tools '' From 164601faa2607aaa45c8a1a16195fe3f09feec97 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 May 2018 18:03:44 +0300 Subject: [PATCH 368/369] mesa: Enable virgl driver This gets NixOS tests requiring X11 to work on aarch64: https://nix-cache.s3.amazonaws.com/log/nj4dwi3wkxx0cxv230ii4a99yz71b4km-vm-test-run-keymap-neo.drv --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4fd3b38a3be1..f8152bea2cc1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,10 +34,10 @@ else let defaultGalliumDrivers = if stdenv.isAarch32 - then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] + then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 - then ["nouveau" "vc4" ] - else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; + then ["virgl" "nouveau" "vc4" ] + else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] From 232bc96376842da70425cb166363856e8823ce48 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 27 May 2018 00:43:26 -0500 Subject: [PATCH 369/369] Revert "sqlite{,-analyzer}: use the same src (#40945)" This reverts commit e28a586f94e77f22d943288ad84f88be23c587f8. --- .../development/libraries/sqlite/analyzer.nix | 18 +++++++++-- .../libraries/sqlite/archive-version.nix | 11 +++++++ pkgs/development/libraries/sqlite/default.nix | 31 ++++++------------- 3 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/libraries/sqlite/archive-version.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 2325a9c8d0db..a0b1220b217d 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -1,11 +1,23 @@ -{ stdenv, tcl, sqlite }: +{ stdenv, fetchurl, unzip, sqlite, tcl }: + +let + archiveVersion = import ./archive-version.nix stdenv.lib; +in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - inherit (sqlite) src version; + version = "3.23.1"; + + src = assert version == sqlite.version; fetchurl { + url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; + sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ tcl ]; - nativeBuildInputs = [ tcl ]; makeFlags = [ "sqlite3_analyzer" ]; + installPhase = "install -Dt $out/bin sqlite3_analyzer"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix new file mode 100644 index 000000000000..1f312ecef23a --- /dev/null +++ b/pkgs/development/libraries/sqlite/archive-version.nix @@ -0,0 +1,11 @@ +lib: version: + +with lib; + +let + fragments = splitString "." version; + major = head fragments; + minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); +in + +major + minor + "00" diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 341474326480..eaeafa741297 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,40 +1,29 @@ -{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; with stdenv.lib; let - archiveVersion = version: - let - segments = splitString "." version; - major = head segments; - minor = concatMapStrings (fixedWidthNumber 2) (tail segments); - in - major + minor + "00"; + archiveVersion = import ./archive-version.nix stdenv.lib; in stdenv.mkDerivation rec { name = "sqlite-${version}"; version = "3.23.1"; - src = fetchzip { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0"; + # NB! Make sure to update analyzer.nix src (in the same directory). + src = fetchurl { + url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - nativeBuildInputs = [ tcl ]; - buildInputs = [ zlib ] - ++ optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; - configureFlags = [ - # Disables libtclsqlite.so, tcl is still required for the build itself: - "--disable-tcl" - "--enable-threadsafe" - ] ++ optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -72,9 +61,9 @@ stdenv.mkDerivation rec { # Necessary for FTS5 on Linux export NIX_LDFLAGS="$NIX_LDFLAGS -lm" - echo + echo "" echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE" - echo + echo "" ''; meta = {