diff options
Diffstat (limited to 'pkgs')
548 files changed, 5125 insertions, 4058 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/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/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/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 831a30bc4fe2..6431a50ddd9a 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.1"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6"; + sha256 = "1cvz8y63vdqfpxh7lq5qadqjcyhahbyq0py0qz6xrmpk5sxvy7ml"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d02c551be8af..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 @@ -6,31 +8,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 + urlVersion = replaceStrings [ "." ] [ "_" ]; in + stdenv.mkDerivation rec { - name = "renoise"; - 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_${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_${fileversion}_Demo_x86.tar.bz2"; - sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; + url = "http://files.renoise.com/demo/Renoise_${urlVersion 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 @@ -55,6 +61,8 @@ stdenv.mkDerivation rec { meta = { 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" ]; }; } 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..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 +stdenv.mkDerivation rec { + name = "okteta-${version}"; version = "17.12.3"; -in mkDerivation rec { - name = "okteta"; + 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 = { - 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; + }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 1a9bb44cabb6..9e97a1d755aa 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-32"; - sha256 = "1i3rvq0f4lq1las4g12ipfs6h5vyngwh5fllvynpci2lh32gd48j"; + version = "7.0.7-35"; + sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz"; patches = []; }; in 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/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 []); } 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 diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3c1f426fb1b6..68f95195b6e7 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.23.0"; + version = "3.24.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0ds3i3dhkgpwa3c1lcq4zjmiaza8k9and0lbqqw4i6jrnpk691f9"; + sha256 = "1hgjnw8ynvpcfry4vanz5f54sjq55pqidvyy47lz59cz0s8lx50b"; }; patches = [ diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index ffb898b265c2..78f90a4ffa6b 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jgmenu-${version}"; - version = "0.8.2"; + version = "0.9"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3"; + sha256 = "17xxz5qyz92sjppsvzjl2v012yb3s5p519cv8xf2hd41j7sh9ym1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 838e26463cd0..31ccdb3c7f53 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "16.2"; + version = "16.4"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm"; + sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 47f3ac7446d0..274724973615 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b6"; + version = "61.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f"; + sha512 = "0c085d106276da11585c79f9d7e0b550e6b123cd9f032168c8606c6f370ffbc7d62b83981e39fd04b5a781467a762e8d720fec8fdfb3c64036444ee42b4fb3da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6"; + sha512 = "5456f1267e1df0f0b3f21ef9d1bce16c0618d2acf50154f432dc52bb99e2d0c0d678406586bfc1ac0c4d7a2a3e3ee976da593ef7fdaa199470119d1d0f6822e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3"; + sha512 = "27959567c69e8575194dd9d2a251b3dcbc019c8bbd2bfc79ee801621bfe5054fcdcfeb36ca7b6c5a0daa3bbd532f67638822f359ad59ac3e567a82907243ae05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583"; + sha512 = "35a941605d8bfe0c840a75da4edfa5e7e66ab857a2247cedee672e84ad16bb1b6ae77a8c5dbc3f29807069d6961d65c04f36b2190974777451870b8cdcefce7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693"; + sha512 = "c976f354a47fe41bdc99c9eff708e1af0f0a5398287e3140bc6e88e2d2c8ad52010323cd0ab0dd154820ab40af586895d1347fbbd23f1e3cb448fed496797979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170"; + sha512 = "4499cdfb34c177aec59e8e83bdea9f013b300c123109ad944bfb0a26c5f207e57fa76e90c8effb18ef9876dd87d7ce13df049b7bb6a8d56ed48e2fa47123a202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec"; + sha512 = "aeedf355f8e7d5676e424ffe444fc74ec92e51c2e8e331f16ae6dcbf62d1d91238f34ffce5ea8507fa5c888a688f13b2f3d1309a5790059909f370ad09f1d510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43"; + sha512 = "880f422cdf9873298ec8d580b51d3346a67f2940b3b5f93155a32742028f0d6954b2c8437e20e7fb96ec60361f2ec7693015790dae1b203f21658b6f95a00090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37"; + sha512 = "84054bd55f558557f8b945d8b01098bbd33778c89d48617683bc27aeadc5068136607ea238272edac6c130b524faa9f920823c31136b979a05d2c46e0053df45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d"; + sha512 = "f7a7dc51878b451438854a512ca2fbefc21f637c0ded711d6dd5cefc92958eb4d7ea558fc67281ab04f79aae86d749442467059b2c7537672601eb2e4f6233b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98"; + sha512 = "734702d1c790f08bbb5f60175649be24f180d58514f1f2872d8ebb47143cf9f5318232d5badce3025fcacbbde98ce28dd20581b0f69dbc1fd0e8cab61ccb9e25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec"; + sha512 = "ac1739f1c762257a7912d87e62c9115736a4c5cac9ed1abe7ebf9615f961f757e34a6cb750cb0cd902e7fccf115db669c9d3cbb59ba51c9d2f4662abb587aa36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598"; + sha512 = "aff34d6b9706d1a6fb836263d45438afef1213d82444e349aab9c2b19af869c0752a9ad4082b34ccf3d34d682837e49c2629a7c350fe2a4c896ff9640aa53330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d"; + sha512 = "2ca6337337c1d6fa12fbbca58a2e544f1287f23dc31dd8c5797b0438df8eba7a8d6f7a3decb88655d0959bb928222996ea13243680e985924452524b64eb390e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174"; + sha512 = "1ad83c3d20214c2b2bd59765c42404dd62b56b85b1ecd527ca524ec54bd2f9a65de5fdebe1c664bf1f19df01fe231d337fc0c74d3494add5cbdc3f3718ac2bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf"; + sha512 = "9ab80378bc5560daed5716fecdd8e10c0678b162cbddde2e4dcfc4989ede99268ce1398ec180f1643d6602e1fb89f9c15d3f8e48544b24fdebabfb5c517a5089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4"; + sha512 = "d653267e7513e3703da0d884e0e91e8412dddb7d0d45f6c1f3e4113b394148b61dc3ec6f58b41f94af72fc17929d0138cfba3c3e57530b5fb68eac1177ca3b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004"; + sha512 = "b4731869c79652472112d61933a47c4323957bc4da77088c1ebe27cebf6b0470e5827244f4142598fed1d81d3b9ff8421c7ef2b76652172da4630c8548972b2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3"; + sha512 = "9f5129c3475790d658eddfa0e5d3369823a6c47226903aac365fea3bb8578381ef883404e7db4615bcf655c2adda99c8dde6a64254448b4592e18ba41cf9ecfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60"; + sha512 = "78cdc95f22cf2a52a2e81012d067a74fcd252dadfb8c9f3859e7a392ced75b8dedbdb649bce9c67c5e7751bb663c1e1bc2d857d0eb481c73855e8f54beb7ae9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d"; + sha512 = "18828e03a5fb079b45c9fe5890924577f33c2557805dc362986528556f4c0480a52d0c7f455b61ba9b5ccc486b6174936cdf230fdc78c7d22cddb5b56cc22d45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c"; + sha512 = "59b1ba40e32ee20d28ee2a2beccefc766d3b75f422ef991b9e9a0039b54ae15ab3280ae14dca42411096f994adcdc2c782a2615e97f78fd21802d9788bd5d8a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889"; + sha512 = "7261958538ea05d603270279a21c3685f0defe98e8308b9dd7dceb9780b5ec5720e3c7e5d492e309aeca3fded09c802d79ab1c043a052196b77e91453e95c2d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca"; + sha512 = "2e9604186cd227532ccc9b10fa12632c59f9f5607227ef56768495c350a169ebef34dcc4606c2fa602a0f403a556c56bd0bafdb9b0af1bdfd8c63ba190a6c094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180"; + sha512 = "47fb5fc1325d30d4715fa0d9b238740bd47d2ba8e325ca481de3085c0e7952fb64bf95d1b2f0aecf774331bcb7e3f254d42daa80fca6271aa5a077e7434494bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf"; + sha512 = "8c66bf866c0be623310ff56f3fdab94427567a02144d961e306b263948592924b245ffebfce7784887bc54052eb3c36bc0653f9897e1bd01c028b6f23fa4275e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f"; + sha512 = "9bc881ceb00d1cbabdc3507a8efafa8a8d74a1b5bfe09c77541ada456453b7c9aad73b91ef8df2fb74b8cf353905ab6f8f63d2cd448edc68be701c4c2530c620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc"; + sha512 = "48c268f3cf16a483231072636eca7937d4cbb48d5bf0abace574bd933bbbde218af48a4fc76892f696c222075e2754971ba8ddfcfebd1920cef5f1b0343b7d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621"; + sha512 = "4cf2729e02c988dc34a467ca1db2a845845fba7ea9d8c37f0807259de9640b373926caf9870730f083b836b06b9a11615ada7764a2b9a1d52723e05dd8750423"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc"; + sha512 = "8eb43956bd466c408ddd844d8ad2f11a57f1bfc2f2bf1a5564a390fa424a8836d32ba35826244ee51be8e01d9570729add972d7bfeaa65ce20c8956e075c7376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1"; + sha512 = "488decff8a3bf071b0cb4f398fe233f9401c69c256012d37a89f9496a867de54879c6ee56980af2a35fb478c94a708ced09dcd789218f01d37cb4312f5c16bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe"; + sha512 = "6eedcfa103949184b95c84aca5692d094691a7f6f78047a49db59e71ccec070b8f04fa7276cfe36dbe6ab98db6ba5fa7efb6b3b6b9dc8629a31b4ae67f0eed10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f"; + sha512 = "8813bad6fc28a12fc5ec4d95af682654638015f166d8beb22eb276ce1457a80df65ed222224174cebd03c7aef1004b989c58969ed8065a979f16d307ff38be9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77"; + sha512 = "094f738031e1a2aa0fd0bffbbc19387a02a5c2ff317cf2229015255ddce05650919c877c1d249a8d35d2c1c9d4944c11c12015161442ff90dbe86d298a0db0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993"; + sha512 = "b52ad471a82f69d2d08f952664d95207f362beb6dff3d910d52b30d287cf14a5599e80604a8fc3f12fedef5af2ab1afb6d0bc3e2a673eac2764674b6e5f17d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b"; + sha512 = "3b951c0a7b39e6125b272a0fb87e5ff8b4368cd80f32b4eedb9e084fe9b7390559418d7d1954d64bf47c04e3ab5736479f93c75187b59f17105e295074992968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f"; + sha512 = "1cd31e0129789c77346c7543b54315dfbae370c8f7e3fe1e7e6a02cdc5ad9331d00b4023d724ea884ea03a8476c0821615ae8dc107e083cd6a779ea2598bac21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9"; + sha512 = "e008618f2dfdb82cac31f4ec81a18ffb0596de383dc3173c0741f3e9c47ca36a8c14682d66b18421ee0b3e5672f96d23b829f5caa0ad82722915cbf4e47812ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c"; + sha512 = "95aa7da68db55d59fb30052efa9bf97dad57f30ce4898d643e24235bb30c86cb73895554c445e59d54d4071ca3c2dad1f1082c3609fe9971e3f417c4f7d8865b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762"; + sha512 = "dbec91471737e08dbba93010a8779963e4cc2d14061d3a571042e88527c0b05933404267ccd7fcf05bd3a3916401013ee2458e2c6daf133578dff5f9184843fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5"; + sha512 = "6a883a7edb63ae866f09ec6b40297c3c688b5f3df42ca7f30064cbacde4a427fb981bd2e17f7b82c34221daecf782eaa231dfb11c731dbae08f0b343457bd6d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff"; + sha512 = "3d7fe4f97970f91dc723d9d8086fd5d402b8776d6d0e45d8f6c5f3feec868491bac64573c678ecbc35d2b0f367a1fc62c0a6a2ebe264abafcca8919e545d7d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68"; + sha512 = "dcb2465cc2524a309e1afba7e55ac78effe814b1fd1dc927b7c6518f2806b1fa9686abf2a5b98843bdf1716ae7bd399f04cf4527cd2c8fb2aacd06e7744dfa2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275"; + sha512 = "dccd06533eda2513033ffac6f53f0469b1c23950270018f27fb15cf57ddc02804947ad74dec3e60dd1a59e81340fbe1318de70fe2ba8f15299a5905e361d7bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af"; + sha512 = "1f46d42600c46c5f38dcacc2915f475d9183911355ccd0074068cc1d5ea4b1c1c588f6852f0ab5af67d71d4f539c1a5eafd949b6675761e972566cddb16bb712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9"; + sha512 = "73ebb472d1517b4eaad59108fa0762b887fe8a4771c58f906979673e4c942d57b8ba3fc7cdcd9e9cc5175d015fe48e57223120d99c581e51351a5abf97f34201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91"; + sha512 = "d0ddd9665a72c2fa481de49806880bf5bb17ae468febaa849b7a578175da5014c96eb30b7db5e04d99b52e04d28381ab88aa38cd76d4260fbaf2ac447a84e9af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9"; + sha512 = "2a0be3c049418b0b4925a5bcfe885c97c59c3e6868e1ce92b0e4183fd2c23265e78645dc07e6defe34b7082b65cf2a57c3bbe176a0297fe5c8d6b5de7554d38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c"; + sha512 = "fc7906c47e04f23e8e6591cfadafbd031564ef2538abe021092668caa1b61f02c0769e983e18ef4ea6afcd7ab5943b12010120807eaa625a9b73c27800ffe9d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2"; + sha512 = "09f62453b0ad6895bf79444d0963185a88c8e0a2374ca4800875bb78b44e45046542fe68e117a7ff8ef013577635613cd7f2d0b414b9dc6fc2cd98e1d27eeac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33"; + sha512 = "2fe90fa1b29724e1a0b36688d4ba705cbff7cdadeb6073c07804555c0c5269a6990312723c66d0f6a54ad343fcb1d672bd2215217d28ee485f20370d199a5a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202"; + sha512 = "8e0cca6ea3877030ac8a1de847e3a5fa4a0a53e9e8f75d6b9b3594864e7268b30331af23a06810da9de871499e3402e254685f6d36dc6b0d7e132b8760e112fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f"; + sha512 = "a901959e1097bb154febfbd29376e6fc1084b309bd32b189ddc257dd57cde4b8398746b8de63e6863f8bf93e0d3f1681269c34feab458fbc51394c8accde1d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969"; + sha512 = "47212bd4e81e30e2df047317a678980ebb186c7e50f7159fbe354fe87fa62c182c390dfe87f8a5090201c685b72146fc249648652f9a0dceb073cd2b5a192ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5"; + sha512 = "63b06a097bb243585752e24f3ce02f41f6bf09c379d1b6f2bc9198058f636a66f62090ffbccab82ddc0a8939bf4f59f92f212119945ad65cfac0bb12a0c670b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a"; + sha512 = "f8033a972e9771f30d5dfc1cc175d76982abffe5fb1e16641853053f1955b0a4f1cea15fbd0125e1481eba89a51699d6b416d36b633d78479d7ccba9e7b28991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889"; + sha512 = "b541f15fb8727ae25af2fb920c0f364e2fa90a0da093d3551b1953c54db9044af77639fb9ae9c395751bf9ae0ae0162e73a7b263e59e11b2e2208ee2926d7cde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6"; + sha512 = "84e16300f91ec5c5f8ef6e15e51efa3a014e2df1c7e41b20bc90ed614677dd0b6a81d4547878a596de192cb7171d063c939ba0e282b00a4b2c6e107da844c242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c"; + sha512 = "889203c5c99c25a48e967d3837aea42a0cb37197fe4877643064f8a8a0cb2ba0a96e15778c8f451e3385f8d10a8cac01b7c14ba40fa7cf504f8edb0d2d66c97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649"; + sha512 = "987363db23dcb9649e825fc4c9193580da77f9464df45736a01e2cb45caf062da88366efa7d7cc907383d405db1ea92472406346d430e0bf587c82284c188d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b"; + sha512 = "9ab22f8d232e7eef9a6499139537e7047a71d1e8dfa801fff5d602be5b73a8463cf2bb5320ae557ad7163b2c69782070cd20222b18ded554861315ae247d90da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449"; + sha512 = "f5712112048d0dd7dac8ed33e66b340cccae3343055bacc44e6c8c8da878db00703bd18ce672090bf1b1efb79c730fd7b452230682b8d828229c82f9e7ca8ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d"; + sha512 = "95715fb3347917429bb6016a3ff2f4b985e05ec8e04293511dbd839360c1e61435b6f548321c63586bca7eaeea541a9ce6f1b78665c38306f4c3781b08813e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389"; + sha512 = "2c7d1e1627755f556695bced2ea3a125473e644824f3566e390804347dd70e17afbbd8246c7e94adef5d2e4bfb9892d5f696e7f27083d21721fc400332017b5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53"; + sha512 = "93fcd79b8bf2715ea0441f87191876df4d53da0aee03c237c7c29b9eb926fc7e8094bfe20a77434951bab85df25ed3eb578c482f4d53c210e1bcd2514c990e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6"; + sha512 = "2eded92de24f67f981d88d14f5300d8352ef2385e365b9886023b7f4d529909e6875e42b44679da9cd869b3678a48b1b252b212f45390373b64419412bcea012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682"; + sha512 = "24d5f52017ec7921535b036a562f0451cbea7f3eafb4af7dc7c9befa87713044ae3511a549852163ebe473dd31257a2a4ba48b286df12b9f0b515538bc2d46d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016"; + sha512 = "9ce23f7e2573fff390a9cc12160090767b5a5b50884aeb6e8150c09a0628af4d628de63042ef1939820450ae1186627fbebe745215062df25ac6025acbe548c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0"; + sha512 = "dd3150888232e127264c66fc478ad91bc621d4e49c792a327f311d1f66f743ba99d844db6092d32b13e57f43f7146bb6d831b834ae7d797a65350653e63b8d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b"; + sha512 = "ea717463bc22e468d429a4a9145ac70a73330e3e18050d6af2d04939f586b2a536faea44e193d5d9861cc76b89c41795583d29c723501ad2e72a1581021fb59f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852"; + sha512 = "075f8310f1ccdd76d8c88943261d4f6c37091b5a527f7dbb57f77a6e1b0f23ab889ec6ecf36c7a99bf59eb52d3443c6c0dd9815b9444bc7c20137feedf289c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea"; + sha512 = "03623b979bec538828122d27784682630624971913857c416c055aa614eae8f0ceb692409cfc79782b64ac9b9946d51f943216787686a2c09bfdfc8214f81a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0"; + sha512 = "4049b878dcd6bb5c61a98dca756ca69c1197c0da1c5712c7b16120be9fdc6292b93144d0b72962453c585cf9eb3b624e8283666112293365631c3cb6e07046ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91"; + sha512 = "c6723079225149c5be4f786fd8aa7120b5a8b7f3c71abd629607e23d3b5910da54f1a20bd98b70a3f30dd98c34d10b84d1bc16b89229aa64cd081bc6e00a0b56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f"; + sha512 = "1768cdcf6180d26126e8414c8abf530adef1fd3037bc43f931bee15b0eea04a54ca626c093565e1fbe09a980a9c56054fbace43a137477aeba62f4f4b23f9c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676"; + sha512 = "10286961a02c19d2b51c9a470853169e55a09573e941fee077232e3b507ef9b7f1f5514c82da114d219552c51f01259262da3ab9ac58d3e0d5fdf312e2e10df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98"; + sha512 = "f24654c601fa6d62e8aaf5096ce8a55d86614d0e73aa40d14be5f921e5ef40f4615c9b485673eaab0c58af700a8673864915a3353a9a165f9590d7906dc8c174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83"; + sha512 = "ac607e4087103257517201ebc05b9b7a7c337c2d876d32c4ba9eb0524218bd947b6271bfa948a70b02930501c8d6b2c6e89d908979539a0542e1246a0bb4aa60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811"; + sha512 = "ef7376c092b8a7ff8dd7dd48e97c199c87ddcee5e543166a9850cc0128966c865cb67f8e61ddfc1edbca1f3dbd8efbd9419ae72435c5a5bd9c2b2fe58418903f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429"; + sha512 = "504832ed8414ab0d75256489855c763f4628abc4702a9ddaf1a823603a7d4710bf6c1e421a7bc6d07fe494b4f93c87c1ddc26184610806f20755a888969b13c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2"; + sha512 = "270a5ade916b439199cb6fe539b593d747b67fcdc0857a4fadcee328244909d28186bdf50701f863d4f817afb15c38e5f4380278d495b1d627111b53d567c186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8"; + sha512 = "b88074c7fd37e45486b40f4c665a1ccb19112daa4c8c344e0a4b2b3cb4d41390824e5d7f6446adb0256cf25e0fe71c969b51b4ae08f521d0f619387d56ebb72d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102"; + sha512 = "fc871d74fbc8a59b97197bab790b543fe5b7478174dc4120b04eeca90c79275ef7867dbddf7e31f3e58fa5b738ce9af00d42525667482727a7abbd0979c3d969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0"; + sha512 = "26a9f8fd86e7f733dcdf822335fbbd780a69d3789162b8f536336fb9ab45802c9b67ab7f5681b96236530f040e489ce99da005dcf8bd529d4f8e5201ad424cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89"; + sha512 = "94ce101af7225da4f8309824d0511344be52f52c6f9a14a21863eaeb79db755d0bed72927f707467b862ca9083f5270ebdc9faee13817097b0f73f6820e4d6d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c"; + sha512 = "b5e734d2e1b8563cf47bc6a0a5dd59d8f7f4be1f95f9992426be690363450439cc09bc89b506df189dabe7588292da25aecfdd5796829630f095931ab2aec19b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be"; + sha512 = "32abc54a25fcc979911916d83c101be8d5ba08331ca8ff8673cb9c4677c55263a661e780fd344642714cac5a5b9af6c831c01ca0651f67a7dc872ef701f25a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248"; + sha512 = "6ad4405ba59143765b3cb82ace718b1f8075813636f9109ed69bb2674e035bfcd5174b49d2de2f73cf9ea616b2de5b31c2bcadb071e49e3ad0177087ebeb0b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362"; + sha512 = "ccc213e1266219ee8f5a230d7f8a96e503897ce70f66dc7b2576b24db7927bb9032124856c46a85c345ff5adff42a3d08963920f41d99e095af95c170a72794e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956"; + sha512 = "d470b8bc1fd69fe021e9871f98262e17a157ae758d6ec8e90747627491f6ea57e01457ffe670df582f0c3f5ce11f37147a4e71596e79a46f52e6c53beb67a95d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd"; + sha512 = "3e5057597af10891a3c65c0f2ca32316dd627b7fd9895edbb89a559f07053bd03dd6a545d82899c922f9055f9f975b944d4e7b3a4c746c4f6148bd50f655975f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541"; + sha512 = "4d8117e6bc56d85018a900f6f97d2f82a0b76f23f2807ac9a6821e8842b9c7b8fd20840c4c784ab27ecd869fa6012511e4b4cbaa2c5f3fe11d79c35500d7ca67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1"; + sha512 = "f4ddc2a57e920c9272a23c5fc794e7f6fb855ea98a1dd12ed03cbf21bb5a2b85789b526dc5e49d6a27c31165eb98716da4995673856b48891d0e21c66a977238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b"; + sha512 = "02c30764a9368c883215ed418bf32a4a39c4c2db6a7f0646c6e4998d51e3965f87306ff6b7276e8a375506821aba02734b360a307cea785dcec543da993cae88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882"; + sha512 = "a42e9c7da499451903800f57ec44df070dbdda2eecffc3c2f0a9729e4993570ad791ea3299fae085b0dab0a2ccd5b95bb14b4bdfc15b223666630ecb785f9009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c"; + sha512 = "8631b3b6384d8650e98fa9590973e2c603e6a557b17c3369e573ed5902243cdb023cb9bb15468418775b845d25cd054a2e6ade8b81410cbde1d9634d6681f7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab"; + sha512 = "498088f972504dd63e7a3cd1a97463d17bf62e186d8e5f5bc83d28ac7dcaebcabadf76f16f57fd5bef59726cdc75dadc19113f73fe4e2736042472ac33f0ad2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329"; + sha512 = "40b463f4d6a5b808e1c7e992639cbce315b7a6994f9401e0e92929f0288e7976df42eb1f923d4b620f265ca44b3eb07b2058ff6ccb8c8581b06df49836b060d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704"; + sha512 = "972839d2b5c2b0af5363e0d0f85c6b39e2c641fb29375911afb90eefff0508b9fcb4728a016eb071b55e2ac5474700f078c0abe5c83a7fec004afd6ba635fd6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5"; + sha512 = "87c01acd04b6a11d9fad202cce7d912629d4537b1eae6305a21fe35567d57a1fedf5b2502efe603ff1d75461f5096858ec53c7db1c5f7cbf5f4b9833d0bc6559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a"; + sha512 = "4d1953385fa190a9d965d5e40b878e59e92a5f973b3e7190030346c383056f85e049172a723127a45b242cbecb17a7e44126d9aaf9405f56b9458c0f4e87d81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0"; + sha512 = "c52dab7ba3645c44b60e052490d66327ee5571ed151b05d5b084d31d7948e7b4913b9dc0fe25a14f5553363f900d91b20dd0ac830b65b3acf4b49438e7d53e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a"; + sha512 = "45145403143f9b0c6dcf4abb287400a1978eed93c3f2e1358906cad3cc441f6471818a6fe2656a7417aa8714ae4117731baa1afa118d756726f87cc54ddd6f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1"; + sha512 = "83bad32114ed3e5dc856e3be813da148388c6070098aa0c275df38459680dfed4f0e13795f59cda8faffd074a7ff14945c4d279109a427e1241bbf07070d9b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709"; + sha512 = "548b421eb5c5675be324b3eff3dd315bf2357434d59f3df216a9f9c276cde6896bfc8fd2b5e35b3a5cefca886cee712d9cbe91766c73794f7e3eed18d93da8e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d"; + sha512 = "00edfdfdeb842952a12b11935dc159f07e5c5016448d36fa6835467139322195ffe9f34ddffb20a593e7c0621eeca7bfd1fef697550a8ed4beca4a2ab3752a0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6"; + sha512 = "9634dd7837d870a350bc92472ee97b06f01e3c67ef9035fbef388ddafa649fedb12ed12df304a1e68e9dcda089e8079e8de8eefa1473100b28a0c340a45baa3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e"; + sha512 = "39d58f13051e40ebb1e5348ae1a76bb952f1e16ed16d7b953c0b92775a4c728ebcb1b0283e5494aecf4a6ab38caffb9b522b7ad6cdd1a4cca10c838d2239f21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262"; + sha512 = "af6537ce6b6658b702761e5aeb9c5dc673f9bad23a512c7210f16b3a68f991dc06d9fed2fbf8ee20d6f338923284ab8afda68d6c6aad844ab0419adfc0955a9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71"; + sha512 = "68e7806d5c682d9b8c9781283d373a99ac2915c3770c4d96a6284ffcac149c70b8cbbc3ed7b4c5dccf32ebc5e9f5d7b76c84df76ac7d57a68a0f86d26fd3097a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9"; + sha512 = "9d1138732df0f3d68460732bfaa508c27293078c244f575b4651b32b23deec8dd9c7afe2fb38caf7769e993ca03646c49d34e5d2c8c402d0f2491646ab15f799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82"; + sha512 = "53ce04660ce3c84a154ff4c7d0635719337ad705941106e8a744802b284ce6dffa3060844da74b6fa0d68550329682f3f997457154accef1037013637b5f9c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643"; + sha512 = "bcd41ebf0cea329de9519c8c3ff7c35dda9546e51e1b9eabfa632d12e87da98c27ad9c327a15baa0fd2761f93a2de22cd724c6c84fb75ea4c68dcdcfe9e3edc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262"; + sha512 = "beeba005504c2675051bb87cc870ad54845665e88bd52594fe822c47a65a6949024b16877f0454af2c5027446a612f0a5b9cbbb48cbe8990157997a8f63c8006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8"; + sha512 = "168651dee334e3de02739ebda89b12d3cff0b50eae7723905843c93e5e6272c52b2e621b59044a9b909495ac8c193257b2506878eeb053ce87e02d01c81ba3e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb"; + sha512 = "2d3a5cf9d480c95e1241b3d2d2ffda70ef08767adf9c1408833aa181b74c6812a0c82bf4da529ac1e654ab1c25e18658ef412d3a3a0b51fc8a0a67f0a1eee0dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74"; + sha512 = "020aaaefa75f5a271b60b0dc3eff47448629093388bf7496f4e2a50d1a71866d3fae358bd83588a79c2ab1309a86593aa2e5f39baa29eb8ecfcba69ea8440bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335"; + sha512 = "fb76b0faeea87283ed087c4dbcbe740b8fa8c7c764f9768f649e10698e7dcd8bc7419c22ddfa27297c69d192c2b5c60a74ed1d60f36ea484a48e4727b4a65570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb"; + sha512 = "33ad079eede28e786cbd7976ce46aa735ed2c41af2c629d14fbde4221291ca2ec00e8009d2941abe7c72d659776fc586bcbecf9694f0a44ef3f2f502884102bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414"; + sha512 = "37bf02b68bf50ac6f77d82648b1e6b1182a154e2b315af1a746b4668783d772ba15bccadd679144bb924925b648a272ef07a9a891f7015ea15d51712b84f4c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d"; + sha512 = "d6b245f0cfec5ac80af2a5094afed988b7b15acb04e6303dcf8d597c5f3fe5ba4abd1b047ae68c47a7cc58efbcd978a05edf760b71f8563ede83aaff4db2bbac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6"; + sha512 = "f6e8cdf680f390ba6f60d34d4eaa2a68ac4741e6935f1f5edb0ee89b29f3f152dc23b3a0e52a80bec1815aa89ffd816d30579bfd04927c48cd3f5e242bd07c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44"; + sha512 = "86d37914c8d107b15840f61eae925507ed8b780afaaced5af20d8fe88bffa0213dbb897a4157830125d31d7f35b6ffafe33047043818e11a013cd0519a12b5b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c"; + sha512 = "f63ea85239718d852d49720306cd85a4ab13be5796b9b05eba7890196703506873db271b823debe860c64e7f40c9c8fb8bb912de01c22b0745f4c1682b95c190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc"; + sha512 = "a435633c1bf0395964e6a2bcc10a2ed4ea1da3d1a4637ad62756e669d0b50374a5bcc3623bc8618bd9dc3c949f6cbbd26a09d3b6408b5eddd889e0b96efe3680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed"; + sha512 = "ffed1897a097f740be3bdf504b9b9a9eb8648a833af33963d25cac859ca21eb352ad88ea2f498086c603d375f10493d1d85cba7cd390bad1e5a5900e7750c18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28"; + sha512 = "44a650253f24cc63cc07b7cc5d9e2a8d20fe51b60d983a1b4e230a2d2d3014a4d79e1615d2658c51d749a65c753ac9affdd6aef0643fee89d7ef05e469afd973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737"; + sha512 = "b01e85e1f84058a54ce828f5d4075e7c44f128e70f72afd5f505031d7b5ca5c7b7fee0bb31f1a40206b45fc28afb4ffde4fbdc003b226639d92103b656d94e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236"; + sha512 = "57361375d288954a7a63f6ea3410213576f1f7038b0f2b8d25061497240103cf7cfc9eeb2ff9c1b32aee693b2841fae5d66f52ad74065416e51985c9a83cb7cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612"; + sha512 = "a3a1ea34d0c0c26345cf23ca1c1c6937f78691d29fc583a7daadd93c84820aa2f34fd8f888b7f20aa7b8def5d48bcdd0fb81ddaca29be37cb351b9f2756e1465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269"; + sha512 = "f661999fec94fa4c7290adfdc82ae7ac8b955fe006e38806bd5d7681372831dc6e5190fb41c37517799ce284c403c61218f54875bc035c098caf4a92e2d5627c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913"; + sha512 = "3bb9799c8351f00d3dc9ba258dd5f13eb7ffb71552e17c5244c50a3e2d363e742572f676ed538d16d7d12b2a477382d666c428b3f1be5d450be7033e0a926751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c"; + sha512 = "38e2c97830eb161a894664e6480434994afdc9c9e8517477ef1e9feceed88e991a3786426deb03674ce30beb183956b66a8152a046b1ca94a9df153e17f73c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e"; + sha512 = "b67993ce30d5eb41443aec2101ba5f88be0bcd8f55a44049e8f264f895219a8d4af18644a30855b59f5c6a436b57b5159d2fbfbd4b8c0969a78fb392a202bd84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1"; + sha512 = "8783fd8cc23af2721cbf72572ed77c0e4916d5942819c003836c27a226a393c585b992fd53e7fce2c52ff89f002f6da16d501b33ff1537a7189aaa91645972cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d"; + sha512 = "2c7f9cb7f246ba38cc8c2da608d82d674296d8d5f2e168668466c85ba89e42322c213df381afd9bc2181d120de03fcd8118510d77cff7a54f4009c8fc3a10545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0"; + sha512 = "e2af1b4a6cdb8c03fa228a6311c51a12af0d419cb044393d1494183d850675357343d68b09dfe6382c782bc2c5aeda234607563c74b9175fa6240ea030a1a71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b"; + sha512 = "da338d0df7bdffdf1fee30f5b1aa240c4fa88c5f41451c7120cefcefbc20f616089c52b05423e7dc4c0f67288163c07617b21980f10e4d0b45d7a96fef87ee2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc"; + sha512 = "894ca0443b5a67970ffa7ccbb44012cdabe3580b917f81027018648d0b9f3faeeb165975333724434e195b2f606e4f24c9f5fdbf7034f07aa123e5abb76682a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18"; + sha512 = "eca00e09083766056fa725f74687b5b823432d71498e57bd221ab650fa1b3c0609dc4e141e6ec9a0346f904c9f731c706cfdae12fb1d5d742ca1b65514dcd1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f"; + sha512 = "0cc000001c85e3a84e05cf90c92008fb9da850d74c7f421ff37ec1f7d0bd78669a6db7b6f593f0b376e953229f35bc0c588b8027c79b6bd973ee4523cc9bcd5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a"; + sha512 = "a7a1aec5d8f7d92ce95d7ef12d16633905a68312d45e5e2a755e481b7ed4894e8778a82bc2b91daf700cdd36b574fdc275b3c7b1e49096f173d0ee7ef24175bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9"; + sha512 = "e28384a0bda3a053f639fce02dd0dd54ad00be0f313f28b6d87f01092d626e06a18dd1ada1a8203cae9877acb04a5e855127f47132cd32c17a043cb1c009930a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4"; + sha512 = "7170b290b408a31ef30303c2cc628a3ddd33a16165eb40bc776fc7c9d235f00edc47f2ed3c3241a03e45b532c57969036c40ca4c4d8983638f30721c3b69b1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73"; + sha512 = "43212bf7aa32ab9b1a54d09c501ea1a93e5bcd8e2947c77130e55195d93fb299bee8ca675aff17baa6fb5fa0ce0223eec9ac8416e2123d658ecd672bd95158ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593"; + sha512 = "7fa2dc007c14de2079fb79ce1d290eb36ce101857724e85570f54c47c23073bfa6dd27ab6ec72bf22d9369ee0c73706bec5bc92b67c5d5de179867d6c6530ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48"; + sha512 = "cef93689dac12efdf6e6098ba942a9b345bd273ea1ecfea5132c4d654d7a170afb833c7cef7ef4d52a7643dc9dba15a72fa1a51d69ded365e8b7a0f71e21ced7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a"; + sha512 = "2ff1a81d452af6b038c3170b70fb66d7aabf8440a8ad66136afc84d6b20edda63202de57e69d13b5f60d21860f11da757a74733e921641d8b87cfdc7275c478c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165"; + sha512 = "28a74e3d6b3f75c6ea60a71251adcfcadb1ff53f68b984290d5e207463f01ef00069242de2df9c85f459527fd5d2fca1d6d371c9371fff2c4f34a209bef5605b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857"; + sha512 = "8aa2eb75b8475273f9ec7e0ff3d3f69c79a85c24c87cf391af38c1d2a433ffdd7c905e84de1a2832cb7f69ff106ab85219b63193aab470dcc0e60c53bb359c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266"; + sha512 = "1ad33a7718b842b3a5a47ddc3c24012ced28d4c5d585c2811bc0fc5178205e710f3bd7ed64e00072a22bb17c01281e2bb0d58c16ae0e643990d62b9804a03905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525"; + sha512 = "17447df47d98cdda66be6e337524e0ea2c8cf1c5de032fa1017c812ed2fee5c38f0a65431f5c957d334ca00ec840028a725abb2935c31bf769fc8ae05095fd01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d"; + sha512 = "7722a64125fdd13dd2bd7de7fd0b31a6bc2ae021f5b5d147adac90773f4c1b7c44548c402af6283a2ab12bc53796980a435fefb688a9cea90dc119fb2d61e543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f"; + sha512 = "d30c5bc08420a80f199ab2dee4644f7a7e5cccef4a7c0521b4b254544ef9f1f3edc9c3a2783d37d370e03b7c1b9b6e2af9a17f0fbf75592b2e8cb82adaeeb773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5"; + sha512 = "389d1b3ea9e7ee0941a8842cb93d2bd69580b6aa3203f14e8ec92cb93f2b44b33e2aa00c5bd6adb359bd2cac91a38c6d7e4e91b2179b91d77c71c3dde4f1fb2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9"; + sha512 = "9214c37f7d13a6fd84329e25a8e19f5324c224ee4fc65b20a12bb14f37c9cd6f421fa7a78cdfc22bc491f0eeeaf3f215e5399098b3ee22b83330e3424d750512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82"; + sha512 = "12b419b54ca65bee3f61193c7add6cbfe0b19a037834f4bcdb432be8969383572503bb8043b41771e9c33aa25dc843d58cc22aea45b8d695115d9212749cbb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7"; + sha512 = "e5d73cf833fb612a269a843b10da78bd8cfc62e92bfafe2572c8f30b5e167b5a5c36a6edb79c28ccaa13bf00f520e193f1e953e61e18ed96f4dab43e8261900f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a"; + sha512 = "96279db6cc91c8b150aff4f5ef15e70fcb41c0412ae63e33b3456fe19e8080ddeb7af03314feac27b444c9d06329370b171ee3001b9616f0a96ce735e2369871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36"; + sha512 = "d1887e22742ab27ab5d023a7f1812b96bc3f505e7f6b9d7fb21f9ef57be105912f1c4cbe5688c16824c37876f391a77d22cf4439ef81988fd74e67fdcc5cbeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02"; + sha512 = "010a71764b2afa5cf9d0f1d9108733505ab585800f13d7c10bec4f9f3578922fbf1a26741e376904c1febf03dbcffc17658619c8bf22c77d9476777bd71dde53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3"; + sha512 = "6622a6fb8e86669cd5cced64bef601f49f75cfd45f107371df03eba124288184712e9f609d549ae34734bd61b2b10376f3b1a7524b7baf60e3223634ff3c53a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5"; + sha512 = "a0251d67deae2bf3ea1382bbe6e08442152dc66687925f04e5c548d04eaf6258a954b349dd394ac10d4bc945de98c09937cb2434b328e07b7d55da51a2434d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc"; + sha512 = "327cb543c9a065e874984968955f542cc834b569a7b5c1aa34a71ece9307aaed4c7b4b71fbafd4aea6de19265b61c0b5ac9a688981c21087414b9c2b26631f76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120"; + sha512 = "bbd0eff3ba746da8e547b1b8eca26ab6f75f7371ba532d265eeddab90ae5386b1fcec7e28bbd51e30ce10b372ee0f045eb018809d9c06de070bdcd1a104d77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58"; + sha512 = "cd19b1a379423a8f980ce8b8c2d7512a6f2ef513df264d8412c03a779a87e81be253a93ac536bba2284ed9491e03354d77499e13d25f26b3fc1e264aad3b2fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a"; + sha512 = "95837d9c588782ab23244bacaf84867dee0a0dffe977e650d231697410f4fda5d17bf15c1d104b0ffde85cda6cbe500c02ef06d6dc8a313ff9b4078c02b40913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915"; + sha512 = "812350aa3fce5908314b850858117a6744118ebe4a7acb30f6bb0b433cf6597020dc1011e3b0e0c0ae36e307d18c32401bf2391f7aba027eac189f545876b9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087"; + sha512 = "34c5af7ae0f4658dc61e32e1a1119e5274930e2d14d8444354c69f30ad9ed418f785c18f8c29d36a736d84df8206536bcc66f4e0de71dadf5eda45c1d8804900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e"; + sha512 = "f94347638aed6dc1a922f5d317123ecd43f3fd2ea90733e306b3294020d6d342cf405c2bcf36e3fdde029008eff2d89362d3391984494c4b46c6e22d1167e5f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3"; + sha512 = "9ac83ee0f4ae3575735b352565e77f1679b42beb0180fd130e1e9ff9a08f5dc16bf22cdea964c7b301943f98246a04bb9e6ee701bbd13ac39a9918e23243ebb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92"; + sha512 = "e790a8b0e681c0ca2e1050f10469de7d40285d1b6320de5c746d247152301f7840b0d97722217ec1c91e8b60d776469312b50b404b00060be1c12ddce66a1bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282"; + sha512 = "743098c536707cbef541dc3a5ee7cefd1a6bf57ebe19bc059e459c028f95860714b5b37c086a3501ae61e7750d04da55f9f711f92b8619d8726e5b6f3c1a9112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c"; + sha512 = "a667d28a6ddf5d0d8d12435d0b9187f25a89c4432a74d75b71455b3ddad39ffaf6466028b41fbbf3b27c2eaf8fee8cc33eeb7f9d1d8d302a07ab0d17f2c55a24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd"; + sha512 = "f94fec90086a3bcafeb27b751c83cb387ebe7d3c4d526a4989995df37096605476fccdc936b98d60ef3aa213df908cc9bc63878888354b54cd591ac3f9aed11a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9"; + sha512 = "a18afe847507286caac299c2ed943e0c98159a6492c1c76e157bd82565831b2ae0611548f441a2ca6fcf56aad77db2c6147c4fe115d4a64fed6bb580c5f4fdf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8"; + sha512 = "71de8c374087f5bcb2a39e4ff602369996e7cd7f57eb6c0ed10889a69f3fdab87205876680c3511947a4e4a4b3cff8f85f75bef10f646360cb739bd3ea9d2e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9"; + sha512 = "269bf1871a8b70771901dfc21dcdb073af5a11f7df9b512995bfea91be6d8a27660b1c6e18a7b952f3b6358e7ed2e054e7111eadfdda074cc103bb7f05fcccfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473"; + sha512 = "01fc1c359088029645a2e37ccb40c5638d7a11be97618184ef1ac1b0f67249af24dd84fe4b8c00e19fa2436dcd9defcb1ef26f003b44a0bc039078f26447cc5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4"; + sha512 = "c4cecec4ef1d90bcfdf2c1da97b02864f21c52c23a7dbdc1ad5f10ea8010a8540c98847a1b7155c88c22200bbac51d1802e7fedb21f379ce16b34548c7b063a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be"; + sha512 = "a3ab6bd25bdc33bcd062b0ae3bc50808e1a2dd1728c3f9872b071cbf0d352746718e743a2488503a6981a3c3ff48d2bdf0fe0001bd56cb6b90e675067fd555e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568"; + sha512 = "a67a2d0260e3f83750d00d9fdbc787a12663bb4c574e263cef065b590fee14fabe4e0ee51012f3c434f1ce27f094c6752a5811f71026bd1f1c3dc3c02adfab7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01"; + sha512 = "ab847007a0b3f4d2a7f6455970a12bb1c613f3b9fc1904094e45531de97a559b7e3dafa99319acd2953eb9bd7779b2e6b3a3371d5bb2275fbd58c7545c5ddcb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa"; + sha512 = "65c574255e33141c39b0b17600a7dd957b0d35075d167dc659cce449b0b2c72cf3afb116ddb71ffb20404dd80e2af0db3a5722706f22a62d5cabb5f7e48a1ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0"; + sha512 = "8277dffec3048999fc588c56490306c9da2891d91fe30c49c21a3cf958bc6528243067d02eee9aeb05800cdd0fb98739754bcc6811c8d67f2175f5cb2b3d47ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4"; + sha512 = "13656b88fe3f49c11fb7ed8815b8b0e9782bb8ee0d55ea18ba43e3a4254d5a8b5dbff358f2560df38af6b2d05a6c9738296c38ade5d871c47f02fdeca24f7a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a"; + sha512 = "55f6793a2f885a7a23235e7b8e9f3ffdfb84318f1e4d19e3532f23530b90c199b0595e2085ff6012c36658aabbf05f0a0cccbe8fdf3f7a4503b781a19eea80fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66"; + sha512 = "236de626cf8c423b2fb6fc357956822426621effa6cc5cc2910c59d63d7e2a3812b40dbc1d198a4fefcef6bf9d48086c1407ddbc4689d905d07b16aac5ad8811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e"; + sha512 = "82362cbbc0be52b2e35253637b3fdce21ecc0736770a04e9b19f1d99c18e185fd6e84820c2d086eb7f53bd6852c4355451da4fc8d08b559bd4630bdfa87847ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab"; + sha512 = "dd8a9b74437371f7bf32a71056956d9f38d103c53f727b2c8ef8939d778d32e7b2e6f5e74f76b69db0bb41a7853aedcdd3402dc93f0e6d5a69671abef248ef16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008"; + sha512 = "ccd0ce9840db659afd1364c0284e426cfd3844de28ab06da474688423aed0159e07c831e620b3743b82f868b1d273ca561e906680b90683076f9279adc292659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13"; + sha512 = "6128afe781edc53e4407f3039b84947774e08d72f9734e209a7ad27200aeb01696d6453df9f6044f6af701f84ca479a17f8d43f955102d431c069f409045320c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803"; + sha512 = "fc7b6e37518e0c7350f3871a0980f2ad4b8fcc89164f425b2f8666f73290330fb2e98fba64e410b2f0e8c14207b621db08a62dac6817e7288374f46a29d5eb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577"; + sha512 = "28b6d0ad1335a39d7a742d4592c7ece02412ebe094180d80e7644f9a7c00013dc0e436227e2c58288e2a2d78a4ec092e450e44c21f9465eca0aa5210a0863423"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476"; + sha512 = "31970227a01282d9a5381d988cf276ea1ddefba5fdf97e065e371fe4394eaaa0f092697fbdfd9bd6d8a83e538c66bfbc0b6b8e2733d5efc881ade74ee5b4526d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e"; + sha512 = "4fd5524002e224c6a2601af7f7989647b4cdb7c9bb99680675f5af45508b2555d3317d4d933cc1917d54572fa4571405490c6af1649bf696bacdd4188ead7bff"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 968b65e72476..1fc1e618931f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0b6"; + version = "61.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6"; + sha512 = "98e72aedd104c408be5f040459959ee5f1c6a7f0716db2f5e8b3f19db0a56d541f7f1cfdd9528a863bd6431461ee66fb6bc37837a805bddfe7733aa9b03267a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25"; + sha512 = "9d96f72a7bf9be3984999f59a0ab2c5eb0a569553c9075cd6c9e594e0d160f2a53a570a723f230cf8ea270c4c22cb3de040a09002acdeb3f3f8b7596c7cf181b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d"; + sha512 = "45d46621e837ae4f1540d26d9ea048717ddb5aef75bef7f1130bd846d3482c09dfc723df81e0666e25aa09d2c50684f8b95252c3097d5b87615e5acfe1020627"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8"; + sha512 = "9b82ec22834d6460861bad085e5c7f1eb30e35c4deff367ac33e6ff69b4aaae4a0cb63e24b686888003c02b126d103c0055eca853ea0512a3d63a3ce84d65ce5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6"; + sha512 = "25fd9af7699cc51e514e68524ed7f3b60f7a4506d88120b9458cbf7727a7d7a8249f57209e8f95c7a3cdba3f27d5e3a5ad7f363d89e7fbeadfccfcba150cf696"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5"; + sha512 = "0574a2caa146049b52c21fe632bf47e8880524624af063266c219be25845af6e24f0e315635d00a90dd663199bde25f9250e97f4481845e02ad87b957f4a7506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943"; + sha512 = "49a86939dee753453cffebb909edf0c592089c24a0d9fdeab6271a306ca8b235e4965b687027e68617b745a7ec4bd055775789af9490225c372831641e164001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a"; + sha512 = "32bbdd608037f5134683231bb1157c64099b79c36170381db7ef5e4e23aeaa52d6331d7be31eec6b8518b370a7000e16616545650326b3968de8802c4f011c41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554"; + sha512 = "c7ad8b857a67c2306e26009023cf4d9b55c5f7c3e42ece2703540d90f97b192d611f40b0fec8b9181472f749d70f20df550dc1c83c954c4286f3c0b3b738208b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488"; + sha512 = "b9ed13ad1161cdfeff5f19ec022ba1ccf24f3720680f7c6c67cf46d997787f9e8f7c1aeb78b7a4871ffafdb68a198f1d049e1cbd855c02cfc11c5a130a32066d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720"; + sha512 = "66bcea77afca3b39b5bf66fc8861b25d6556142642d8452fa29bfe6a7519f4d0e1f102ff4b8a251e0ff719eda1bb98c06c591e38248d024c88f5ea9dc7c49856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14"; + sha512 = "b6517c8845a70a275a854a48df1aa5f4d21912b2e2ca08cff88919381d848ab9f472b60c9e83e99d27ad3f1a0a1786fb0dfcba99bfd82766f9335afde98f0ab0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd"; + sha512 = "e6482d66e6f59d07b652179310d07c2d0bd2b189ead907962615c01cbc365859af69ad92494fea98d5b5ee7609acc4d30e5c0c90bfe052ffaebcc11835bcba9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b"; + sha512 = "2d11907753ff1d79f79a5883477251380b29d83eb0bdd528e707f584242e6a24da658fbed1b37e2a38394b612ebdee9b525c8984ea1f91dff31f97f2b957445e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc"; + sha512 = "5004eb99b5880f43b14eb4f74332887d526cd3c969c6c2643f76246b22a5a40f0c2e7333e1c8f8a83b30cb399cd659c63224c581d215fc41f49b6143864eca7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98"; + sha512 = "3b7552ed106101befefd6d5299178cff0f8faaa838408cbdf79c1460e68220133fc25e34cc9a203f04edcca1bc6dc002b78226bd79bdea9876cfe05d8201c6b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4"; + sha512 = "7d5e4361acc5cb94bf7178d8160a6c146a1c8056eea98cd752d0fc6620b994d956932dca5cf1c8f3f67e279fd1f4debeefe061e58e1e255ed8abe90a8e13d4e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5"; + sha512 = "8800b03eff899760729d905512eee77e9f4590c896f819e9303533512cdd47a2b49346d46616768a5fb1fe195cb3ed3a6deb31097ebfd428d79e80d6bc1250ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601"; + sha512 = "64a845fdaec33499cb2863813b5b3ebfe8f5200bb615ed6ef2961106afef677c620d117c59f42fdb4206caf0a875bce8bd932ed84b4ce8a3e0d5129abd2c699c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03"; + sha512 = "2a5fab91bcd025ea6f0b327bca397dda31c51c5a6fe2070bb7f955379056795443bef4275daf362396d6dda6a0ed2c3b10efb0d3ab21e840efaa368e51501f01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f"; + sha512 = "72fb83eee5cfa80355a1aae15b627589a1d1d559c6073da7a5d4ca36fdc19b4fdc4addbedb921d2ae24ef2b760ce5e2414a3158f817c0944f566fc7b1dee693c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a"; + sha512 = "92ff8d0491b9910a01c2794869cdc008f469378d00ed706cd02051676a3a9b969fa134057df59857ed2941933671dd58bdb1656ad6eddfa8521dcd3e76c58710"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c"; + sha512 = "be34950a70280a979e861581e0109bf8308e81d097be9fd479b6bc1c679b016280d4a52c0cf0d3dc2c33f6b143f68626c15dace6c1f7041508d5f76b975a1d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4"; + sha512 = "d23165f4635549c687c240b1421f6d8c6982e5ca8bc4933b9081a2a21bd583e1faca4ff94d669df153d51824fdbc15d1861b059ca9002f8156529f9753190cf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b"; + sha512 = "d1b17e03020b9def7667ff9704ddc27f994e1889d20d7e6ed876327f8c271d3e66f27329c29c7b3c26cea0f38449a9c7587d86dc08dfca2e415a777812d7b6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39"; + sha512 = "7879a6ad84f93d6cc9221aa336fe7015abfeb62ef5e207691d2e2e6f9c96b2898297a093aa470a149cd16dcbf61868a79a3f1db32620cc9339d545b082ede6de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac"; + sha512 = "20fd2189a0bb691031deae1842e078d2c25522b0650b2c3cb8c3fcdd4d8051a9670f37281705ec1b2488ee7c0179ab7625c936682b38caed774e64529c749ed4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b"; + sha512 = "ecb61862b93bc6dc79ea1b01815f2e42a3b9c7548c724167dbf9545e59e5275f21229ae9ef5f45458cd81fa734a14a3b3c1260492abe83d7d4af3e3c4a7c4e94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5"; + sha512 = "0943c44b9fcf4d3f9f28c39c34e0f94ade4485140d66fb34400e63e00389b9775f78496e4216b2a33ed8afda3e5bdafef592b8f43456a4b4266fc0101b42ca3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf"; + sha512 = "0d8e29424b06bdac469424a7d87a0c6b621b57e5ee00265ea7b5a8735d03cf81c281c9938bf87d462cc0ed74e8016ee9c09bd70182ea64e5ad94345736eaa87e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb"; + sha512 = "81dc587390ad74706a3f963cefdffe2bfc96690ec3cc64e1fd6613b45f977b5f452ac8c42c24518d8649b8d4e87e52a8b0c6b1a228f149aff42385bcfddc8a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2"; + sha512 = "79dc75a9957786f671378ab76a633f347121128e0aab9d1b9c728867fd1c1e8107f0ef48611e9b858bf5f89c265a02d7d2a50968a62285dac3fa533ca84e9c2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66"; + sha512 = "73355261b7aedaf8011019e29b34fca17edf64e74a37e01bf9b72d71d972320422ac5bdb2affdbf54b018a91c492824b06a25ab6e1415905d10a22181678d61c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c"; + sha512 = "8669ae701785bc9499b05d2bc966e283d0a457bbad9f583132abf4467bd6bd527d114a76d6c275c921c32a7b5717db56a9b4b79fc1c88c939cb0e3efb85d3ff8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a"; + sha512 = "3afa54b25ab285049f96c60d6c07f2b5019acd84834edc1b712b9c89695e9addd8486613750776e3791d67805aaf4d2d5b0313095f651d0deba823b0f291199e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9"; + sha512 = "7300b60ede717098c91628f1827d26bf3aa2281919f577921a5e9c9dbdb91f7c53d39e7a831490d55486583f66b60fc12d954f3bb91c2a3f30cbcbf90e2b0315"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2"; + sha512 = "369af882b8e9e4469cb9c83fcc70504f97b505fbb964fbcf7457fcaded1917d19c97374fd37dd9d7ee0bce2143fa7543d25cac09b591fd6d68ec9bc44c532865"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50"; + sha512 = "e34cb61423079cf772bc572e26243ab87a89e6f91024dd6e79df80ecf05895f943e8eaceb1d7918c26d192fcf65832e9032bb44f8cdcfd420572c06401863a1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c"; + sha512 = "feb1a015b46aeef21a93a2afd7528860e9a712058e51cc863650314dc48b262acfaeeec1575a50be0ee20af8522c99a92a9b09b077a22f575842f950a80d78db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21"; + sha512 = "73e012d684b384ef95c780e3db9763ef68c86e94d84be4848d2c660acda981b8757aa8a51e90e606506e0908fa4af78d7d440cd51c9e492c2edb1bba85e75058"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10"; + sha512 = "f9b734a8a2c836e579409f53125aaaf901f3018b22eb11b7c8848d726fbd6a69ad1388e8492ba347d02c87c5638851aea1ac7750273d0c660d5c2a839e095da2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab"; + sha512 = "5d1e16cb0152af48e89f1e517c886a57467c789c04bf0055b92ff347f7bc2d6ecd9bbd20f86be736f0e4e6679c780eaf14a49a5d909139e3055ce9329058f911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d"; + sha512 = "581c0d55fcefc848bb5e2fc851119eff2ba3126afd3865733be71302fd3ab691f14b5bd549ab244ba1f00eceeb881e5ac9f9403c7b3009556db21aa2fbb97726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89"; + sha512 = "87a8ccaa35a96bbcfaa219716ab5d9a3a686e6c0a613efa7b7e27cbafabab8dad57315599f32c56c1455be2be70355b595d15a66828febcf36f30b561a09c9e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675"; + sha512 = "33233fd5261a3af284e077ec9a11cacc62a946fdaf70939b9c7201e12105eb98b8dd3d965ed6fe95a4617144a881693a6588e5869ebeed72c0730a582a36ba10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21"; + sha512 = "dbc3222c66ac95ca23e7c41068c7746a97d86d2155294006b8e74aaa4d377f80d115c49637e7c13e389dc27e1b7baa24398d54d4f03fa11e6f6444e968c69d71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b"; + sha512 = "2a6f98415bef2cb434b271dc6bff04a7b9090af9a0f834d8220e535acbb3bd0341b53916d7b29cdd55bd41462555aabf6f284dd1c10555d451e53ce59990937e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220"; + sha512 = "ee75efb7c8699e314edb2abe63c98fbc1c45298ffe7c92490749716e3fd3d3321d6b91bf38f041f8134877ab9db2223a9cf92fecd27d20549577568290ecc8b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373"; + sha512 = "e1021f1a1492da01bbb4e758fd909c1aac7c21767232e9678919e7031109ac1356f23ea02dc8af6894dd917706347ba635666181c82c7f7558b97cfc61c9cb8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726"; + sha512 = "206afd8684eef6bbcfe9c28055a227a74855bb7e36885a60343536e1aa4af8509fe7346e9ca040c0915975585f4b8a663bcc881bb327b98a0e5d5996dfea90d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db"; + sha512 = "477e034544bfae4897bd244e4de13f4c94cb39b4dac926594c6f216f03990fb2d4595ff32cd72bd1f90ca51f850b6b3cc8e1a26fa6c8d2599adc02dc13373721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e"; + sha512 = "3caef46394dcdec0c2669c864080bef4fb8dfd22f61d4c7c2073d94d8c3b820bb85742791a5edc07df91cf53524bf3fea18d820938a96ebcfe259419af2ab4eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf"; + sha512 = "b08aa17eb8cf8109f7505acd6d1661b42bc0f5606c051ede14c73b2d0298d927f6b803bc02eb1a93e0acc133a6ac9b2515e6c8ccd2a00719e9a91ff5a16e75b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06"; + sha512 = "4b1e8e198feeb9d15f3943e5dc857eb72445312dfb1e5b93344645daad406b8335a00acfd7aa93e4203e10484c73f6d3c1bb04c3e08597d05b11af0bcb26cb56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e"; + sha512 = "0d7f7e0bb954cb84ad168b12c908db5f8449e7f4f1ebcfb902a40e20ece33dd2ac1b3f01bfc716a87d99ec1cdc1607a877c76fa0ce952896fae14d8b47813f0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6"; + sha512 = "b85a45daaf2f0bcfe8e5be8b8c7906804c55402232601845b05e5501db7f3657ef4e8faa336512c9593eea0bbb9dc408ab8a2f5483792dd1210f477cafb5f872"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab"; + sha512 = "8d41ff39bae0fd5a6e9d479fc07dcd3c76db3fcb4a4d041456df2943c77b90989f6668fc8ba8d9043835502d3ec711c7a75eac6d7dcfcb8c7537aa264d2161e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd"; + sha512 = "5ae2e6f2819ae6e9a06dcee582b2bf7c532b796808dc47bd19e81c77b53b07dd69ed80e2ff789315800680114c793bd15c6ee89f48c632874f806a4d251f3963"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2"; + sha512 = "4fadb6ce04a85acb9bd6e21ede16b68643c8259e27aa92fc194ded784185c4d46bbbbe1a56c2ac26b169a6e58439f13f9073534dd14f249d85ba8fab1219f232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23"; + sha512 = "1108a9179a746f00cd01014bacc9bf5d430d1cf36fd5ebb5eb28a85783e5f8257c0d115cee88bbaa92fcec38603be08ca9b22cb9d302cdd72fbb06d2b94db04b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48"; + sha512 = "50ad3ca480e137f93950d701c82a6faad9a1839aae26075bf7133dff828e7341f93275b73ad1eb4fefec8cddf1405c39cf5cc486d0d327181c520787824b3dc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150"; + sha512 = "7cb94252144566feb841d728b08aa88ee50d769521f48ec62b45ec7aabeddfa36ff6b2ebb5f8a0d1e30e2b122e13b4b0600aca3ce1e7bbf6df7e7cb588f97138"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3"; + sha512 = "7f9c3b04c5926f34a97706352f6c919b146c1fedb4db242a6dac3f16da4422d5a9ee124516197c483d31b8a9ba8da2533d2c75c1d11221c713b80b93557da913"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d"; + sha512 = "a05652b8fa3c794792ab554bd255b640729a148ea0c8378b2b812879824c58040cc19a41208201a0f891840be709a191209f1aac08efbaac30409ee3e61d30b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40"; + sha512 = "8b9f0714a0355ef0120e7c2c0afb13925e039097e5402a68565da40f5b2ce538c4dbf95595a8f557f5133ba20373f3dde192ac1af1a8f5f9b1bcd7967b227864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3"; + sha512 = "9f9db7cce63679e5d123afda03467db973539e9a91aae0c1f844f7a036fbfb6556afdc0abf3435d961279a51dd95b95b5a18464ad066e2afdde0abcbf553d194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced"; + sha512 = "5b3a515b6f4f277baec0f96c6c53a97a7b50cdf2d76c07967b406111cd0f926b6c6dc09d1563b15b1dccdd46f3740901fd000665e0c72a4bd53a5181734823fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc"; + sha512 = "96c3379ec8cf52b5501a5b12567df1b8e84dfec2a93a79ba7599d75aaad04875ef2dd4639b185ebf54bb7acfd0a9f779745abd82f696e84a4c865bce7ec001b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088"; + sha512 = "6015582d14edead06910be4a088844a8bd931b13f4800dd884806153e5afec1b9df39424ffe2f88943c05ab195cc983667360831157ea7f41cfc2bcbdc6be6a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047"; + sha512 = "32ca0aad1f398ae854fddc4d82783c761457c68333a7217e62fff9e4b74a2c6525e70756da365669d2b4994851996423a6a9022bb899746c84e0df730c4323f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c"; + sha512 = "633179d1c842e5ce83ef436e1e0a6b31ff0a7edb2d14da08184a7edca5cb2895ef90f2eb907470c71974daed865af53e40ca92fdf57922ebf13c187b8f3cc683"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46"; + sha512 = "0d8000ff088ac948d10bea9d5999366f2208a952fe9a89158ef925a5bb2e1bed8c50f8b70f2a9f8727931cc020b571b0f959cc04626b843c1dcd46c8e70a3798"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516"; + sha512 = "09fa13ad879cf8c1ff685eedf0a74a4e23dd26512320ad1e5c14f9cc8209d74a21bf2d3425a45c29d5c8ca6e2091a5c41d60bab75a75bc73b519cd1cc8b78b9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e"; + sha512 = "a79af673fac2c32ff43de9334059e2b98011f68f3e2aa0f7d0442a7297f918d60776d57336a832c33a182e9c582767e2fa126001e75f99a68a1d1fb43c357d07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e"; + sha512 = "ed976499ba60ad964aabe2001922a6c223449a289094e585b5c0272a6ea712ab8cfc193fbd3ec89ff096e467d4731a97cb6a0156c91a9620bd9a4cc04e033cf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb"; + sha512 = "856d611e360871751148d6bc4767f8509137dec22816268b5e77d2f28b00716e2d73f470e4be741661da90fc1c795e2568260f17edae5208fa42d033a2e6da86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb"; + sha512 = "e8a8fcd1afcd0a6d685ac583a171c1f6d3d9b0cd311e4156621d279d58af1e1502cabfcd39083843642d2f79d374f435984334610797937292ddcbbeddf7726f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0"; + sha512 = "7f5c56d0520685fdca1c82745d1c9e2a34086a07e739d9fb1728afc543ab9b171c311c7be1fc1d19d39f8c2d5afcb36ae91737895c3abc3ca53103b1c1b52f62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1"; + sha512 = "a24a11f791889a6b0845c7ad0850b2d5391548cd7e904682d6d463728fc77b1e864acaee8f9881df6cbb981d307372199c52285e14f787a8ea25285d37441d23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05"; + sha512 = "eaeb3d5e36358e9a17da28ea0d87b1632bcae4a0eb7c36a842276e12642f1cc2fd250b01098e24586dd20be220a31413be0549ea7d284c40a7cc25ea1792847b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917"; + sha512 = "4663a84c9c7f4b111e49368218512e75b8a819fe6fe00b2b299d6f3666e598852eae4c6411c2f7efa1bb9d0219ae78433e94ecb62f124b9bfa27cbf55612f715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8"; + sha512 = "d85c8870bdc303302c4c670d07743dcc01ab8dcd0d90ffbaeb5b5a0a79c9ff6a73afed09b299501fa2a874cf566b2a755b032e243a0fdcd2921f0d52d41c46fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d"; + sha512 = "e81fedf3f452f2fe3ce969b797b41be181fc1d859b93a750c721d0dec4d69a236a8be9b668a2f63c22a5e11fd5f5df750bba02f813f7403e6661b78bffb453b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513"; + sha512 = "6d57838a18e7bc250ae55638740e32110bcb253f8505f7a11bb8f042910a400667735a882d213856a136e0dc05e8cd7cc0f92458a9f046ee92561844978e461b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b"; + sha512 = "a89d88ea6628ce8e57923137faa962a5c06cae186e4f2bbe865bc3323d998903a39abf93bab5a2a9ac644e0806e3fbd3ea11a8d8569c13cb7477aae06119aca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7"; + sha512 = "889b56bb35a5b163c0ff7aedd5857b0e3dea222faa33fbd39002e5617493d143ef64d3b801530fa2d2efa6c1484cd853b70bf9a3e23b5edebec8eb13bdc241e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc"; + sha512 = "ce23933ea889292f9022f14288f6a141a95896a6991ec29f5c69f3c07b8b912f02434158e7b36051e2bef254d977923b248f74863b7d5a8d28e4f0c1be5fe832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0"; + sha512 = "786fca42571716dd0031708f09ddfeffb688b1ea39679752e923107d266652f2d49f2cd67c084dc98a7bbe47e82162d0d12ea9ed73dead6784167257268b7591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f"; + sha512 = "763b525dc7f6e5d2dec6d5f1b7fc3472fcba6d7e31714ff1a4d8bf29f6595b76d1c496ac4824a9f7bcad737f305654b21c8ec2d87a25f7fb0690832df5ef7793"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a"; + sha512 = "8c8acca6527a5061608d3019adf708884750e31bdbd856035e96db77ed6493f8e9786d813654ac0603b9608476c4a9bcb958d8ccfac23bb6314c4ad83a1a8ff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230"; + sha512 = "1494c4408dcd99f54dd0534ded3c6d69b293e4f79b0435c60fb3c5298ded9224a08a75b8850bbf2e94add391d37b14b82a447194aeec706784fd9ed020909df4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6"; + sha512 = "a86f128d1b09263a854c3f9119b44bf69946b382d9e5cda98d279bf2864fa37f453c6f6778c765b23a5714a1645bb663713faf08eb418565115e263c0ef6ed43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e"; + sha512 = "4e318cc474c011b145eac452b7348db3722ce914ce669aad7c44678b807dd91aee17d1e82554f21ff497e5efba3e0e1277ea47de77b21abffbc85b098034b6dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70"; + sha512 = "bc5bd87e47602647f188f5a9af294c87a71387114dcd9f3e42bf5e0abcf91ddcd45d53419281e656f07ff5b815b06bacc9edaceda804c85af3c8aa4193b8ede0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184"; + sha512 = "a16b86c625ca7565d4ee4d888e3d1d2eb2b46e96d4a2146feb3b02224e6dd73f0206ed09bbea17fedfd4b315c7b022d81971713f2522d7c2bbdc6b6528bb34b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f"; + sha512 = "772cb46f695162c0b59abd121b1f0321da4139c4f7f8c4bb706454872d7e215edf1d43d5c179dae736cdcef05615df8fdac2493abcd63624a16afca0ee8d2c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363"; + sha512 = "8fe1d61c2a7bc981f8abb1e654a3b095a5cc9623bb73b6e4ce9b4bb628f17a4fe253e9f38ea8159ed137ff275993421b3724e0eca53fbb824532aed1c523dc90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b"; + sha512 = "c4408e6c0b29971fe67539ed88def054b67ae9db52324667b5bdea895996c30a81771027b1bccea15f4aadd9e2eb5a3302de2d597d43798b70a6f57bd6a63aba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a"; + sha512 = "9cf2faf55c7b862743c32e11f8ed591874df1fd89315df82f211898d70bb0c8c3f961ba91ce4dbf380929ca642952ec351cc38f28c45098fb6b069ed7c538c24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee"; + sha512 = "8b9b28428fc35002a2a965cd023e1f837f154a3b207ddf7e0faef7f7cb33cda726a37e0bf1ae549a2236d7bd29cca2a667cebf8aedd508795d11875435ebe2ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911"; + sha512 = "b9ba2465ebe938f3c211c6e7f38e6b8005b27c460d08f462f8494ff0a88e6575348e2ecb0f0433d4b80d883f1495e2d239b1c4d6f00d5db7e3d55d6497dc87de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99"; + sha512 = "76ac262633330c4bff1dbaf37311e699ef717adf8431e5dfce56ab204ec4745d51dbde20fd29f79d30cdb19055058320c7affb801a0df27af0a6239273d3d92e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe"; + sha512 = "985775b42b9053f703901ddf85af7a78540bb2c7f9e2317d76b93a030d888d0211c4434876b01c1f62c977457b54313c91f72bfa9134b47189a702e39261c4bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506"; + sha512 = "b2ca211293fa09fb70f1df21419ddc6ab7a03182db765a2618b00af9b227db20f8da8a2b8cf9ca4b4a4a8cfab9366981a38d2b22193fe0b3c82918afaa834fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c"; + sha512 = "c6887b108f311d693ca2ca68c4ba9d5b178479d0d5a4f2473f1bcd851fc4fb41b84f905c2e3b67ef95d8c3bb8f97c8a94d5d7a047b74b1da464c679bbe849e4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79"; + sha512 = "a8ff0a459d5ba3b43d6a7dd807908f303b940a0d49878bcff04bad0c8f69d43efd58466588e0d7a8b96f670c9ee3c4cbd8058f4c8f881804c128d76052f062ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29"; + sha512 = "4a170243cf396ae186dd481e07574b8f2b8a0074f51e752885b1de14ba2c78a37262c66330c8c76371dbfa0397712a7915700f817e5d2229c950571b86a821f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496"; + sha512 = "167c0b54145c5e04d3555d7322c643d28239f087f89f352bcf52be6bb472e78dd48773352d56717fc9472ed88e10ea582fea61d758c5f9f744bde591e70cb0f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd"; + sha512 = "f238dbec621fa7263502c1e99d6fd845ab94936884c117e2c3731fcb9410f66050467223a445e0855456c65f511721a714225f1bae0229887253dc474d7d3388"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39"; + sha512 = "53d5855ad975a5d6002b2720234f7b55cc8d34f1fd4c927ba7845d245caf9291daf333e77d9eb73b560e7a8eaf2d9a37f329e6bdb69a48aaa73f6948c28f535a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf"; + sha512 = "07d0286615ce670991b868fcffca0589376052c7693f62150bcf93485829cc19198ee7835928cf87d5c3dd25faefbe4b45752625919bc46f4f1f35de4274ec08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de"; + sha512 = "b8a1c24297021a148c60f9a8ee1baa614541db34bc280e4ed5366f3b9a07d4aaac1535cd9ffef555cc8c16840c3a8f352c2769a1445932560535cf1df2ccaee0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a"; + sha512 = "f9533c950198d7c49977c9b42a8349d241be1a4a2dd490f6459780056906153ca9cd4ef290efbc8b3699d300158fc90cdbc2697e2f5d65962f1831b714b7f49a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547"; + sha512 = "f7b46fbcaed63f1d2a90b70ddbe39f973ca6474559ae3cc998c0f6082203037f6363c34744f2de0ee766e066fe80a88983ce88923a28f73b7fc4f56b7ec7b7c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a"; + sha512 = "759395373de80f58af74c94be676a9e4212fb1c11423ef3f942f367a723a60535e71f81134598d93cedceacced3507b364bdc0f98d5c14e566dc73a1b2368a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9"; + sha512 = "d4a873976c3f044fdf59e05b929107000c9c9a4b5ed837d2e7732d83d598c6d6a6f722855052e9049c0c058e868d595fdca01012343a70404ebadcbac7f83dc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9"; + sha512 = "6ab0a58ab3bcb4d36ce29f0e7118b2f5bde3dbb0eb516bb0c57036292b17fb69b45b79b2fc312ab0f849f4b68b75479f49648d123b7fcc036e5bf1dd2ed81951"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a"; + sha512 = "41e2f8fa5df88934bdde248227ee599620f6378d1cfa708e84cf9b5236d3a1a6a1d268543ce20ad5daf5b9a5b1cf6526cf8624a7cf24544b3853ad1601ac2da5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5"; + sha512 = "151942fafc47528207ed6464d5164304d67f743b3b72a5b52f995dc2ae3d08c57c87639db78dd0b0f70b8709b5d718eb46c18af34e616cde10d3841f9269cf50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c"; + sha512 = "4e4700f99dcebb5bc2989729fc6454e655b77cf504f6485c2e432656604bc241af284c664fd929fff41a5a4c96128feecf93ac88c1524da102e865f8a280c143"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a"; + sha512 = "0b5f5bc92bb56fb5db437a62c330e28ac9eb1e7dd89b3a9f678f7d3ca1d575ab0f9e65a1d1463cd878878913675fa06abaa815a5fe4312847f08f95b660d34cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376"; + sha512 = "049fcb7505ef21ae0c77dbb89b5761e202daf9dc63bb2c1ad249277a67e2ddf3e7a9d2c0a66881fb9b9f6522bf767514087b038df984aa2aa1ba96ae2de7b627"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92"; + sha512 = "e77e7b214149815f6286a595172c5720951cdd58e1165e23b486854e83b406a8060f23a1c75e4e7f29fd53ec361596fb1f92e82ae57a41acd73ec25d8d4b8b1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b"; + sha512 = "df3eb78a2e535b2eded7a2c9ce71654a7c4f937bc8b0c24cd3d8e0a11377fc8827de129f1a7a65962e2d2bf001c4c3dd82fcade612353a6e3e72fafc267deb01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346"; + sha512 = "461d452e2644539aa57e7568fde8e3d870039468ea2c235c1ebc88205f9f53e3d1d8313749907e12eb8561620319e8160402ecf9baf0806dd23bdb697b41b565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8"; + sha512 = "0c296a2b71a8fb828a2284d73fd5fdf3f8d71fbc46d0c13ae4bce534e686dd008ad44ceb0e2fe1ab3f4f1efd8153fea9e704bdff72eb7fab0abd8849b625f7cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500"; + sha512 = "44989dd727ed54dca4ea4ba035b74f0129262289e0888b2f04502fdd1d675bfb2860cdba0a9093c985ad40eea131b859caff73f53ec9616ece3d9871e1dd8925"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d"; + sha512 = "f6faa25750832a2ad378babe29558dbb76e39759403af59aa445b2f5042af5776e14f2b1e99dcf9df949bd4826ce057e7cd27f64309efff2eee3345b00246934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8"; + sha512 = "0a6b4476622ea6c1064070b9bf7c80efafd8c55a2ea231733ed9cd2d16c68e49d0f20017d00c419c6e9603583866e321b1b441ca486cdc558812901c46049fb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5"; + sha512 = "f9e3390601d0340d7202c7bf99896f8439e69645ca704aa0943ee30c55956a6a806f1d56ef856e8eacef2fac84080934f3186cbb21e9527a0b5f878fcc5b7c52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc"; + sha512 = "c79bdbbbb8e458f72d0cf0c80c197f55d88d4c8e4adef062dd752e160aea9c8944b0aebdfe2428d45b93fb6b902caff306e21dd3c3dcff7181a9a4bbb7ed09ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675"; + sha512 = "b1a1118ab0cfc073eddddb6a12362b84438ee44919949ea1d4d331126c67d3afb762b6fce9f34b44b04fc4d64cf6ea6cc0865c2067d69d2bf5da35922165fd18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227"; + sha512 = "3193d4f7be6e44a642d14c2c4338eea9998554d022ff524cc9f91b9395dfa80ef9b74337e246b190a3b6f87ac63d6974231b4b68de799745569d44904d08d50e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f"; + sha512 = "eac747092b65ecbd2e92d833df338ac3637bef7bf083d6502c0d03d5993e92701b643b728f561fa6b431dea39e75cfe8df28c194c1a7abd02a8362075887deff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa"; + sha512 = "9e3bf811f8733019d3e5a0b1da147232fdea907d6f493bd311440c1711bdfcfa610fda6bfec6b77b91cd48b6c0bd9835da2edab4e950e5cc289cd00db8ace3a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29"; + sha512 = "774b5f66df1608ee613f28989ff38a64eb017c8671f6fcc8d923f802dc4700b25b71c239b2c6c39f89cf217a40833a5a81559bbec98476acac5f71279675f357"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752"; + sha512 = "e42af15a9713eb85676fd20fb1243f1444eca871e724fedf00653b204156ff57478e56d84e8e22fce801852a3c5cec91fca201a3000f7c3aa0dc54b019b6f387"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf"; + sha512 = "5e4cf51eba5fe02c95179af802ba0a395f03d59cbfdd8dcd670b4710fa11f4c329d4a5099a8799a04c249105472521149d26c65c28520fedcb851713889cb4ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10"; + sha512 = "a7dd519e7b79a1f7473a6ed30ccbf465ac6132ee3d329fb7d823bca7917b54110e8979d0c4606977789f30ff50b87fd27a230bf18b5397c12d057f0877d28aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea"; + sha512 = "a98e5c9a195b0b90d0e352e6d52d26c2c3b48874567a23700f8acb26d551a1d8947bdb7838bcd7f9fbc8532a55afbaa9e948e563ca421088ecec2480bd6640bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182"; + sha512 = "01810ec36be0842c6fa4b2c766da20f2b6e551ede85864bf1533eafc17779282591c09d5f7cf24fd634cd0db34aa814018cbb2f78ca07be93b465061c90de7a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566"; + sha512 = "729d675aae14368a3a665d1fc4150d70f8081cb997d56d0bfe1c1599152c17508fc59263d5dede6c4ab0ebe20967d6414eb35a95ef438889f611a73917dbf304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b"; + sha512 = "18ce4e11b7ef42537023792d98370b304ec39198f1f93affdf17ce9cb81806eb634ee2238cbad3b5e31145f0c99ed83d52b138263b3e726c72ab05ac2c8f3f3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88"; + sha512 = "635b2436580b409417c92c90bc79fa1d292c6afaabf2e9a8801ccccf8380225953b85fc626f3f94f0860d2af043afe319beac0b2bc5426f08e44f58cbeef1120"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1"; + sha512 = "8f6dbb4d245255fe06bc5e738063e59bccd9a5f951ba27ee0867ee356c7f3fe90915a75048a7a7f5a851ffffe3442905962bce6cd06fad81422540005317f87a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391"; + sha512 = "e4184d8ac4f186de4f6667f4e52b9655ef37a778bbb8dc1bbcaa1c1b82d5d4522ece4b7780142b508addccb7a1ee1f85255032d913915986bce17336c7707a75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13"; + sha512 = "117c57d6b42526933f9426ac18aa840321be246eac04f15e39400846031e249eff35b0fc39328427a22e68a392bc5f7907808b326a696e6138542e956f41f0f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591"; + sha512 = "0fda8360ee74c5a79a9625c90cdd0956438945de61a0fe3eb0a1414c6d004274e90444bc01f0ea65145e897faca345e35a4902d2ba3a5c89fc52d19643525d0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57"; + sha512 = "a6567c4cd90f814c0f0abea87ed7991ede97713b1f7f9b01432b0ca53e0731d0598840688b8265bb0a019d7e65b42f89e9f43bce466732c90332e1ae28226848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0"; + sha512 = "16cbc3adab6d19dafc7c52cf6149b2c544b998c37afa5edaccee1b0b5f5ba8cf9c94628be4927af777628bc6d22b58c10c29aa4125b9799891c0e381e9959f6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425"; + sha512 = "b7d5716343ca3df107c103e1827805569b6d68ae4af6b9cba07069215dc77965344e0a280bdd969b108acd1e61a965aee04bdcf9a667bb8f1a2d60a216a8a883"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a"; + sha512 = "d7d92cc89a125ba51ff0971b5e1e4f3f75bf4a0f057a475889e1ebd32c698a189122f062af207b62d24d9bc88f2da92aee7e070b4fc1824fe48502ae3178c9f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d"; + sha512 = "10fe26d49f964163c4cf151cb1da1003a2babfd54607078bfae08a10c261ea6eebf58d7922a28b31e774aab5ff8dad9d3af7ebc6ac43a9a1c8bde89ea2b9c2f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5"; + sha512 = "8e803bdc592ce0706e6bb074ac92853b5976823aa6d64e20f0bdf45b966c467ee2eaf658b3495310b03e1a5fdc2ea8cf68447dc367c0070ac804b1f2c8ce7aea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31"; + sha512 = "7f835175b2575958ed9c9a72de322c89f8ae8964a39a454f18a106435b9a1c5873ce2eb411ff979736bd0cef36caa03f048bf7ab404613a7cbd58b4756794386"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3"; + sha512 = "822382bfb8f7efcb16252c19993b9b7b4527073fa0de80da80731876ffdabf76b2fff53bedf3ceac0b7970f74f5ced506f446f915967b6a39963a863f22d88b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639"; + sha512 = "42a5cddf78de17154dd5fe34f7ea6f9f840c4f26afb7787689aa49b1269758603a9b23e0382085e1ea8fa87b60cb4655037d1e5be8b9b4c314ac423bbf0f3f40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279"; + sha512 = "f56c1144b7c5c45393278a20b7b59700e1e2a93ee3a998b4014733cbee9b2b9f46531a7400ee1da615e59027d7ab2da0767c53725f2dd95d6c9d1d59c7945466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724"; + sha512 = "8498765c639c1a6fd01b8f76e35887cf139125bab3608cfcc88b6be7bc731e10b2908def1e6a63c7b7d6ae9f23006047abdbc0cd593e739de0a689a369881ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435"; + sha512 = "59ad5f1705e39992108656d1e5522bfb7b2a61336cddbfbcf3120c95703901b5bf613a213d9694523b196fd436995b1be13affd431f2a3b5df4bb6a001d09496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345"; + sha512 = "72bcaea40129d248218f944591242e08f74cc714d8686cf668ff2e96028a3ce0e462f73fa8fd48c35fbc7aaeef74df201b4e134e6d8b8fde3f46abdc8f10870b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9"; + sha512 = "2bb457ce772fc6a6dae8cb6b6f41ab0fc19a495e9e253ae1ddc55eb00485020242462f1155d5c250a3d73451081ce55fc84c0c625cd1b2d8a71d3d0555940ebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8"; + sha512 = "bdc9163085983105a712580df72ec7340afe410a49e4087f73483b5d8d78abe41a92c5be3e776e743405806dfbcdc1c023ad096102df566c73dc345c5ddb8252"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d"; + sha512 = "f2d178abe8845ec27d3a36e963abf9a3f9206ae20fb29c8538851025f4bd7aa45790e3752b319fd8aa35a5c37174bbfd86212fd37297172c86b3d92434d2f3a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761"; + sha512 = "127b8855d8b1609cfac6ed3591a211bbc0eca6020b019b97eab3ec643caa7e120e052537c5395beeeba0250e5b3e390487bce3537d3f85367b5be80d49478618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2"; + sha512 = "2d34166f962aed767f45734a86fd976390fba2bdc389c72911011ef73abd5ad74e2f83a50bcba9b4f80bd39e28012d67668112c4bc18d861fa9c2ee00181458a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf"; + sha512 = "55126af093594fcecdfe5354cff608837685f9297b8c33e3de712cccbc33553bce2d91218c93e4e4d3ee21d0d3cfb5ea9272191d0227a8350afbf8a18b6bc53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b"; + sha512 = "c582ba4fda0f40129ef0f793259c5f871e8b3d6317c688c2ef867161cfff4ebb1e276a7cf135282382152711bc7c9c8cf9acae07ccff50789830d5469a08309f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a"; + sha512 = "9eb9f55d905507d555f2e3cb753fbcd0583d93789c07bfee538ae52512799b0aa18f5b284fe8a4f7d84c882ee43fa2a6e5d447b5b102ea0f3772ef09b8573655"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45"; + sha512 = "b1c00a0ba38f3d26c165867dabd8723b97ddb73be5f53729aede0566d6bfe4a48ecc213746bdbf5fb724477f2f901763dc62943f2511324951c863e0bb4e1c8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493"; + sha512 = "d55738efb93450f609e9e82fe742972680cc553e02d1407eab00641fdc9f5d06f32c7d540d3da5a2d6c6fafd5fff09b4e67bd90f2d3a9a1db3662f5c8ec0ec9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218"; + sha512 = "18bfa2d588633337778020444bd1fc64b3ec2ee062377b6090bbce3346c85d3ea3b5b254f8597e700fa34a1ac5461ea13fc37c186704dc1e0ef4451d69aa016b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8"; + sha512 = "29d48be03fc6221af7a75e83b8faccbf4e19afd38d67b046cccf9ada6044196ca54ec24a6d43f71e8bda505c1b618340c403906d4d44a39af109e8169e597b7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c"; + sha512 = "7c1576e9c74f576261795fbf6c3e0269f99aad933f8341344b4c2d964a1e031a399c106052669d2b7e06ccbccbd0e5949e793811a99cff719b43033270671dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349"; + sha512 = "2e33669d871d4f8e1414788a616ad640858305c8b44c51719cb31f625572adc04b749ac9e1a783366bae9e89b0411ae10648cd63c552f18037fa9f69229b6861"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc"; + sha512 = "0d68ba0fbcbd3785afe30796a2b616e4205e9890b5df601153043ce985ee09a38a6d7de25e2d8fda2862f5ce4cff38c035c1ffb559c0867810813116c6483a56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8"; + sha512 = "9d97a5d100e67356e978f88e1a2f3a2c6e7172d7152505a34dc45a0fb270d1a3b63952ee5a434fffb4a5fc3dae524316a749a3a89222b8bc368fa95231c2e13c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77"; + sha512 = "6305d3fa7dc7b04e812eea49e29f4a3a740727439d3deaf6c10dd5b43a1e68a60b10a5386217d2f9b0f79554901fbfc047aa5c10a940f94c1939d9da6479dea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1"; + sha512 = "fd1201e1b8fc35c3785186739802f4336d808b00ec96cc31286b9842cc8337dd1066496efb4a053ca2f26fdb1af5386d294eb3ad0b90156b26f79b81eebc8077"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34"; + sha512 = "c11733ce21827136ff9fa16ef616230bad5774184059d4c451113a552c4106a55de1b8abc7befd918033015f6b6721fc689710fc3d35c525cd4b8617ffb79b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910"; + sha512 = "28a15c0d983644f8c550830bc0db26441150194a2a7466fc1967a61cf92034572c9ac6160937ce900b6086be72695903aa74b15e8191ae755d0d7bfb8b1d4aad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5"; + sha512 = "7ceafb0b351ded8298213b7ae6de0c2bc5a82115976c4560db3da334c9d4c4c8409d44cd75a1fa2fc1c0c9af6cacd2e2fdf0b918564b1bbecbea4363b825a6e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69"; + sha512 = "3094667fefc2953514a7ffc4e5940dfaf9894071fde927be177017586a07c12e1e3e697c031e51ec0b72850991ed44522cbff8a24f753dcad956cf2fc827f32e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9"; + sha512 = "b579ffd5c27ecbaef7b313c504a6f127bdf9febb1f28caad00afd16898f4deacae63436226bedb79268d58232f1e16fd0c080e5983cf2005d4ed47888b325609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634"; + sha512 = "3febff89e22c35ce8e96f11922a0dcb75dc1407ad84f9526aef3ba5608416ccff02f9df98adec1bccdc94741384fdc9f05af3fb3a53cf4ccfafd0a0b3052f945"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a"; + sha512 = "d932580b6670bff7de09fe19ccb89092fd621507c557beabae28491bf1d0e6ed6fcee98746822be97c5d5887a75dc0e9a5d02777e5caa46009ffb8007e8dc93d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51"; + sha512 = "cf722fcb15a6509f82c20b9bd3439b5e923e66f5b75da559079a0058f6cb985852cbfed8e390de098cffd39affc7ccb04f40071757e395c2ed648f89a77af504"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c"; + sha512 = "37be96d449f35b77c82e1d62b959613882e853dbcb38798b42edb85d19e4f59cd3cad04e0caffaa9c72651f2a92de32478eced2caeff23fab6ec891583f08ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b"; + sha512 = "e9a9dd3313b18c0945fd55744463d6649e694572106bc0514535c8c7cd06a68aaac1752bd9ad4ca6e98b717e0bd756bc16c4bc538d8522649d312b8165b4022e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25"; + sha512 = "f8c1c7339183daaae66d11c48e60d951c1fce800839926b3a4d9a7b4ab05b7731c0899a9fc1837ec806bd5e281a8d38f9d8757d12e746b330385a19542a13a11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37"; + sha512 = "847ab1bd49690cf0969fbaf24a8cc17f1b67c3d80b47beaaa0dfa6e658e910f8c511f41cd28bab58dbd966ab0b291a1a7d3635337f6be822bda33bf1a3af1ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1"; + sha512 = "8457e61ed1b18e1c6b0bfec1d7c8196c6d9c5e1984b50c0d94f9c6d7c03f16d70449e7c5110de9be82e9fd7995306c04a1aa9d0c58e55fff4145020bd1810520"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58"; + sha512 = "9d3a2636000b053a962e612fe426bea88a20321b77be867a2747b5522f10ca8f4ab602c73525e22313f1d4bfbde269b8f6a11affe0bd4b7699b0ce8298621613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe"; + sha512 = "f03514abfd9792785a7a1c75668ce61a6acf0ef500d837d84620c403668f5290d02c3ad5801d31f1868401e75a23c5ab795d2fc7ef54b94128dbfb83dc82dc7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746"; + sha512 = "57e15b084dc80f4ff292b92a6aa96d7989e1b41401a02ca6c38330ff85740773a5155549766bebe16fd16f631c956d6ff2fa380d823cd56aa7b7dc11cc59159d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214"; + sha512 = "26dea2954edcdf98ae2c4607dd3504ee6e277e6aafb2d2e1026ebfce7730f19e1c3e620dd23078000414a68175c24ac456b4000cced258eb887f7f6c23e26874"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3dd7d9e8e659..32adb56c931c 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.2"; + version = "60.0.1"; 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/60.0.1/linux-x86_64/ach/firefox-60.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; + sha512 = "ca1638e32f121b1f366d89934e5516ee23cbe249596a7600f5ba1986fcb014d9125d24d3d7a38f251aa9fb527d368001ccc0af80063a7f3abb02a2a920bc7fd7"; } - { 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/60.0.1/linux-x86_64/af/firefox-60.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; + sha512 = "f693b42ee4380fa6c0505fb7971984dcb466ef2a1ce90c09e8088e758f1aef5d3ee790ac578737523ba93f2866dcc92722852579cf4cc5898e66adf28ce17495"; } - { 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/60.0.1/linux-x86_64/an/firefox-60.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; + sha512 = "4858341f974d45c982a9c3c8285de2932db81c8dbdd124272e7aaafc0e4712f613aec5e4929ad0182c1801850fc394ebeda38f08a40e71e29ce111c17abbfc7d"; } - { 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/60.0.1/linux-x86_64/ar/firefox-60.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; + sha512 = "dcbe81e9b0910c44530f9b8f33876c8e2df6ca314172f268c9b5cc53010f5f4024b37929a726d4c138033596d904596a6040b6770e796d20a9a8999ff3e84ecc"; } - { 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/60.0.1/linux-x86_64/as/firefox-60.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; + sha512 = "4420f102bc6d665ddb568d3a27001cb91ddd76ac20ebe65c4c6fe58d92b2b9406a47c492c2f5ed4da42a48355e30a982c81da2b756826d239d443179bd6deec1"; } - { 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/60.0.1/linux-x86_64/ast/firefox-60.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; + sha512 = "5294a33939e40bc868041952830593fafb27f7be2eb7fc163571a6d08c7ccf19443f177bd73e4a3bed96d73103d2fb696810982648abfe300973c7ca7c6677d8"; } - { 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/60.0.1/linux-x86_64/az/firefox-60.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; + sha512 = "272fe5c3c276e9f3cc9554ebada40a90762af24cf6652a5fb9541f41aad964358471f2c19f94b3c1ad59eaf93a4ee507617f4ec299d4601c41d72a6620d0cd3b"; } - { 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/60.0.1/linux-x86_64/be/firefox-60.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; + sha512 = "75689bbdb2f678ed36b265696d21d6f9becd7658001e15bbd8bd306e683b69d4762ac1cb27ddbb12638f7e626927e36fc0a16cc7b98479c5f2e21769dcd9cd06"; } - { 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/60.0.1/linux-x86_64/bg/firefox-60.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; + sha512 = "33b7aa767bb6c234dcb8406eb7eee3160424192dc1a76b9c1c7beee1de42d1c623ad009ab714e60c62e07bbb087cc1b08feec7628361739380a767bb7b43a020"; } - { 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/60.0.1/linux-x86_64/bn-BD/firefox-60.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; + sha512 = "3c6fdfe39d61fd681fa3d30a4ea1c1ef7988a1345912592a79b9622f18d1106ab96e099fe56b428568467c0c63b56e2cc09bc5fe2a9705478f458d5de0f36433"; } - { 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/60.0.1/linux-x86_64/bn-IN/firefox-60.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; + sha512 = "d9c67926f2df8faae64a6d9848a3823bd4968cafa1caaaf8b2713db2656c0a6c82dfc16eca9741c274994178ea46a7325b5f72a11ecafddacd8cf4df45683a89"; } - { 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/60.0.1/linux-x86_64/br/firefox-60.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; + sha512 = "a0ad58a34f85b254d5985a1bc6a2a0003a91773ba43408a45998098b98fe104b9f09e4d4e9bc9ab7ec9cd378692beb6e9f7aa4d2e55b49630c807bf0f9d158dd"; } - { 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/60.0.1/linux-x86_64/bs/firefox-60.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; + sha512 = "3c24cba1629f4458832d09df121c897fa08c6c3a02ddb42d4e232207086525ff0dd01adc8e133c4ed2b6fc909907efd87f985cf0bc1d27fed18055ec566403f2"; } - { 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/60.0.1/linux-x86_64/ca/firefox-60.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; + sha512 = "75d63bd285257a1f8a6dd97981914fbe0886d77abebc237f08abb498a34bd1f129e38afd6fdbdce3da3d7dab5a7138e1da883ffad0ca31f954da68fc3d273ed4"; } - { 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/60.0.1/linux-x86_64/cak/firefox-60.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; + sha512 = "d79aaa1c8833f2fa9c9612efb8e5b7a02805c37f1fc45db6f7fc2f6288c48f75880ff46b9ddd96be7f05b674a8201f3c1bcbd36d0deafd9072aee5dce8f18ab1"; } - { 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/60.0.1/linux-x86_64/cs/firefox-60.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; + sha512 = "8b01b051a92320457c9364ab0f28761a7dc574b35777098bb773c9b0ec64d8947a76a2bf3c58b3b4a073e392f7d07b4f804994854c6f625a9e9dc51cad9bf914"; } - { 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/60.0.1/linux-x86_64/cy/firefox-60.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; + sha512 = "9f0e601b41e8f698de134d17d84f1b43d8f91d3319041482fe698fce34c8bcaa0da31e1e113fde72e1760bd93dc11dded02fbc917d69cf1ab008518e54c491dc"; } - { 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/60.0.1/linux-x86_64/da/firefox-60.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; + sha512 = "dc4280c4e4f7e51befe4adc002d6875f9bdc7d4cb592335134d5b0df18462b6fe54817dbfa2815375e8947bf76d81ab9ccec31b7b36f07ca2b11ec04b3bbf728"; } - { 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/60.0.1/linux-x86_64/de/firefox-60.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; + sha512 = "f9c7e6f1b83616883c74ba8fca5d21b793a811868e15e40611c93312f76ca8d8c37c4222454a8a71bce47d1d30e8596ed5907eb9300c3b5a957ae49249808c7c"; } - { 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/60.0.1/linux-x86_64/dsb/firefox-60.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; + sha512 = "fc41281038372262d135de8004a1d7b03a3c8047fc20ab0e6856b696eee3260328a64b59212a809eb03cad7efd58fadda422e44153e7c8e33415d0efe5321c63"; } - { 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/60.0.1/linux-x86_64/el/firefox-60.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; + sha512 = "5a5f2d3f2f83e8c3a4bf358cc9611f1279fbf218f24c4e5aff69efcbe4b27ae08b955bafafe3a73ae1caa05914bd4ad739f1292344d9434f1f486f5e615645dd"; } - { 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/60.0.1/linux-x86_64/en-GB/firefox-60.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; + sha512 = "19b09722af085bdb016a12cc586ec9d32371d293f3c5be660efdb792e2d894d339600cef27325759f0489a0b3a4000123685c19db5b6d933d3f4f51244cd4f90"; } - { 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/60.0.1/linux-x86_64/en-US/firefox-60.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; + sha512 = "2f7c14e1ef94ad4751c7382d7b012fcd36787ee1045918226cb3b0fdbb08508fa986181f54e304df12fdb8d49aadd62afc936f5855939437a7f9d8860976398c"; } - { 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/60.0.1/linux-x86_64/en-ZA/firefox-60.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; + sha512 = "04661ad52e94ad5e8967e21a460fe1e25cc08f9f0f108e9fe55633d4fdaaf23df133b1b73388146c496285d8562b57d38603100f45c4d81787ec02d4c4b6f0f6"; } - { 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/60.0.1/linux-x86_64/eo/firefox-60.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; + sha512 = "bb1bd451569e1a4f116b458bb9d020d046b556c7335589dd6aa13f2a941b4ebbd197fa25728607f8bcfeacb610a94943d01d05b072f212346a5b74e96071f157"; } - { 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/60.0.1/linux-x86_64/es-AR/firefox-60.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; + sha512 = "8b175a74a9688a50adc42a13b4ff4c137b34f09c571606d9a25080a8134640bfc8e0ef757ff88e90428153002d5c71f6dd339c54320520976669c264004a6743"; } - { 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/60.0.1/linux-x86_64/es-CL/firefox-60.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; + sha512 = "7561ea580fa411d7c4a8c4cc6bed455f3287a55a843484d20431aa81f7d08b42386287e3cbf5fe7751f528945d9ed70b922cbaaa0f5cde74ff030101d897447a"; } - { 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/60.0.1/linux-x86_64/es-ES/firefox-60.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; + sha512 = "3f7dea40f758a29ac6cdc8dc9e78ab4fde698c7f8d5369670ae31ef3a09819dd40e28296e2c05caa57e95bf4238f6c162fb81fff6d2bcb4a2ebf26eaad3a225a"; } - { 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/60.0.1/linux-x86_64/es-MX/firefox-60.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; + sha512 = "2ef05c4095c02c22769098c837cabc435d2d84ec60b7ce09682c6625117c93e294bd00877379561728117e33d5991a0272cf48044a035964eb5d9df6167586d3"; } - { 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/60.0.1/linux-x86_64/et/firefox-60.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; + sha512 = "445158a41339640365d8101bf4473dc77df38f8c965a75f66ba8ef48172e6bd21d6813025192a7f98d451b50078faf5485f95b826af566c3e5215a10df2cbcce"; } - { 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/60.0.1/linux-x86_64/eu/firefox-60.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; + sha512 = "7760ad9243be37fbf1aa727afda348f8b4460eb4726d1402e2da82b3165f208eee21b786adde20e7c11aeb5567c6e379210874b0eba75a86f5c88486b4c48c2d"; } - { 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/60.0.1/linux-x86_64/fa/firefox-60.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; + sha512 = "38fff9451b7fc7a027a5cf646ea6666a9519ae57f31ea77da8560777e485fcafa27e5203ce184916a725449384ce7531f41ba5f38d30a05004093c932c052ebb"; } - { 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/60.0.1/linux-x86_64/ff/firefox-60.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; + sha512 = "efed066528af1466f750af19ac816f64031220618cd1c35e8c2041b6d94e0b3fe894780dda51c22e75eb49d4a0f3013c6de9557167de22b85ab4d72bb44d6729"; } - { 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/60.0.1/linux-x86_64/fi/firefox-60.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; + sha512 = "95d8c34ba47b0fbf2b112764c5f2dff684f9e207c839eef45a2443500de6f30b72ded618e116d784b6b315028df8cceb1efe11d3dc08b1af4a0466c016854c73"; } - { 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/60.0.1/linux-x86_64/fr/firefox-60.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; + sha512 = "108fa3054bec0877f35594c6c5f22d5d5bce3eaf5e74e5a1843bcb7592ff84b67160065b32962497577cf59b5375f0bcf75d4676c4e7201712589050a018e00b"; } - { 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/60.0.1/linux-x86_64/fy-NL/firefox-60.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; + sha512 = "9dddf9cc3be7557e495e712f542f5f3f40ef205c893b5773217ff13e93cc83d35c7d7fa3611ebd1223a9cde4308cc8b4d0d0ba8879072e9dbc1d1433b972ae15"; } - { 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/60.0.1/linux-x86_64/ga-IE/firefox-60.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; + sha512 = "a2539cd2e7ec2f8898c98a27e7e70772d42a14a435279e33f2fe192189253e8c0d92814d25d3b2e5a5c66ac02ba6745b5feee1045c965398781fa86b19c68b0c"; } - { 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/60.0.1/linux-x86_64/gd/firefox-60.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; + sha512 = "dbfcbdd6bf0ddcf535821268d0c7fe59541387647124a7b95243babb1ba02e34dbfc3956808aea1bafe5f301a7c31382eb958e3da21a476c7961f44b4055bd4b"; } - { 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/60.0.1/linux-x86_64/gl/firefox-60.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; + sha512 = "743c417dcb7bfb4027b0f56ff9c2561888bb7a66b0399e713bc65255f6283f9f33736abbfb449030cada641b085ed9d6a5a7010c60ada1002802f4cf6f3fedbf"; } - { 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/60.0.1/linux-x86_64/gn/firefox-60.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; + sha512 = "319eb86fac5e121e27a55386d3b9b79a07e4c766ac999ea387e03619f85e1c9a194dc4bc6cb56d66203ae647f6cede6bba81e65c4bace35baec986a18d79045f"; } - { 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/60.0.1/linux-x86_64/gu-IN/firefox-60.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; + sha512 = "37a5b54f94b5532d8bbaff537642bce1ca3822697821b84df523d9ecbeecd991aa2302c65a1f31883e7a0f9519347a3bb5995bc17208e1a56d8c98897fd1d2b9"; } - { 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/60.0.1/linux-x86_64/he/firefox-60.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; + sha512 = "7a9cae5f7a7aebbf25908509efae41430f6f24d91d406964f83da585762cc078caf508750a562683e1f782bd805ba24b59327d1807badf63462a19955230aef2"; } - { 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/60.0.1/linux-x86_64/hi-IN/firefox-60.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; + sha512 = "99ed2ea7f0aaaf214d3d4e60ff1fefefee09c42d5aaee85690d0c4e9832cab67f23b4d3f5eff8f46a936ab91922bb32ccc801db06c1cfaee4bdea3e60df3a2b0"; } - { 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/60.0.1/linux-x86_64/hr/firefox-60.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; + sha512 = "ea4814ad10720b0685713ea2d670c65713e453693b1d6ab95eb55e1ce418f398549ffdbbec172955d0141f275caa424c75bbcb326b736013dd8741511cba9488"; } - { 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/60.0.1/linux-x86_64/hsb/firefox-60.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; + sha512 = "2e89edffaebcf69580fdb83c92830b091956d2ddd2d523885d0cbb858f3a958661c47e65e82a5f4f832751b215d568f985632a466e52cc23254ebf0b0276cdbb"; } - { 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/60.0.1/linux-x86_64/hu/firefox-60.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; + sha512 = "d00f603275a624ad6ded66f71b287e38afc8c4904b194fa0c71ab4f148ce2ddeda286eadc1b2395c316a4ace7aa7ea39e6f50ae8b8177bcafd60774661295e23"; } - { 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/60.0.1/linux-x86_64/hy-AM/firefox-60.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; + sha512 = "da238fd6afbb3bbd7586f9f057ccb53d5dd8068fc12ce6ced6602384ede890b71e964c0c516b776154f5de358b1bf6b06daf91526dd8fd334bc6fb8fa650bc1a"; } - { 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/60.0.1/linux-x86_64/ia/firefox-60.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; + sha512 = "dad9d2b95fa47fc1b34aa9bd47f785e7640eaf44ee51dc0cee8df6897939e3c77977c60b7a8fd3427b23dddb10bf4d0758b3ba08d305c61f7b42dab6b490a6fd"; } - { 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/60.0.1/linux-x86_64/id/firefox-60.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; + sha512 = "17f8ceee4f31a8a37684d1319f9b84685c05f3f2aa0ba3a8801c4132c2f61755ef9427eeffdb38420829e92fbbd24dcbe54906de59d89ff149f055ede61b751d"; } - { 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/60.0.1/linux-x86_64/is/firefox-60.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; + sha512 = "9dc8a651bcf460e48a64661dea924d56d48e37424579b369ce4bce113d3a3405fd65f542096c8d199a2a3db42463dc28964fe92c42419c8aa5020084b82059a9"; } - { 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/60.0.1/linux-x86_64/it/firefox-60.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; + sha512 = "49a8881a2ae10544db31aba2a8f54bce5948ad25a47f8bd221d8982f12fa66cc7caa43e8c1963cc3ed156ded31bcc331ca0b2f784655c7ef0d8af89d7fd2c271"; } - { 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/60.0.1/linux-x86_64/ja/firefox-60.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; + sha512 = "9af0675507f54ec12924c29e051fa4727ea7b380ebcbb8fac1a91481c0405585b4e593324f72b4778538f0acc0efe8878f21f16a02272c5b02acc5ba7be7245c"; } - { 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/60.0.1/linux-x86_64/ka/firefox-60.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; + sha512 = "c5b52b448bdb19945baab604b820d383f48cf75a3fef2b8d734f0874d7aa8ba1e3ac6493e9892d8003371fde1bec8405cb1bb0991656b8d9d537e8c0b77a062d"; } - { 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/60.0.1/linux-x86_64/kab/firefox-60.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; + sha512 = "7f93bb78f7e57004fc22863d7dcd40f9407e32a606ff07bbc20a3e4e8d348720fff541d72d962d119eab70998925cdb81ab816086bb8d95c4724a9c02a723587"; } - { 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/60.0.1/linux-x86_64/kk/firefox-60.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; + sha512 = "fc60ad4c8c2db9252e4975534a50b373bd5b223ea8ae6e6d2a7a07bbaa4834d078ef2756b40dcbab2cc4dc1bdb5feb1def890021c1d44620a179dbb10ec2ab28"; } - { 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/60.0.1/linux-x86_64/km/firefox-60.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; + sha512 = "c6a544c825f3895ec390275e823da876113d74e16fe3c61838c55afae38b9ba7abdc05e28d1b66bdd3477be0e4b0b792fa2244eb6dfa7aa4a189da438badd823"; } - { 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/60.0.1/linux-x86_64/kn/firefox-60.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; + sha512 = "c42366e72d38cbe3301d52ec5c6e34d5b623d5f1a06e8309cdacb5ed6b6a3a356034cbe95ccc5c6a8b320dd41e8a92564b66effddab4a03476dacf00acab3fc9"; } - { 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/60.0.1/linux-x86_64/ko/firefox-60.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; + sha512 = "4e05c5d8956661956581acd8bbd93eebaa84b6d5972da34b976bb6f654a06d1d0286504350b89dc43988675a3a9c57890dcec81c4a39ad87e0fbd0593a0e1d63"; } - { 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/60.0.1/linux-x86_64/lij/firefox-60.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; + sha512 = "68120d34a56f65afe99930e32c0b35660c36b38d61e5f60f7ad5da131b1c95d02e241124379c11b6287d2f8794191d27ef1fff1f5c4eed5dd3a5df6f5a2183cb"; } - { 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/60.0.1/linux-x86_64/lt/firefox-60.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; + sha512 = "149ee7cedc772534427202309ec4060e8187a847b79dd686096d5ec2c44b1a0656e8c3099606e921942e8c426d0206551fa5952dc0e9abd1d510320fee26926a"; } - { 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/60.0.1/linux-x86_64/lv/firefox-60.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; + sha512 = "0e630d9a09895fdb06c6893d7f9f3bfe3c3832d4a1682e2f12ee89611570b6bbca695bafd8dcfa583525645db86a156bfcf97afb575c44c19f801a43edd824cb"; } - { 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/60.0.1/linux-x86_64/mai/firefox-60.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; + sha512 = "6c3dc9e2230a3f7d74390e00e661eca28306996cb8d5379ee7fde818dc09beb813ae5ccf09319510a1df84e3ebd45b7f1a8a08e776d046e39a69f724fbd79da9"; } - { 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/60.0.1/linux-x86_64/mk/firefox-60.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; + sha512 = "60353c437af1ed116c5d16a4e5d57a1b99016a36eeca8f8e4e8379553a5374cea543dd8a9864e448028b2f188ae16180590da7e199ef96fad604e172fa1f6e55"; } - { 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/60.0.1/linux-x86_64/ml/firefox-60.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; + sha512 = "6065d13e781728dcf587a1389d3893ee69e7e49b601cccb293e2c13dd5e0b5b039ddcef5de3b8b61baf30aa0e994f44eed6f29b38c94b3b24df88f102b0721fd"; } - { 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/60.0.1/linux-x86_64/mr/firefox-60.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; + sha512 = "ddaf770f926ffcb612bef6169cbf073ed4c624635d00db6edd3ac6c6051ebd9ab926ae48f2a9b92a5816c6aa2e6b5ed33ea90827f18c70b7364bc33d6ff9174d"; } - { 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/60.0.1/linux-x86_64/ms/firefox-60.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; + sha512 = "4b9f1e63cfce7b99e05d54f99b7d42255f2e2875718e2ba0e173a7aa53113ed990f1547ecafd508a8547b696f036ec88826260545ab7a6b03d4acde8afbd1fc4"; } - { 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/60.0.1/linux-x86_64/my/firefox-60.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; + sha512 = "a82103f7dc6880e8e81ec3f0f9b07af4dc13de369eb87398dc977f2935387e489c6e61ff2f5a2c883d5d69ec24cd556bc44c722592d432a3a8f82420fadf11d0"; } - { 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/60.0.1/linux-x86_64/nb-NO/firefox-60.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; + sha512 = "4a68aabf3a6a085a8a7abfe705ee67b724243696e63bbd5a9324a1a39c2765db0c75d1fd8b652b78982702702fa1997831945e2eb56b059efe55d64d351723d6"; } - { 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/60.0.1/linux-x86_64/ne-NP/firefox-60.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; + sha512 = "760c819b44b1b2d694ddd5841a97f586c46fe2661c18a2d9f6831ae24a1f67a90beaf5592d8dccba35868a0e608f80b0a652f9c3af8e01601dbfe771d35c38d2"; } - { 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/60.0.1/linux-x86_64/nl/firefox-60.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; + sha512 = "698c765c19647bbd6cf55e3812501131720ffdb485058e90e79446b5310d056ee09162253ee334535ff0eff2d544748385ea88d3bc1fb3bfa0044d4eefac8f07"; } - { 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/60.0.1/linux-x86_64/nn-NO/firefox-60.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; + sha512 = "5cd75409e8f952a681cf7485860a0c45bcb77a9b6f3d645f27b34560802772917a8d29eb465b8eca2fafdaa5db1cfd5a37ef2219cd14444296c81b1c53008375"; } - { 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/60.0.1/linux-x86_64/oc/firefox-60.0.1.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha512 = "765bee0da88cdf168a37521e94249e14dfc80f72248e9d6805b098af8d99801ba38b96eadd6461bfa523fc2bb9999652ca2309ae9fa9202a5e5e00d4aecb506c"; + } + { 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 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; + sha512 = "06fdff27a007b45357d17f77fb22b589bd2f0d07866e0f64f00af46a1403f7375df82cda101997d008882232ba34043f26e0e8db0f796bfe30d442eb990ddfec"; } - { 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/60.0.1/linux-x86_64/pa-IN/firefox-60.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; + sha512 = "8a416b28b1f2d73865d151480ff329843e53ad45dea6a1e931fa6426d1d448d47b6ef2e8cf2125d7e03c69bbed90351bf6fe65036be490dbe7688598eb01a8ff"; } - { 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/60.0.1/linux-x86_64/pl/firefox-60.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; + sha512 = "df635d41fc27ccab2eb30d6b73effe6ee33a44f543fa0f7cdfcb9e2ba8a70ba3a5608a914bb80bd4f450b623d3d6b05e0d9cb250a660560cbefdf98d501425b6"; } - { 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/60.0.1/linux-x86_64/pt-BR/firefox-60.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; + sha512 = "b5e23c79428ab50ee97ceb79305331cb36b19f9f76b8473a53f83e669178eecbf06fcf79d067923147fda14863d56bdc157d1123b50cf64841ef3d8fd77f7cd8"; } - { 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/60.0.1/linux-x86_64/pt-PT/firefox-60.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; + sha512 = "03e3dc135b4d0d8c74ed9cd087edebdf26b256768adbf42d3a8e6745b438a9e617d717d9fa68533d9aa5e7c07c64ed42540b5005cd1b36fa04e9912b4e046090"; } - { 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/60.0.1/linux-x86_64/rm/firefox-60.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; + sha512 = "74884aa4baf61bef8707eb94c9cd523707426ee5c5e280a2f18ddc1cb5535d15a83c7125b4734e3472c9e0ffcf2a8aa7837b9c150ecfc2b1767ee42750cd2a3c"; } - { 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/60.0.1/linux-x86_64/ro/firefox-60.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; + sha512 = "d245c0322e0a4d94b3a837c75c8b800505c82472363202520fdc99d0db04b2830bbf522bf1cc63285d103a0fab22083b8dba93c1117df78ec8ccb6c03cb36633"; } - { 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/60.0.1/linux-x86_64/ru/firefox-60.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; + sha512 = "1ff03c04e419498d3e2ea565c02f4716f41370fc97c24166e54d6a07d92ad6f0ffb6ba13f708e4079d00a4c98fc24e36c278414c7b638e29cc7e5f2891417348"; } - { 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/60.0.1/linux-x86_64/si/firefox-60.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; + sha512 = "4467d0a6a69d7ce89e1849d1cfaa81f2588cf8019e50a5fac6f292a2a50c55750130e885334659f834190969636ab74a3af97d6175be5f88e45b97cb772a55e5"; } - { 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/60.0.1/linux-x86_64/sk/firefox-60.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; + sha512 = "1060fbd4bf7f83c851d74773ce0277ebcb7f22769ef95b75775d7546b3fbad930e2a04deead17d37e5bee69f39aa978b65c41e20862235209528bb91a776550c"; } - { 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/60.0.1/linux-x86_64/sl/firefox-60.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; + sha512 = "75f0d0a4af65fc3f3992cd859c7f7f7a9292aa4f0e1906fd4e7bb4106edad80f3cf086cd843bb526cf2958cdfd94403fd110c83d232c533b105e7a79b6b01b06"; } - { 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/60.0.1/linux-x86_64/son/firefox-60.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; + sha512 = "4f5a8dbd2c60874a4158a4f78b66377a193265751c1f7629836c789ce0abb83de85ff1bee97ab8708ef86bb123d0d2ea5bbb2bb21fcdc52950e1c1164fc13684"; } - { 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/60.0.1/linux-x86_64/sq/firefox-60.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; + sha512 = "5b226608e43a7fe4ae8f23eced67af9f512adda9f70c4f33b81f0a4e779e78e9301bb5e95a4b4362ee79a04ac5da81c36005c5b4e903d40f6f4af84b5503c113"; } - { 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/60.0.1/linux-x86_64/sr/firefox-60.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; + sha512 = "143de2c6f87385f71deb0faf6db20cfa5680c5e3f682e89456602f05494624d22db9c577b92934cda98e041f27682103d1755864b0dec5bc3b2b6d9121133532"; } - { 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/60.0.1/linux-x86_64/sv-SE/firefox-60.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; + sha512 = "09e52958d73ec2b32331109a1f1d9798493cecae739fde6542dc4d6ba026b4d2e1d1f3816b4d2b16d71faa3a3840417329b97eb7a8c0fac2cd168b159a61eb7f"; } - { 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/60.0.1/linux-x86_64/ta/firefox-60.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; + sha512 = "72b0e1a7b94eccade119f7e4b251b803f4f0c54783faeb506649b9048d663698e084e15664baccfa79ad2f6c6238a19c1bc61bcf840fbf003df94cd62ef38deb"; } - { 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/60.0.1/linux-x86_64/te/firefox-60.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; + sha512 = "0478768a0e6b228ad924dcda9dca83fbe2d51646503db931ae4600bd107fa15c8f1bcfd4034b6201a72debf561a815c28c54396a45100dacb68d9f04c2c0a45f"; } - { 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/60.0.1/linux-x86_64/th/firefox-60.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; + sha512 = "499aa56d62d5293e050bc67a50feefaf5019385291e4d3a602f35c1e8b58937acaea893a36d4d77e0e4eacacc3c406054b9e81bfe8cdb27c687b4cc6efcf1b2e"; } - { 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/60.0.1/linux-x86_64/tr/firefox-60.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; + sha512 = "8c3f26b9d37e47e3445fb14ca547f143961f19eab66c93ee4a560828a4bed3c773fe09d2e77c350effd76e0a0c447a0121c9ed29774a5ed93de3d707891a024e"; } - { 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/60.0.1/linux-x86_64/uk/firefox-60.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; + sha512 = "ef7a776d6aadd6d9c70594260679810325a4cbd11002bedf5e7d58d36bfc82f72c3c2c352f0d693292992ad6bf9fc323e5947183f6c713f85c353ebe72203b7f"; } - { 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/60.0.1/linux-x86_64/ur/firefox-60.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; + sha512 = "9096d21d134c2e55d694ea9a6e06a669e636b15fc4532bcda12b9944d38eef325e256106004e6f9fa503f5590e5077da5f72a535b8887501a53d4a8c9c0c4c55"; } - { 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/60.0.1/linux-x86_64/uz/firefox-60.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; + sha512 = "d856195097a7923d42a7efb257a9758ce4bb5ec3d93de798bfcea1ff20dbbe1664d71fcd8bc72dc9592bb4c4e8e45a041164fb9b9174c2c75e2c04ade968e532"; } - { 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/60.0.1/linux-x86_64/vi/firefox-60.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; + sha512 = "7ce9b59b89c77e289b56ee8b358409aa6bca3c47b6be004a38037f7c156834213dc5704e1ffabe3fa86f1ba89243abb6efa2fba31eb5bd1f4d95e0f225d0253d"; } - { 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/60.0.1/linux-x86_64/xh/firefox-60.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; + sha512 = "7dfc5627038c97188e4875af30cb88baea359463d5bd47d11440c9f33f84ad4168d860e947e90c104ac647a09f3134892a394b8a8435639f71f7bb9edd92bcae"; } - { 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/60.0.1/linux-x86_64/zh-CN/firefox-60.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; + sha512 = "75d8a96eac39c0c60814718929997e9d4a60a2fd273ceab744bead7164d6bbdbd8057a94a3310709da7b6287549cd44f6d7dabc4bba1bfe1f48f3345193cd142"; } - { 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/60.0.1/linux-x86_64/zh-TW/firefox-60.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; + sha512 = "d0465db2b3aa8a52d8e60c480605c069c31f0fcf80cc757980022bb538c0509b99563ce7fd06f2660dc8169dcd3fb6a8681859218365a3ef2ea822eebeb29e12"; } - { 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/60.0.1/linux-i686/ach/firefox-60.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; + sha512 = "7770772e90d57f9bfe30a5f965cd89fe367ded55c4fc146da547d150c85d0fbe906fa092c2a62ae8df3cccd5702e6a7b1b1680e0522e3164d1df20d2538993e0"; } - { 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/60.0.1/linux-i686/af/firefox-60.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; + sha512 = "c615df0582484ce23cb16556cda202cdd81056d197a78be02b31d3f71059644378c2e24cd42b4afcbb0b610a3f25d87aa1178671ba04437a0885cd90b0954f97"; } - { 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/60.0.1/linux-i686/an/firefox-60.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; + sha512 = "ab0fd2292c5aac5ec5e1669c49f0aa6568f0c8d0bbea8c20c18ead6a52e88ddf08e3ca44e24386a9a0102f0bd7eec12b9e2b9e6713a3958cf13bd978106f7009"; } - { 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/60.0.1/linux-i686/ar/firefox-60.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; + sha512 = "dac0df9a18f1a7d01c1caf05e17edbffa6029733c6d439c26fed0b12d1fa8ad325fa10ccca51cde25ada1f76e338c0e6a8792e400f0ae44771231a3a49a33a8d"; } - { 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/60.0.1/linux-i686/as/firefox-60.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; + sha512 = "d57627a4cfad823602cf5e243c5a1c1d8e5e7fd5cbbd345cac1db7ca23947fbe0dfc8a4dad223c6af8b5059f3544a34afde8502ea29f9ed6e41623ce4d856f98"; } - { 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/60.0.1/linux-i686/ast/firefox-60.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; + sha512 = "32bd3dcfa0a8c63605aefe54a3c96f2dea826d41edce8c71bdc4da5eaffc2b303c8f1c057ce0a4c6ce5d853d4ef55484b5dacb51f27dad5e50b96cdeaa2298c1"; } - { 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/60.0.1/linux-i686/az/firefox-60.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; + sha512 = "e94f419ec6a34100242babf4afbbf23b98106748b7c2f02b83ff4b0a396bf5e003ec1bb3ed36feeeff82c79fb17c18918ee6e9ddc038ffccc0e121dcaf0eb1f4"; } - { 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/60.0.1/linux-i686/be/firefox-60.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; + sha512 = "b23cc179f2c4c5b3d79f6009d87f4772dedba67150e014b792a5d892fd1e09a413ed405d86f82e9f74a1c2e36ab76b2a9e41bd49dc7d16483749d195b56791de"; } - { 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/60.0.1/linux-i686/bg/firefox-60.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; + sha512 = "0d8abaa490719185579d4c24b02ce38971191ec13bdd1798966364c2f9fc118bf46dfa4ae0621d1c6427beeb03f487a1ebccb0a4e49d6ec93372397de56c4851"; } - { 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/60.0.1/linux-i686/bn-BD/firefox-60.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; + sha512 = "db9e15472c21880a07e1337e92fde44ec19a8f6297992b589f20bc05ec37140c41d65097f1759734b9ac13b75c806996e17c70bd5fd0bbe65e3acd6a0bb0a854"; } - { 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/60.0.1/linux-i686/bn-IN/firefox-60.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; + sha512 = "2017273b405a8ff2b9bb1d1c1120c74679a1583ddee9f32e4643f62ef22fd3174e4e01f22e374af92b9821a550b8711d2b65987c71b44215236c161827f679b0"; } - { 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/60.0.1/linux-i686/br/firefox-60.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; + sha512 = "9e7648e312d78397bdc06b0a6921f76acf1916c28c8ae05aa9dc7c70c83d522898ef7e2e847cc3c0cbb19553a572ada7914b60424a46d57c0d7fc207941af3dc"; } - { 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/60.0.1/linux-i686/bs/firefox-60.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; + sha512 = "6e93cd48d03f87e027e913199e0e7b99f5d66d2d81a4d7da52b8f6a38b9b1e43d5ac5ffa56a6eb46c921a695f1826c6f5b936d4622aab3501e6132da26395888"; } - { 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/60.0.1/linux-i686/ca/firefox-60.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; + sha512 = "0e49140d11167e2b6c7d15f75f2b121ab44afffaf1af9135012314c9234af25555a5e18a7ae866d3219e6c0c6752f7ae313f66c7312959fc101c32e417feaed1"; } - { 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/60.0.1/linux-i686/cak/firefox-60.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; + sha512 = "75c5532e9ee936aa24c5fad77c96fb8aa9e84d3531ac6d36330fd3c324c8bdf13f2e7f815d844e639fd06096c6203e4253c9d97e0c7a564b0b393543a892e56d"; } - { 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/60.0.1/linux-i686/cs/firefox-60.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; + sha512 = "32835014bb3b7acb93d566710bf52ebb3bde52f9c17f4b4de64ec598e4a40b9ee8644a2c1866a48aa6598ace07969912eeb09a47811d67d6cb317078e8e99e99"; } - { 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/60.0.1/linux-i686/cy/firefox-60.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; + sha512 = "7b29c7e69a18e817828fd7cfc05faee51a9f9bd1b229a1943443cc3676b4a3e8daf4b52232633c713f0cc3ec4d9ef43a6dae0ec1dcec66caf0ab9d67b1be9467"; } - { 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/60.0.1/linux-i686/da/firefox-60.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; + sha512 = "41aa2e220651b92b8aef3e868d1b9080d1872841d5b82cafa7c1f2d1b0db063c487198949643d89fa0121bfa4287b7dcda99c245f8095b1f3dd86bfe960ab257"; } - { 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/60.0.1/linux-i686/de/firefox-60.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; + sha512 = "7d25282bb59a627dcf09b39ca15777253593c4b91e61e6f9d4d2138426cf8ee16f6d8e509398824d8697e42eb301db29e6843eebfad5eaee1fdaaba5fbe7f76c"; } - { 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/60.0.1/linux-i686/dsb/firefox-60.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; + sha512 = "1f1245297135c1c1550db1ceb110546bc0b436ceaf364bbcd531f6df4770ab694c1602de9f39bf0d9083dccdefa1d5fea21cf9f4e46925cf1357bcc5043f8926"; } - { 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/60.0.1/linux-i686/el/firefox-60.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; + sha512 = "58763f729f19722446e87dc7f0e8044993f9cff5b7f707c3d1256628d00011c48973f4408a8cbca67551b621f67256a9596d91f353ecd82482e3b9278fe8b687"; } - { 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/60.0.1/linux-i686/en-GB/firefox-60.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; + sha512 = "d51d6942aaed323fd82eb833a84ee13e4ce8b2d7c461a5bd1f2f48b2b1ae8c9d900280bd21a2891455bf17711f01cbbe70e793f18e3a0c2e9b15cec274c3da1b"; } - { 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/60.0.1/linux-i686/en-US/firefox-60.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; + sha512 = "6c849a9fe358e06c9db01fcc1f811c9cce59cfc150423dcbf8f83eb1407113378b25641de67a8ce8bfeea4930937fd0ff4e919648ef80b219f84eebc3ebee546"; } - { 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/60.0.1/linux-i686/en-ZA/firefox-60.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; + sha512 = "42280dcb3627c457097887b51a2530eaf32850c4b01e25c62fde1c89e3cc8392ad29ee72ed8cdec11d78f776e4d720235e4f33b21883cef0c4c99823f26c7c10"; } - { 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/60.0.1/linux-i686/eo/firefox-60.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; + sha512 = "0ada2ad4b8ef63b0881d1249b29a39aca65bf2714614e5c074d80d8901124a54d63ec5af4301ffe1483f4e70c6cfcb62db398042b8d12005aca7d95079588065"; } - { 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/60.0.1/linux-i686/es-AR/firefox-60.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; + sha512 = "5c548ab1b0ddbf832d0ae42ff5bc6457ff7aee08b8ac3e94ef65a0e3ab326bfdf6f85be8745fca64e66efd2b45ee992499ccfff963ae21308519fca1bc72cfb5"; } - { 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/60.0.1/linux-i686/es-CL/firefox-60.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; + sha512 = "509acc1e54e03aadf6c2b1b21d0366d52fa02a51f1983107ef88a7a175226021a574bbdeccc5715bd63ad596f934fa69e1c10bc0122359409632d06bde63f14a"; } - { 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/60.0.1/linux-i686/es-ES/firefox-60.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; + sha512 = "e23028c9a8234744001b267ba43899b2740b63e5655ff289d1e45b1132f3fa97e28d7d800bdeaf2d016ede782432db8f7cae1dd8598eaffba3899c9f7a99ff37"; } - { 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/60.0.1/linux-i686/es-MX/firefox-60.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; + sha512 = "a5974914bf0e664ee4dfc0ca2697be5971563e24249adb6b7a7528be67329ec43005fa77acf9bd51970776e9da110019d8bc353a4d6cbce3a27c122399c88cb3"; } - { 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/60.0.1/linux-i686/et/firefox-60.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; + sha512 = "9701a3d97558c3a6946294aa3196d816ada9c721d72993a2b10be24640d48ec37c5675abe3a42df9ca986e8b92f3fffabe0649d3be335e2e557f39f63d454997"; } - { 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/60.0.1/linux-i686/eu/firefox-60.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; + sha512 = "119c5b59dd5520017334db3ff95511ca8ab2d674dfbc85f0cd6f77fac919bbc0e99af18c59f05fb6cdf75f6015cb83ac24d15d0cf4ae3a2b5ed7564c8bc7bf9d"; } - { 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/60.0.1/linux-i686/fa/firefox-60.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; + sha512 = "c45fa6ace31733812411d597362bc56f4672fb7a8bd9b127eb288d7ddd2de3e129721c2ec44a08d8adbc8c15672328ef62384e0139a1e37c6a12ba9ae35ceb7f"; } - { 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/60.0.1/linux-i686/ff/firefox-60.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; + sha512 = "cf96e6cdc941ec347036b5d737d0060a892220ebe6f72a71354a21099a7c82a0fd337bfeb6e6eba53d95af88754687888abc4dfa307348d5073315692a4f3496"; } - { 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/60.0.1/linux-i686/fi/firefox-60.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; + sha512 = "0b4bc6fc0559c05b92e42bcd11513ae20d2101384189ffcff337cb017bfbc5a90151e5c4b8bfe29442ffddfb48eba552a06b3a1db24f7dbb78ff45bfc6a4b5f2"; } - { 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/60.0.1/linux-i686/fr/firefox-60.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; + sha512 = "0ce803471b565c8ca715b1700a54be80894205434060751c31d8696d1716f3d3b8fc19c5a0baa82e78f7ffe0df462780e479597c975d2c476b10540de1e98656"; } - { 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/60.0.1/linux-i686/fy-NL/firefox-60.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; + sha512 = "3dae49cc320f46622ec92d7ad948455a1861f8986cfe9b98bc73035fa41ae44c9b150b9223c037c87c42c5d93c62bdff40784010d2e7f8ee6ee8fb7725c3ee55"; } - { 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/60.0.1/linux-i686/ga-IE/firefox-60.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; + sha512 = "9bc562d1e432e6e45e56de1238b61f27303fe5b475f0ab0528e44f7c15424911b6b699b08e0386dec8cc7c15df9345b7690361b24b9d467841df63d5677392f6"; } - { 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/60.0.1/linux-i686/gd/firefox-60.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; + sha512 = "fd343b25a8f07fd3d5f276372bdeea05bd9692b761051c9fa968beafb6518619ccc40e2d69ef00737ed4da23f092363ba575099137aec85dfb7f6a813384ca7f"; } - { 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/60.0.1/linux-i686/gl/firefox-60.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; + sha512 = "2be7fd719d946a96325e684a14247ea344e9c5e096378f02629f87bcc1180d01010cf46f3baa4edc2cebeb4fb99aa5e1d79c24e7b2d1c4d5da1c747ae884be3c"; } - { 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/60.0.1/linux-i686/gn/firefox-60.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; + sha512 = "d19176ca380d778ed407db04712d51098b57090487564ffefbe0d2e25c4a35596e3ba2b10b9d179e886f38a4d3a4fbdfa7454116a49ec82b6701678c3af7d8dd"; } - { 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/60.0.1/linux-i686/gu-IN/firefox-60.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; + sha512 = "d219e58d9699ff8b3d87822421f032fbcb4f8c3dd7c13b928e7e8a1661d0672cc1582ea55fb348fb168641307d430d66aaa7912e32a9ac1c78091e3f46867723"; } - { 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/60.0.1/linux-i686/he/firefox-60.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; + sha512 = "cf2e5f7f7da94e75f26be5fb6c9e90d089dbab94779fa026ab61f87bbbb0e6ae75e16160c65f19de809bf6527b9d8a92bb0cec97ad18657b07ebb107b88edd6c"; } - { 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/60.0.1/linux-i686/hi-IN/firefox-60.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; + sha512 = "08626ae0313f7227eb144bd264a6f9c7d2e041b88fce8f1ea182bfdf438496ecc1899d9caf76bf00b6ea25604fa6032807766a93de088764e17a2c8449bd548c"; } - { 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/60.0.1/linux-i686/hr/firefox-60.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; + sha512 = "1c9e3ae0e271ed1ed332fe1c6f820cd0ebf0cb01e86ec713b9523a7247efb8ddd4c6d5f0dd93d5522adab2e18e1bcf9ed44ed2a86be03643f1836e260b498524"; } - { 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/60.0.1/linux-i686/hsb/firefox-60.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; + sha512 = "669c3c36fc77359edabced7532e558d0f4e24fef66766b49ca71b4f32d19cc3a1856fc92b716de8507d742905fcb82d6d23f62d542f5adf151a95b99068c7195"; } - { 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/60.0.1/linux-i686/hu/firefox-60.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; + sha512 = "c84788b5f7c670e0a0afda91f47d91f51a40e4441522e049b850bed89908363c74dfea7c9023bf3d54068c1fcdb7752f327f57b6f8812e880363881434f893f7"; } - { 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/60.0.1/linux-i686/hy-AM/firefox-60.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; + sha512 = "ca81e92cc2ddf30c55dbf7124c4f11f0c2dc00466d17e8f518d2969ae57e04e2a543118756bae3e55bc72e668bc9e78ea1e11d952fb233e43941560720cfa90c"; } - { 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/60.0.1/linux-i686/ia/firefox-60.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; + sha512 = "8914b9e45e37602eec6aa20a77ed5c9cf618b0c5d789fbe1821d13ea909148606923d1acbb79006c3fc3e38a4657e926eab02d91a1f47717a9b6f527c935c629"; } - { 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/60.0.1/linux-i686/id/firefox-60.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; + sha512 = "ccdc3eceb51e7ee33f3a49bbb752055bd000152dfe3af1bf9bd7d8a617e217c8615bea4c3ce1d8bb51ab60477956867f5ce93bad472da47fbf47404ab0db9524"; } - { 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/60.0.1/linux-i686/is/firefox-60.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; + sha512 = "802c8d9b77678bdf051633b19a452544028a4be76fde686240a78fad9d25dc7ed38de0c58b54fbe214bcdc46e0cd1b6f2cad5ec646a8fabe3e8c7072b84b627a"; } - { 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/60.0.1/linux-i686/it/firefox-60.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; + sha512 = "44cc35fb9e6375739c5e88bc8e7489c15a80faa9d0327ffb2793916d2674cf71a4b237a41073f05477fcb142bdac8d4ada684ce2101027f551a7241eb46bb7b9"; } - { 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/60.0.1/linux-i686/ja/firefox-60.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; + sha512 = "8daac42dcb02ad640a56196ce500b9528c4fbc2a562549f08d76bfd990e51dc2c938a99becd26860c659e4bdaf90465d6c9c909f6cea95030c61839adc79a4a7"; } - { 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/60.0.1/linux-i686/ka/firefox-60.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; + sha512 = "2cd50870e0ebad8d385b5e1feffa546dbdee31c2916277c36afa9835d01f9e9dc1d7d4c0f386d4baca38eef11a6c0b1cf1657bc7588a1cd5512e894b12acb9d7"; } - { 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/60.0.1/linux-i686/kab/firefox-60.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; + sha512 = "8c292f95480d21ad521df9e4fbbd580306c2615705a37a75ceaffc8f6ca5a24648fa1e0bc97006c34a38b6e58a523a487953c414395c1bef8f58c11b68bdf5e5"; } - { 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/60.0.1/linux-i686/kk/firefox-60.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; + sha512 = "285e6bb268d6b9968d9a0d2cda10c82a790be9d0dde686ba3c0230d84029eae28943e1edf70188fb32c96a7712f13ed9087eac57d690bae222736593515e80e3"; } - { 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/60.0.1/linux-i686/km/firefox-60.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; + sha512 = "a939d51066e185a68170bd7c3d21523c4e3c5d69189822496ddbde0bda46ffba3728211efcebb89808ca6d70d76ba12547bfdea8c8fb3420000dbe39fecb8232"; } - { 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/60.0.1/linux-i686/kn/firefox-60.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; + sha512 = "2207b6883e5dc506d556f8f79bc773f304168029b3282835282296c8b2104ebee6a12e5b1f3887645d366339bc026e53021a004bbab893e3e0362ca28921c78d"; } - { 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/60.0.1/linux-i686/ko/firefox-60.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; + sha512 = "02b13260a74edecb18543679e8d0f969d95b40f87dc237f39465399ddfb5cdd66293408ffda594a53a6514a83ee120c464f3827064b6a286187916109eb0cb03"; } - { 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/60.0.1/linux-i686/lij/firefox-60.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; + sha512 = "2386a05577d90599c48c04083ef1305d84b7a88b6cf22eb331fcda80ef5678755f7d60f418c053dda9aa992aab5ac6ada99bc5e76afca9cec1dd0d250313d277"; } - { 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/60.0.1/linux-i686/lt/firefox-60.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; + sha512 = "6eac885d100539167429293655033e86387d50fddc6d6702f5b9e8ee6f21758e3bf01e340c4dee702958851cdf89c3159ed940545b2d439f8d32a90bc3c272a4"; } - { 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/60.0.1/linux-i686/lv/firefox-60.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; + sha512 = "984840eff4cf03915d04ca12ed78ce06db9c765db069d2cb647d3b795f8fbe6927f6abfa5d8ccc1c2806f10ab45fa7d612a08f4a0aee1b129c9aa4ad31bf4613"; } - { 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/60.0.1/linux-i686/mai/firefox-60.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; + sha512 = "b063a79532ec9345751d69a41a1e3542256c2b623532a524724eda4f04aba6f5174c568cb45f60e332b1224f3cc0f9a0e641e455e3668cbbb52048571715a559"; } - { 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/60.0.1/linux-i686/mk/firefox-60.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; + sha512 = "944882edf6c53dc02682733d50dd09c1df3b06c8bb32e05ee1307504936ced2d408623b7ec6588aac3a26e5c82861cf5bb4db44cd4462c9fd8d9fe62dec19743"; } - { 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/60.0.1/linux-i686/ml/firefox-60.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; + sha512 = "b206d4ceffcf460c73b31326ce2a7cc5d8fefd851a3d824a0012793d0bb0cd773b6abfda81cfcb721f11b3f6b4f38de727a04ab2a32a56f3f7ab7abde6632d3a"; } - { 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/60.0.1/linux-i686/mr/firefox-60.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; + sha512 = "965c85edf69d05c96f3f23b987376c3747dfe9694af92f925c405a42544ac8a2992782c7aea60bce3fab4072db153b37e0f2873a4f42e564e821731eefd05400"; } - { 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/60.0.1/linux-i686/ms/firefox-60.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; + sha512 = "ae5938803a9acc6871577d6629579c0bd5ac4d7404e87cfe373876b94204d5af1110425400f9a7642b13bf2a68f32f2c485c8b9e3565f4d3c49ffd967a8e6df0"; } - { 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/60.0.1/linux-i686/my/firefox-60.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; + sha512 = "4fb3ac47fcd3b7b36bb66fa24ac82bf9ade26fbadf8eea125b78fced6222ae0f2c3c45638b3511b630b50e27fce70739733fbb357744ba89febd16544703b356"; } - { 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/60.0.1/linux-i686/nb-NO/firefox-60.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; + sha512 = "c469e49346a29b8b2bb87b6d3be37f72be7db18977a9085240184a66cced8da5c8a62d09c84424985418e106d8cc1a2359ce8778e515430188ff6921d403b42f"; } - { 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/60.0.1/linux-i686/ne-NP/firefox-60.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; + sha512 = "5374a889f9ae7934c4138b4742dfe50c360858e460b7e348be5ba7196f001453466c84b8bb55e8c1178a194e9500831684f50866c13ccfdd6228a8fb4d17e607"; } - { 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/60.0.1/linux-i686/nl/firefox-60.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; + sha512 = "f937a25191c60c973b0676cc9ad993c07c221dbdc3c3f794c8cfbb2981ebe4d85b0450702b5c7270f47f6daa7b55bb4fb617e113686bc7b496811f5304ae8053"; } - { 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/60.0.1/linux-i686/nn-NO/firefox-60.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; + sha512 = "d95de4ef017c0fb951fcf8c90488acc63f5fa82ec7c72bc87f02aa4f2f4f75c2f4cf1a805958fadacd65759e68fef1be21181ad8511c6d1158bbf331c72b97d2"; + } + { 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 = "d4757d7a79b953a9aa92363c7fc40a7545fd7dcfa5ed03ee45af2b48b71b74a0fcbb841fd580244e6ddcc392c6fd105fbaaa03e42256522e2b51e6b18f433fb3"; } - { 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/60.0.1/linux-i686/or/firefox-60.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; + sha512 = "e5d6ec46f23bb31fd32ec5bf58049d7d948fb7632a198fdac34c004c23b58d2bb08c163e4b53e789529d1f6232fd050142a0c84d7d43d1d334ad3b66857a747e"; } - { 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/60.0.1/linux-i686/pa-IN/firefox-60.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; + sha512 = "bc2d7ef61b866fae30e6b2fe6c542e206e879d4d0edeff4764a635c9927430cd763e6e907d8676914a5dc95d7a670958f332a62d09517446cfa1a32ebbc858df"; } - { 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/60.0.1/linux-i686/pl/firefox-60.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; + sha512 = "c8ee365012576e66468c848d232af3d28796fc7bb8a2971e953ae0f4783b3eee06bd4c1da5725732ee5bd964c2447d1d3cd11041f5d56d88877fc36a6a568dab"; } - { 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/60.0.1/linux-i686/pt-BR/firefox-60.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; + sha512 = "e708e25ba08c0ba92981c0abd27b170086fd7e54be5604ba5b6c4be47012d4cc467f5ee81e5a50ee1ccf413d5e4e3fa29fafca0ce84d4b35001e59e46afa796b"; } - { 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/60.0.1/linux-i686/pt-PT/firefox-60.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; + sha512 = "5a227d1954a93f35d83b7f89b48d6fef10f1ce09c239eb84a3fbf76b2c93f03ecb0890a9c18bc2d2edb01fece405aeafe16ced0420ef8b8ff90efb232d13569b"; } - { 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/60.0.1/linux-i686/rm/firefox-60.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; + sha512 = "9f2caae925cebb42c49c4c2b139dcfd961174aa8a4dd4d323b65d84b6acbef5beb1e5c844f09454d6fa3af882758137d452ba1cbad5cf017a8b54766f4967ba1"; } - { 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/60.0.1/linux-i686/ro/firefox-60.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; + sha512 = "a24ffa5fb4f05bb700025df13384ca5f57183eb94d9826fa82560dc45d50a05c3f96c7c58fb1f609e1efdf3b9d3b86bd720a044d5c5c0ae8886e1d4218189635"; } - { 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/60.0.1/linux-i686/ru/firefox-60.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; + sha512 = "e256695c13cdce7fbd0650561c2e68ca7b3c6eafef5c451b54db67ebd6dc0c14f1c84622cc2550a573932b4ef1ffe20d1608a2d36d3fe0033ec18399ca80448d"; } - { 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/60.0.1/linux-i686/si/firefox-60.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; + sha512 = "b42ffbb1c3948555320d89e7732c145061b91453ed6f70a7d334754264ede63759201ff36bf94b1e33814c0d171541e450f8eb53ef95e8c5320d0e408475ba5c"; } - { 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/60.0.1/linux-i686/sk/firefox-60.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; + sha512 = "d224b3ae2edeea852e2d26314b3f8d22d7c048eebd540107281b2863c23dd7c7caeab9ec814c90434da515e912acfea35d5331beede5b9e6bc74ec77ca8e8781"; } - { 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/60.0.1/linux-i686/sl/firefox-60.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; + sha512 = "c3c1ae0ce8858d1dfeba2e56d9b92769ab06585c86519f754f3ac97a527816bbf7c56df6e8055c04e7b06370c1b9c397ca522991c5f23371ef4e76fb3811cd23"; } - { 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/60.0.1/linux-i686/son/firefox-60.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; + sha512 = "7622a3c211e34c48185e5756168378d60bbfb52784cb9b4e1b37d9e985d92d3d88ba6b29b750578136db9beb5f2123cb1b7c9f47d4b8139b0441b92884620c4a"; } - { 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/60.0.1/linux-i686/sq/firefox-60.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; + sha512 = "8f4f30bd858bba7c2e90655821395522f6a96e38ff169334b034f182162294af8ca2d00da375e03c3e18e1c96c113333ec4f7d41ac01d385a12a7acb3e188653"; } - { 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/60.0.1/linux-i686/sr/firefox-60.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; + sha512 = "00b4b3ef5d8217d7acfb2504c86338ca729f9ca3b69f2a0616def97ca88bcf61f2669f1a4e4acf4ccf5473db08de53c4308a342cc3ce944634743fdc1b8e5a11"; } - { 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/60.0.1/linux-i686/sv-SE/firefox-60.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; + sha512 = "287ae1efdc8ec6a34165bd4588b51c0f81203685d47ed59c01922e87d7d9aae9ab23b1351a7297a493d45645635c2da7458b245ef56991e7ec928fe264576e57"; } - { 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/60.0.1/linux-i686/ta/firefox-60.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; + sha512 = "fde55160176bf7f5c016d7d780e8a78e556ba6d04e1703e6fd6e90ffa278b23822855e8e26a7b86ff38cf006dad3042ea9cd7d4f75b810efa5f543ac28126f6a"; } - { 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/60.0.1/linux-i686/te/firefox-60.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; + sha512 = "5cd75ab1ed134ceae22c0020d753cae351caabf513a025dfe30ab3b146f5c693cdf202f5cb4f48a00fafdfe6584ff693d383a5a3f973e307e9ef056e61bcc43e"; } - { 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/60.0.1/linux-i686/th/firefox-60.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; + sha512 = "037b7e200bb6246e3d95983f5cd9451a10c54be0fcbbf30ec35ddc115395cf8fda3274a212285bbb1dcadd69f3efaab60606345765ed3f69471c5ea2d47c467e"; } - { 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/60.0.1/linux-i686/tr/firefox-60.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; + sha512 = "d2cd7b818c64a6529387d5bf540174aee44b5e863479978b15aac20fe62d102f231d2f1367454c5ddf9f3009776e6176fca8d96eeb221730a477c4fced4b45d7"; } - { 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/60.0.1/linux-i686/uk/firefox-60.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; + sha512 = "4f8ed8dbd4f7bc8184ee4c128382a5ccc5dd6b93840199657a6a2ce5e6ffa5b192d7e17d50ea4a4631f2ef0a5fa225506de953a03e92b4f51e731c436d4d2b11"; } - { 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/60.0.1/linux-i686/ur/firefox-60.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; + sha512 = "4c8db3bf7affc403705bcb5c4da7685a43cc6119e02f3efe8fa499bc22da18a6f43f7d720fe07c32d226d97e6f92ea1611f153d85f7ebd25c038e938acaa3da8"; } - { 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/60.0.1/linux-i686/uz/firefox-60.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; + sha512 = "933c279629ce254da1f7886825a934413a129e2371eb72a8999dc846e0cee12648e68ea9f3b01264aea4c1b5fb2f9081e039b02bc7f5c808307135e8675e05f7"; } - { 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/60.0.1/linux-i686/vi/firefox-60.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; + sha512 = "c2bd138c1edd4425ee7f9cf341cb01d2ef04c1924185c8632a7b2e8ce3c87b4847611827dedfd826ad12028d486a27536c2053b9a677edcf74232183f36a49d7"; } - { 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/60.0.1/linux-i686/xh/firefox-60.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; + sha512 = "2ee93f40b882c52b80297075864a079b9a91ad30f9fbb64d64d4eeddf9cee31b717d4fbf59d25c8fd40944a2df2f0b67e95d1a57cb1031277429a7fe97be0d05"; } - { 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/60.0.1/linux-i686/zh-CN/firefox-60.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; + sha512 = "1ab340e9827d84d757f7b88c165ff07ab2d6202cdf939b6a50d40e23d09c002a49daaf9d4e7b90fdf20cfe36160e2d6518fcedf455de5a9f49c05badd6f0cb69"; } - { 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/60.0.1/linux-i686/zh-TW/firefox-60.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; + sha512 = "3886ef200481d8f0dcb4add628144dfda705edeea37f1560fdeee7a45e797b75b885a2e590193d59f84d13b2c848c42d0e0f94986d3f4c514a9410e6924a71f4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8e1862d7f83..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 @@ -213,6 +215,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/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 07495e7d4707..9cdbcb8b4cee 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,21 +12,27 @@ 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 { firefox = common rec { pname = "firefox"; - version = "59.0.2"; + version = "60.0.1"; src = fetchurl { - url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; - sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - ]; + ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch; meta = { description = "A web browser built from Firefox source tree"; @@ -39,12 +45,12 @@ rec { }; } {}; - firefox-esr = common rec { + firefox-esr-52 = common rec { pname = "firefox-esr"; - version = "52.7.3esr"; + version = "52.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; + sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1"; }; patches = nixpkgsPatches; @@ -53,7 +59,28 @@ 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.0.1esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b"; + }; + + 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"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-60-unwrapped"; versionSuffix = "esr"; }; } {}; @@ -129,16 +156,16 @@ in rec { tor-browser-7-5 = common (rec { pname = "tor-browser"; - version = "7.5.2"; + version = "7.5.4"; isTorBrowserLike = true; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.7.3esr-7.5-1-slnos"; - rev = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182"; - sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj"; + # branch "tor-browser-52.8.0esr-7.5-1-slnos" + rev = "dbaabe129d2982bee00a753146fbe610fec0ca50"; + sha256 = "0j60vz18bwabqbzv0r1id3vcyh3832mzx6cg5r7x5c03s5hn40a4"; }; patches = nixpkgsPatches; @@ -153,9 +180,9 @@ in rec { src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-52.7.0esr-8.0-1-slnos"; - rev = "58314ccb043882e830ee9a21c37a92d6e0d34e94"; - sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb"; + # branch "tor-browser-52.8.0esr-8.0-1-slnos"; + rev = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca"; + sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21"; }; 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" '' diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b619941820e6..5b2ede611d03 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, uget-integrator , 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 = diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e1023afc7aba..65fd22cdf47a 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -7,7 +7,7 @@ "cmd/kube-apiserver" "cmd/kube-controller-manager" "cmd/kube-proxy" - "plugin/cmd/kube-scheduler" + "cmd/kube-scheduler" "test/e2e/e2e.test" ] }: @@ -16,16 +16,16 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.9.7"; + version = "1.10.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh"; + sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n"; }; - # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 + # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = https://kubernetes.io; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [johanot offline]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 38b7e485259a..4f45de76d161 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/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/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 512c31e3d041..822080df10b9 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a"; + sha256 = "1c0b9717xmzvzzxj006hqxafvcpvnnrsifxjnbxxla58jmnwr9v5"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b1339f6a6948..c39e3ce1a459 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, dpkg +{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: +, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango +, systemd, wget, xorg }: let - version = "3.1.0"; + version = "3.2.0-beta25a7a50e"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -17,10 +18,10 @@ let fontconfig freetype glib - gnome2.GConf - gnome2.gdk_pixbuf - gnome2.gtk - gnome2.pango + gnome3.gconf + gdk_pixbuf + gtk3 + pango libnotify libxcb nspr @@ -46,7 +47,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3"; + sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064"; } else throw "Slack is not supported on ${stdenv.system}"; @@ -56,7 +57,13 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg ]; + buildInputs = [ + dpkg + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = "true"; buildCommand = '' mkdir -p $out @@ -72,9 +79,10 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done - # Fix the symlink + # Replace the broken bin/slack symlink with a startup wrapper rm $out/bin/slack - ln -s $out/lib/slack/slack $out/bin/slack + makeWrapper $out/lib/slack/slack $out/bin/slack \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0eef45973ff9..12b6179f8e1a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.2.22"; - sha256Hash = "0kni4gb6z1c22bhx8z27q4934bg3dngk69xcwykbidm32ijmmsc5"; + version = "1.2.24"; + sha256Hash = "0rrji2h2a7fxdl4wmbwj053vwy3hhbaphymjim55klpzj86jycil"; }); } diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 1d913118433e..916bd36ba54c 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -7,14 +7,14 @@ assert spellChecking -> gtkspell3 != null; -let version = "0.144"; in +let version = "0.145"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli"; + sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; 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/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index e1fee1bd78b6..61dfb434070b 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/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index a56c15bffb2a..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 { - 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; - 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 { 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; }; } diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index e215b6f3862e..555542b76318 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.4"; + version = "2.18.5"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qwalb49g8s6dswhhk12ny33xzzj38xa2rj6p6ar0hrwh7aijlqc"; + sha256 = "1lk1qnwc2gwjh8js3rx4qayan5157an6yzxnhija6kqgrxv58f11"; }; buildInputs = [ jre makeWrapper ]; 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..522c708bf902 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -10,42 +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 = "v${major_version}.${minor_version}"; - tagged_version = "${major_version}_${minor_version}"; - name = "simgrid"; + name = "simgrid-${version}"; + version = "3.17"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; - rev = "v3_17"; + 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"; @@ -60,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; }; } 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/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/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 74e88430239d..a3f61f3399db 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,19 +27,24 @@ 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"; 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"; @@ -68,6 +76,10 @@ stdenv.mkDerivation { "ac_cv_snprintf_returns_bogus=no" ]; + preBuild = '' + makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') ) + ''; + makeFlags = [ "prefix=\${out}" "SHELL_PATH=${stdenv.shell}" @@ -86,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 = @@ -112,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/ @@ -145,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 @@ -225,7 +236,52 @@ 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" + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + # Test fails (as of 2.17.0, musl 1.1.19) + disable_test t3900-i18n-commit + ''; + meta = { homepage = https://git-scm.com/; 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=<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/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" 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" && \ 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/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/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/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/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 ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + + enableParallelBuilding = true; 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 - ''; + # 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"; - configureFlags = - [ "--enable-alsa" - "--with-kde-solid=$out/share/apps/solid/actions" - "--enable-dc1394" - "--enable-ncurses" - "--enable-vdpau" - "--enable-dvdnav" - "--enable-samplerate" - ]; + postPatch = '' + substituteInPlace configure \ + --replace /bin/echo echo - enableParallelBuilding = true; + substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ + /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype + ''; - preBuild = '' - substituteInPlace modules/text_renderer/freetype.c --replace \ - /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \ - ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf + # 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/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/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index eee42d2ce1ea..8c429ff1d062 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -119,6 +119,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/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 7d118d20fc68..e5c0556556c7 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -5,28 +5,20 @@ var_templates_list=( NIX+LDFLAGS_BEFORE NIX+LDFLAGS_AFTER NIX+LDFLAGS_HARDEN + NIX+HARDENING_ENABLE ) var_templates_bool=( NIX+SET_BUILD_ID 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[@]}" + 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..b7180870860a 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 hardeningEnableMap=() -declare -A hardeningDisableMap +# 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 -# Intentionally word-split in case 'hardeningDisable' is defined in Nix. -for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ -do - hardeningDisableMap[$flag]=1 +# 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/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 47301bbdde69..2739537c25dc 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; @@ -188,9 +188,15 @@ 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; + wrapperName = "BINTOOLS_WRAPPER"; + + setupHooks = [ + ../setup-hooks/role.bash + ./setup-hook.sh + ]; postFixup = '' @@ -289,7 +295,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 @@ -300,7 +306,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..ed2f00a8974e 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 @@ -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..34e853226501 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -8,47 +8,25 @@ 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 - -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 @@ -83,6 +61,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..9762894607ac 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -14,26 +14,15 @@ 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. 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..fc40fe7408b6 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 hardeningEnableMap=() -declare -A hardeningDisableMap +# 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 -# Intentionally word-split in case 'hardeningDisable' is defined in Nix. -for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@ -do - hardeningDisableMap[$flag]=1 +# 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..1b43d7cc211a 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 @@ -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/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..a0955088eb7b 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 ? {} }: @@ -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; @@ -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 @@ -188,10 +188,16 @@ stdenv.mkDerivation { wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo ''; + strictDeps = true; propagatedBuildInputs = [ bintools ]; depsTargetTargetPropagated = extraPackages; - setupHook = ./setup-hook.sh; + wrapperName = "CC_WRAPPER"; + + setupHooks = [ + ../setup-hooks/role.bash + ./setup-hook.sh + ]; postFixup = '' @@ -277,7 +283,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 @@ -288,7 +294,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/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 29a7306b9b7e..9dacacc1f369 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -60,61 +60,28 @@ 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 # 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). @@ -147,6 +114,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/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f407ba25bf85..d7d03aae33ee 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -91,7 +91,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 ''; 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/build-support/cc-wrapper/utils.sh b/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 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/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/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/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 4bd77d894e4b..1cbf7168ea96 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -13,6 +13,8 @@ let installPhase = '' mkdir -p $out/share/fonts/opentype/ + # Pagella & Adventor are not flat archives + test -d "${abbreviation}${version}otf" && cd "${abbreviation}${version}otf" cp -v *.otf $out/share/fonts/opentype/ ''; @@ -33,9 +35,9 @@ let in stdenv.lib.mapAttrs mkVariant { adventor = { displayName = "Adventor"; - version = "2.003"; - sha256 = "13wnb04z9f766ij30x8bpkn4xzv7n466g07dlbimx7qvglxl605g"; - outputHash = "1cz0lkk2a5fg8r8175h454va499hzln3s99dadxhh147nx1914pm"; + version = "2_501"; + sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn"; + outputHash = "117h6f02m1r54b4f1a98q5kkjchl5pv9ibm1jla6xrzhk2pchb27"; abbreviation = "qag"; }; bonum = { @@ -68,9 +70,9 @@ in stdenv.lib.mapAttrs mkVariant { }; pagella = { displayName = "Pagella"; - version ="2.004"; - sha256 = "0b2pjhw1ihnl951slln6d6vafjd3i6p4i947lwybvg8081qfvd9z"; - outputHash = "0c6s0r14qax3b4amvm9nffwzby8mm4p7r2hfb8yv9jzhjwa5z8rd"; + version ="2_501"; + sha256 = "1kccaxs3vk93la2pz4nv05hx1x3diyla49cz4l33zifdcp2zgg9d"; + outputHash = "1nnjsgplimh29502pkd19rvfg93x31svxxmx4x7h51njrx1j8qa8"; abbreviation = "qpl"; }; schola = { 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 ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 9d2790ff1b5f..0f790f78f195 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -37,6 +37,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 05da06846418..99a45d0a7696 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -38,4 +38,6 @@ stdenv.mkDerivation rec { preConfigure = optionalString stdenv.isDarwin '' intltoolize --force ''; + + 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/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 1978c906bab4..2a26f9301123 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/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/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/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 3c3124cea174..7b83e0e68b73 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.24.1"; + version = "0.24.2"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9"; + sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y"; }; - prebuiltName = "crystal-0.24.1-2"; + prebuiltName = "crystal-0.24.2-1"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp"; - "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag"; - "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib"; + "x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3"; + "i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp"; + "x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5"; }."${stdenv.system}"; }; 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/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 0793a9d7ed0b..b8d93d944f11 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -8,10 +8,10 @@ stdenv, fetchurl let s = rec { - version = "1.8.2"; + version = "1.8.4"; versionSuffix = ""; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "06ajdnyba3v3d37mjq1yim96hsmbx1w5n695m5zlhjbydgw62a15"; + sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s"; name = "lazarus-${version}"; }; buildInputs = [ diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 59ee9cf5e850..75259ed39834 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 @@ -154,7 +155,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; @@ -164,7 +165,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; @@ -267,11 +268,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 @@ -351,21 +348,19 @@ 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; + + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv 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"; @@ -467,8 +462,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 ea462099d230..27164176b532 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 @@ -162,7 +163,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; @@ -172,7 +173,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; @@ -290,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 @@ -373,21 +370,19 @@ 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; + + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv 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"; @@ -485,9 +480,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 8c1170213f82..eeeabe301d13 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 @@ -148,7 +149,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; @@ -158,7 +159,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; @@ -292,11 +293,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 @@ -372,21 +369,19 @@ 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; + + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv 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"; @@ -484,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; } - // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 94e7f8347372..e5c77568a0ed 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 @@ -151,7 +152,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; @@ -161,7 +162,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; @@ -300,11 +301,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 @@ -380,20 +377,19 @@ 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; + + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv 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"; @@ -491,9 +487,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 559512743220..fab9b8fe7458 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -2,30 +2,24 @@ , 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" , 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 @@ -33,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; @@ -70,29 +60,6 @@ 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; - /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; @@ -156,17 +123,14 @@ 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; 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; + name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; @@ -262,13 +226,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 = @@ -283,8 +246,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 @@ -305,11 +266,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 @@ -336,7 +293,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++" @@ -357,18 +313,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 - # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>. - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ - (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ @@ -386,31 +330,25 @@ 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; + + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv 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"; # 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++ @@ -419,9 +357,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 @@ -433,9 +368,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) ); @@ -476,8 +408,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. @@ -497,8 +429,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 4ba6acc670f7..e8c03c382308 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 @@ -260,11 +261,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 @@ -327,20 +324,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"; @@ -427,8 +421,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/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 893bbbc0c2dc..8b1d5d2da678 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,2 +1,5 @@ -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++" +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + +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/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index de12a2ba52ac..4e69d7e0408c 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -2,30 +2,24 @@ , 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" , 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 @@ -34,10 +28,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 +53,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; - /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; @@ -150,9 +117,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; @@ -225,13 +189,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 = @@ -246,8 +209,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 @@ -268,11 +229,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 @@ -299,7 +256,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++" @@ -320,17 +276,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 - # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>. - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] ++ - optional javaAwtGtk "--enable-java-awt=gtk" ++ - optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ @@ -351,28 +296,20 @@ 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"; # 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++ @@ -381,9 +318,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 @@ -395,9 +329,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) ); @@ -438,8 +369,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. @@ -461,8 +392,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; } ) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 7d2f37916323..6b1c909cf484 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -138,10 +138,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 = [ perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 2957846cd59d..63e3899671df 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -139,10 +139,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 = [ perl sphinx diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index c21fd3353c74..87de0fd53f62 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -152,10 +152,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 = [ autoconf autoreconfHook automake perl python3 sphinx @@ -178,6 +176,9 @@ 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." + + hardeningDisable = [ "format" ]; postInstall = '' for bin in "$out"/lib/${name}/bin/*; do diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index 0eaf64cad812..aa78480e3326 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -147,10 +147,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 = [ perl autoconf automake m4 python3 diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 88cfcf725792..0d9412761b33 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.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 = [ perl autoconf automake m4 python3 diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 1f7cc9d7740c..23e7ec222a63 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 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..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" @@ -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.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 9022fced6ecf..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,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index f27e3f0089e2..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" @@ -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.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 9022fced6ecf..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,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 0147485dd58d..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" @@ -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.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 9022fced6ecf..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,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index aafe30e4c9b3..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" @@ -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/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 9022fced6ecf..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,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 5531fd2ab77e..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 = [ @@ -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/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 9022fced6ecf..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh @@ -1,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index b5aea54b5771..8027733bc527 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 }: @@ -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} @@ -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 = [ @@ -50,10 +50,12 @@ 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 = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib + # Clang expects to find LLVMgold in its own prefix + 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 diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 21f0f3e8cf30..feeadf1f1306 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -6,7 +6,7 @@ }: let - 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..5492e12da98c 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} @@ -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 9022fced6ecf..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -1,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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++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 ]; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 919efdc8ef97..d7842bdea992 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 = [ @@ -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,10 +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 = '' - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output @@ -76,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..da5a97a9bbaa 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,28 @@ 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 + ]; + isCompilerRT = true; + 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 +74,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/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 9022fced6ecf..6611259165ae 100644 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -1,3 +1,6 @@ +# See pkgs/build-support/setup-hooks/role.bash +getHostRole + linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_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/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" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 7798418ebfd1..9db5e8ba23c9 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/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1a39fa6b2338..349f19c96808 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -355,6 +355,8 @@ stdenv.mkDerivation ({ runHook postBuild ''; + inherit doCheck; + checkPhase = '' runHook preCheck ${setupCommand} test ${testTarget} @@ -469,7 +471,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; } 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/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/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index cf42c9a7b683..53db5949f02b 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 ''; @@ -66,6 +61,7 @@ stdenv.mkDerivation rec { # This is fixed here: # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>. 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 3a11dc78c6cb..b0eeb89ce431 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 748b3c5e200a..196c899fcea9 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 3541c92fd9d6..4d6f426fae43 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/php/default.nix b/pkgs/development/interpreters/php/default.nix index 94e1e5f1b692..0e161b0e3f71 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.5"; - sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk"; + version = "7.2.6"; + sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf"; }; } 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/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 98e5b4b1da0e..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 [ @@ -140,7 +138,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),' @@ -241,6 +242,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/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 <local@example.net> -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 <curses.h>, but we will - use <ncurses.h>, 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 <curses.h>]], [[ - 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 <curses.h> -+ ]],[[ -+ 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 <curses.h> -+ ]],[[ -+ 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 - diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 797a5be40ff3..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 = '' @@ -96,7 +108,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 @@ -163,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;}; @@ -176,6 +191,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..434c23382709 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; @@ -67,8 +69,24 @@ 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 + ] ++ 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 = '' @@ -90,7 +108,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 @@ -157,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;}; @@ -169,6 +190,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..5ee5c9179534 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; @@ -69,8 +71,24 @@ 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 + ] ++ 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 = '' @@ -113,7 +131,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 @@ -180,7 +201,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;}; @@ -193,6 +214,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/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 96a9cdf0c615..63ffdbb8c0ac 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: @@ -74,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; @@ -85,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/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/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 7e7864cef52c..4e2de01e9adb 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" @@ -44,9 +44,10 @@ 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" \ --replace "${openssl.dev}/lib" "${openssl.out}/lib" done 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/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"; 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 ]; 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") [ 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; { 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/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6a7beb1cc1a8..74ae4abaedf9 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 @@ -80,6 +72,8 @@ 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/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp ''; + doCheck = false; # fails + meta = { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 4a11c2b98935..06dde2ad4078 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 = [ "bin" "out" "dev" ]; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4d27552d7351..c8bc96f80fde 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" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--exec-prefix=$dev") ''; - doCheck = true; + doCheck = false; passthru = { inherit dbus glib; }; 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}"; 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..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" ]; @@ -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-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6bf7d0f68f83..fcbaaaba6ba4 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -250,7 +250,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 c5de220eaad4..270e96055822 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 ]; @@ -160,26 +166,15 @@ 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" ''; - /* 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/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 5fb0ea4429e7..eae93d96f453 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -17,23 +17,15 @@ 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=" + ] ++ 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 a4f6fe007d06..c2d99446d81b 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -40,23 +40,15 @@ 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}" + ] ++ 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/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 069b78f6bcac..f1e73a77bea7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,40 +1,74 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, gobjectIntrospection, doCheck ? false }: +{ 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 }: 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"; + # 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"; }; - 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 - setupHook = ./setup-hook.sh; + # 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"; + }) - enableParallelBuilding = true; + # Move installed tests to a separate output + ./installed-tests-path.patch + ]; + + outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; + + setupHook = ./setup-hook.sh; # !!! 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"}" + ]; + + 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" + substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; postInstall = @@ -42,10 +76,13 @@ 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). - inherit (doCheck); + inherit doCheck; passthru = { updateScript = gnome3.updateScript { 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..1da2b0a10dcd --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch @@ -0,0 +1,13 @@ +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -85,8 +85,8 @@ + 'aero.gif', + ] + +-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) 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 ] + 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/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" ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6dec7747c7e8..abc24700fa21 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,22 +40,14 @@ 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; - 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/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/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 ]; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 6c7ce8ba16f9..5c504d0d8e25 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -188,6 +188,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/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/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 { 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 de1a3700cc2b..122285da99ec 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -70,4 +70,9 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; + + enableParallelBuilding = true; + + doCheck = false; # fails 20 out of 58 tests, expensive + } 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 diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index d35e47f312f9..a384e46fb147 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 ] @@ -49,6 +56,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/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b72a00d242e9..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 @@ -39,10 +40,11 @@ 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) [ + ] ++ optionals (stdenv.isLinux) [ "--with-capng" ]; @@ -92,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/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/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/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/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 = '' 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/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 <windows.h>" >> 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/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; { 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/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 dbc5f1cf4ec6..e50b8a13b950 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/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" ]; 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; { 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 ]; 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/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. 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/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/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 54d669f1913b..b6f08a9206ee 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" ]; @@ -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/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" ]; 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 67936fecdf4e..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; @@ -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/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" ]; 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/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 8b0a4ec98eda..96dbd463370b 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 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"; }; configureFlags = optional static "--enable-static --disable-shared"; 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/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++"; 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 ]; 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 <sys/types.h>' cfg.h + ''; + preConfigure = '' configureFlags="--with-pluginpath=$out/lib/libnfsidmap" 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 ]; 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/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"; 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/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; }; } 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; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 402af5d6f583..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 @@ -28,13 +28,16 @@ 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"; meta = { homepage = http://librdf.org/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index c2e1739117b5..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.2"; + 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 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; + 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"; @@ -52,6 +61,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/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/; 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/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index e3b8024615be..335400b80efc 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -27,6 +27,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 42d2fe11f7b3..6256702010f4 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -29,6 +29,12 @@ let enableParallelBuilding = true; + doCheck = false; # hangs, tries to access the net? + + # for some reason the tests are not running - it says "No tests found!!" + checkInputs = [ check ]; + checkPhase = "ctest"; + meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = https://tox.chat; 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/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e8877c7f54b6..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.19.2"; + version = "1.20.2"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z"; + sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48"; }; postPatch = let 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/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix new file mode 100644 index 000000000000..6e7005195bf0 --- /dev/null +++ b/pkgs/development/libraries/libversion/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake }: + +let + version = "2.6.0"; +in +stdenv.mkDerivation { + name = "libversion-${version}"; + + src = fetchFromGitHub { + owner = "repology"; + repo = "libversion"; + rev = version; + sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601"; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + meta = with stdenv.lib; { + description = "Advanced version string comparison library"; + homepage = https://github.com/repology/libversion; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ryantm ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 272761cc6af3..731892d33b4d 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 .''; @@ -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"; 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 ]; 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 = [ 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/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" ] diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2beb7e600804..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"] @@ -67,7 +67,7 @@ let in let - version = "17.3.8"; + 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 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"; + sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; }; prePatch = "patchShebangs ."; @@ -161,7 +161,7 @@ let self = stdenv.mkDerivation { doCheck = false; installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=\${drivers}/etc" "localstatedir=\${TMPDIR}" "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" ]; 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; 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" ]; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 99c9c5f16001..4950624a0b66 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "1zvs91afsg61azfv5fldv84gnhf76w3yndkdvpvaprlacxbxdvf5"; + sha256 = "0mckz63rm0hpnln7mkg79bwiybydzbxyzyb39y2m1bjj8xwxkp2m"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index abb3020e5fba..cf478837b86d 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 @@ -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 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" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8662b956ce22..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"; @@ -15,11 +8,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 ] @@ -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 = 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/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1eac225387d2..31e9d661a588 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -73,8 +73,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 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/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 = 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/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 11dd8ec32910..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.63.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 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; + sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49"; }; outputs = [ "out" "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 d0319cdb43ba..4227575acb09 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/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 []) ++ [ 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; 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 '' 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/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}\"" } ''; 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" 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/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix new file mode 100644 index 000000000000..a0b1220b217d --- /dev/null +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -0,0 +1,30 @@ +{ 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-${archiveVersion version}.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/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 b8b7d0c701dd..eaeafa741297 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchurl, 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.22.0"; +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 = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz"; - sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918"; + url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = 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 +67,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; }; } diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix deleted file mode 100644 index 1feedb94c158..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.22.0"; - - src = fetchurl { - url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip"; - sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv"; - }; - - 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/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 ]; 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/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" ]; 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 ]; 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; 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/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 ''; } diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 7dd04463d18f..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 <<EOF PREFIX = size_t HASH = u_int32_t - LIB = ${db}/lib - INCLUDE = ${db}/include + LIB = ${db.out}/lib + INCLUDE = ${db.dev}/include EOF ''; } 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 = [ 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 = { 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 = { 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 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"; 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 ]; 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 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 ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 1d2ccc2d5106..85653daaa40a 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,7 +33,6 @@ buildPythonPackage rec { pname = "bokeh"; - name = "${pname}${version}"; version = "0.12.15"; src = fetchPypi { diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 4ff4c687e5c0..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"; @@ -14,23 +14,15 @@ 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 = "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 = '' @@ -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 = '' @@ -53,7 +43,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 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 ]; 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; { 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 ]; 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 ]; 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 ]) ; 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 ]; 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/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 ]; 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 ]; 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 [ 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 = [ 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 = '' 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 = [ 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"; 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 ]; 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 ]; 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 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 = [ 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 ]; 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 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 ]; 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; { diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 860a14f7a4da..f5590e11120b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,16 +1,15 @@ { 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.5"; - name = "${pname}-${version}"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d"; + sha256 = "c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e"; }; checkInputs = [ @@ -21,7 +20,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six pyyaml numpy scipy + six pyyaml numpy scipy h5py ]; # Couldn't get tests working diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 2029eabba026..e773bf7436a0 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.2.1"; src = fetchPypi { inherit pname version; - sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd"; + sha256 = "1zhg2a59rqgigl8apm4s39md6yf3f2v1d4bl6s5rmiigwfifm624"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 140d4297cda5..9f3fc8dc4d36 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,20 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, six -, pytest, unittest2, mock, keyring +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six +, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "2.3"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d"; + sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m"; }; + + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six ]; # Fails with "ImportError: cannot import name mock" - doCheck = false; - checkInputs = [ pytest unittest2 mock keyring ]; + #doCheck = false; + checkInputs = [ pytest pytest-flake8 keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; + + checkPhase = '' + py.test + ''; meta = with stdenv.lib; { license = licenses.mit; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix new file mode 100644 index 000000000000..cf0a1a865a19 --- /dev/null +++ b/pkgs/development/python-modules/libversion/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }: + +buildPythonPackage rec { + pname = "libversion"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18hhn7b7458lybs8z8ckh0idm7a2g4c4b5v2p9rr0lb618rchvds"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libversion ]; + + disabled = pythonOlder "3.6"; + + meta = with stdenv.lib; { + homepage = https://github.com/repology/py-libversion; + description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm"; + license = licenses.mit; + maintainers = [ maintainers.ryantm ]; + }; +} 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 ]; 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 = '' 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 ]; 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 = '' 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 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 ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4022115e9a0e..3d64863c30d9 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,20 +2,21 @@ 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; 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 ]; 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 ]; 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 ]; 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; 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 diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 752047d04f7e..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 = "1.11.0"; + version = "2.0.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3"; + sha256 = "f11fc3bf1d87a0b4a68d4d595f619814e2396e92d75d7bdd2500edbf002ea6de"; }; 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" 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 +} 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 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 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 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 ]; 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 '' 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 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 ]; 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 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; { 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 diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix new file mode 100644 index 000000000000..7184795639c4 --- /dev/null +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }: + +buildPythonPackage rec { + pname = "rubymarshal"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "131lbc18s3rlmby2dpbvi4msz13gqw6xvx067mh4zcx9npygn9r2"; + }; + + propagatedBuildInputs = [ hypothesis ]; + + meta = with stdenv.lib; { + homepage = https://github.com/d9pouces/RubyMarshal/; + description = "Read and write Ruby-marshalled data"; + license = licenses.wtfpl; + maintainers = [ maintainers.ryantm ]; + }; +} 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 ]; 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"; 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 = [ 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 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 ]; 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 ]; 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 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 = '' diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix new file mode 100644 index 000000000000..c0c74743044d --- /dev/null +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }: + +buildPythonPackage rec { + pname = "tweepy"; + version = "3.6.0"; + + src = fetchPypi { + inherit pname version; + 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 ]; + + 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/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 ]; 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 ]; 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 = '' 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 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 = '' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile b/pkgs/development/ruby-modules/solargraph/Gemfile new file mode 100644 index 000000000000..fa41b7c1d216 --- /dev/null +++ b/pkgs/development/ruby-modules/solargraph/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'solargraph' +end diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock new file mode 100644 index 000000000000..e87f65d02ad5 --- /dev/null +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -0,0 +1,50 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.0) + coderay (1.1.2) + eventmachine (1.2.7) + htmlentities (4.3.4) + kramdown (1.16.2) + mini_portile2 (2.3.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + parallel (1.12.1) + parser (2.5.1.0) + ast (~> 2.4.0) + powerpack (0.1.1) + rainbow (3.0.0) + reverse_markdown (1.1.0) + nokogiri + rubocop (0.56.0) + parallel (~> 1.10) + parser (>= 2.5) + powerpack (~> 0.1) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.9.0) + solargraph (0.21.1) + coderay (~> 1.1) + eventmachine (~> 1.2, >= 1.2.5) + htmlentities (~> 4.3, >= 4.3.4) + kramdown + parser (~> 2.4) + reverse_markdown (~> 1.0, >= 1.0.5) + rubocop (~> 0.52) + thor (~> 0.19, >= 0.19.4) + tilt (~> 2.0) + yard (~> 0.9) + thor (0.20.0) + tilt (2.0.8) + unicode-display_width (1.3.2) + yard (0.9.12) + +PLATFORMS + ruby + +DEPENDENCIES + solargraph! + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix new file mode 100644 index 000000000000..83f1dddeeb60 --- /dev/null +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp, ruby }: + +bundlerApp rec { + pname = "solargraph"; + exes = ["solargraph" "solargraph-runtime"]; + gemdir = ./.; + + meta = with lib; { + description = "IDE tools for the Ruby language"; + homepage = http://www.github.com/castwide/solargraph; + license = licenses.mit; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix new file mode 100644 index 000000000000..0dbdd17d4d4d --- /dev/null +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -0,0 +1,159 @@ +{ + ast = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + type = "gem"; + }; + version = "2.4.0"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za"; + type = "gem"; + }; + version = "1.16.2"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + type = "gem"; + }; + version = "1.8.2"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + type = "gem"; + }; + version = "1.12.1"; + }; + parser = { + dependencies = ["ast"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; + type = "gem"; + }; + version = "2.5.1.0"; + }; + powerpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + type = "gem"; + }; + version = "0.1.1"; + }; + rainbow = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + reverse_markdown = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubocop = { + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04j2n2zilvfw46v94mpymwnfzni0jq05fz6gs3yi2na7l4c98zv8"; + type = "gem"; + }; + version = "0.56.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + type = "gem"; + }; + version = "1.9.0"; + }; + solargraph = { + dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18wkmbhymhwpdy4638bmdslniy2mjwldms5p61r6jnxzc7qnnalf"; + type = "gem"; + }; + version = "0.21.1"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; + type = "gem"; + }; + version = "0.20.0"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + type = "gem"; + }; + version = "2.0.8"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; + type = "gem"; + }; + version = "1.3.2"; + }; + yard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11x58w0ccayvgy0lmhfyrzxd33ya1v41prh5zzhvaajhw8vr74lh"; + type = "gem"; + }; + version = "0.9.12"; + }; +} \ No newline at end of file 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; + #<generated> + # 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"; + #</generated> 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 "#<generated>" in l: + in_block = True + print(f""" #<generated> + # 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}"; + #</generated>""") + elif "#</generated>" in l: + in_block = False + elif not in_block: + print(l, end="") + + +if __name__ == "__main__": + main() 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..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"; @@ -80,19 +84,24 @@ 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 + 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? - ]; + ++ [ + "--" + # 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" + ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; @@ -101,6 +110,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/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 5053559bcca3..8e3993fadc14 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 $RANLIB) $cmakeFlags" + cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags" # on macOS we want to prefer Unix-style headers to Frameworks # because we usually do not package the framework 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 = '' 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/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: diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c834e6aacde1..7fc0ecd1b2b4 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.7.1"; + version = "10.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5"; + sha256 = "1cdc0p3gq6q324p087qv335y224bv61fbr8xar4kza7lcqblb41d"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86"; + sha256 = "0xj0ym6mprrknxqrxqj3ydgabqgfdxrw3h1r0q8sggfxqrrs8y08"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5"; + sha256 = "0j8xkwfxvmg1bqrmalqvl6k45yn54m16r3af5ckgr717xylywqb6"; }; patches = [ ./fix-shell-path.patch ]; 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/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/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/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/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 ac055171658b..de316d0e5e7f 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 @@ -64,13 +65,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" ]; @@ -104,11 +104,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" @@ -121,6 +117,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/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 ]; 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/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; + }; +} 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/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/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index da9b9df3cd4e..44edf443c110 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -1,27 +1,29 @@ { 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"; }; - 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} 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" ''; + + 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; + }; } diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 6d1eb0dbe3eb..fbf76842c20e 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,11 +15,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.2"; + version = "5.16.6"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18"; + sha256 = "1acad6gjrldd87nnv2hw558lzwy4c4ijh9jwjxnhz61jmdqvbmxw"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix new file mode 100644 index 000000000000..9f5f18809897 --- /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 ./no-xcodebuild.patch ]; + } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 6dd9dd6f8e1a..d648cf957d18 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.14.1"; - sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi"; + version = "6.14.2"; + sha256 = "1lb2dpzamrag645l47gb33qqx8ppjimkb8gkczzwd5jymnr399dk"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 942c6cc3fd83..5f81842ca232 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.11.1"; - sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0"; + version = "8.11.2"; + sha256 = "0ya9iz47d7ld4zb0aqym9cpxah0pzhsllhh7xmmmf28q7304d6ak"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } 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; }; } 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/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/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/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 ''; -} +}) 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/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/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/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix index 38215fa8f900..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,7 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; installPhase = '' mkdir -p $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/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 ''; } 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 28406c9751dc..386480d62902 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -23,6 +23,7 @@ appleDerivation rec { (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 <<EOF > $out/include/TargetConditionals.h 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..4a155a4c403a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -1,19 +1,11 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; - postUnpack = '' - 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 ]; 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..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,10 +1,9 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - + dontBuild = true; 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..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,11 +1,10 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - + dontBuild = true; 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..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,8 +1,8 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - + dontConfigure = true; + dontBuild = true; installPhase = '' mkdir -p $out/include/dispatch $out/include/os 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 3cee697366bb..7ea9d51b4bf6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, appleDerivation }: +{ stdenv, appleDerivation, autoreconfHook }: appleDerivation { - preConfigure = "cd libiconv" - + stdenv.lib.optionalString stdenv.hostPlatform.isiOS '' + postUnpack = "sourceRoot=$sourceRoot/libiconv"; - sed -i 's/darwin\*/ios\*/g' configure libcharset/configure - ''; + preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS '' + sed -i 's/darwin\*/ios\*/g' configure libcharset/configure + ''; postInstall = '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib @@ -18,7 +18,10 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; - setup-hook = ../../../../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; 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..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,8 +1,7 @@ { stdenv, appleDerivation }: appleDerivation { - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - + dontBuild = true; 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/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index dbe8bda5e1e0..0c908197acb8 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -103,15 +103,13 @@ let # include_next "unistd.h" #endif EOF - '' + stdenv.lib.optionalString useOld '' + cd cctools ''; # 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 ''; 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 070ddfd77789..ebf7179d0814 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/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a9e2cd7c5c1e..c1246e56dea1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.43"; + version = "4.14.44"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jkikvjsrz7wk1zx57brzhhs15gbx022f1as4mn0017az7wc0gqk"; + sha256 = "1r68dvcyidnmr4d49rq58lidy32fijz08xzymxjwmxi5mzk5dcrf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 5aebbd6c1e1b..c2bebb361342 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.11"; + version = "4.16.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "088931hgi5acm8nz19nd09skmamr3hhfb958374j30br6f94pfkd"; + sha256 = "078if7mmlq4csv0d7x7rpsc8zs7m6rpz75h6878r0d2silsphw2n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index dd946c281316..409bc590ac06 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.132"; + version = "4.4.133"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d06dv7maspgv33dlc6r8cb8pkpg4q2vxbpzz6285n0ah4fb05f4"; + sha256 = "0vhg23i49s4k8lbsrs8y6rvqjld84qgifmim5qcrndr6yj68fmk0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e550f4d44f8f..bf74d91a7d7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.102"; + version = "4.9.103"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1icx253l8s158d1ccn594ddkqdxch8jr0w6kbj00jn1dlmms6mfi"; + sha256 = "1n4kqa0yf5svg8jk647h4awz3ygq696yi0agnmbz0alxnynffsij"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix index f9af5e5f6026..85ad00efcd67 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.42"; + version = "4.14.44"; revision = "a"; - sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05"; + sha256 = "1alvhpwy9xzppwsag7qh1lkk3l4piyh2fv27w37il6gclja4dxkf"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix index fea27b649f51..571b49245661 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.16.10"; + version = "4.16.12"; revision = "a"; - sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49"; + sha256 = "0gkgvhh2v5lca67xjmq512mqnfbln6lkk6hgigby2406b9w1b0sd"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); 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/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" ]; 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 ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index f66df8163ff1..1caf91b0bb69 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }: +{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig +, pythonSupport ? true, swig ? null, python}: -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" ]; + outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py"; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { @@ -19,7 +20,24 @@ stdenv.mkDerivation { sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r"; }); - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; + enableParallelBuilding = true; + + 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; 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/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 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 + ]; } 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" 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 diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index e2d34abb70cc..0e7033972496 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; @@ -55,9 +55,12 @@ stdenv.mkDerivation rec { sed -e 's/pam_rhosts//g' -i modules/Makefile.in ''; - meta = { - homepage = http://ftp.kernel.org/pub/linux/libs/pam/; + doCheck = false; # fails + + 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; }; } diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 316f0ad1a28d..08420e36c65b 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,38 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchurl, ncurses, 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"; + # The project's releases are on SF, but git repo on gitlab. + src = fetchurl { + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy"; }; 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 = '' - ./autogen.sh - ''; + nativeBuildInputs = [ pkgconfig ]; makeFlags = "usrbin_execdir=$(out)/bin"; 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/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c1f139d42a64..307ba9f43fa1 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, libmicrohttpd +, audit, lz4, bzip2, libmicrohttpd, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , 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.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ [ libffi audit lz4 bzip2 libapparmor @@ -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 @@ -155,6 +145,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 = @@ -170,6 +168,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/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 <raj.khem@gmail.com> + +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 <netinet/in.h> + #include <stdio.h> + +-__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 7da4e39ca6c0..5df7bb827aad 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -20,11 +20,22 @@ 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 + ''; + + # 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 = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ]; + makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ]; installPhase = '' mkdir -p "$out/bin" 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 <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/param.h> + #include <sys/socket.h> +--- a/safe_finger.c ++++ b/safe_finger.c +@@ -20,6 +20,11 @@ + + /* System libraries */ + ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <sys/wait.h> ++#include <grp.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <signal.h> +@@ -27,7 +31,7 @@ + #include <ctype.h> + #include <pwd.h> + +-extern void exit(); ++int pipe_stdin(char **argv); + + /* Local stuff */ + +--- a/scaffold.c ++++ b/scaffold.c +@@ -10,6 +10,7 @@ + + /* System libraries. */ + ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/socket.h> +@@ -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 <unistd.h> ++#include <stdlib.h> ++#include <fcntl.h> ++#include <sys/wait.h> + #include <sys/types.h> + #include <sys/param.h> + #include <signal.h> +@@ -25,8 +25,6 @@ + #include <syslog.h> + #include <string.h> + +-extern void exit(); +- + /* Local stuff. */ + + #include "tcpd.h" +--- a/tcpdchk.c ++++ b/tcpdchk.c +@@ -20,6 +20,8 @@ + + /* System libraries. */ + ++#include <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #ifdef INET6 +@@ -35,10 +36,7 @@ + #include <netdb.h> + #include <string.h> + +-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 <stdio.h> +- +-extern void exit(); ++#include <unistd.h> ++#include <stdlib.h> + + #include "tcpd.h" + +--- a/hosts_access.c ++++ b/hosts_access.c +@@ -23,6 +23,7 @@ + + /* System libraries. */ + ++#include <stdlib.h> + #include <sys/types.h> + #ifdef INT32_T + typedef uint32_t u_int32_t; +@@ -43,8 +44,8 @@ + #include <netdb.h> + #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 <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <stdio.h> + #include <errno.h> + #include <string.h> + +-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 <unistd.h> ++#include <stdlib.h> + #include <stdio.h> + #include <syslog.h> + #include <string.h> + +-extern void exit(); +- + /* Local stuff. */ + + #include "tcpd.h" +--- a/rfc931.c ++++ b/rfc931.c +@@ -15,6 +15,7 @@ + + /* System libraries. */ + ++#include <unistd.h> + #include <stdio.h> + #include <syslog.h> + #include <sys/types.h> +--- a/tcpd.c ++++ b/tcpd.c +@@ -16,6 +16,7 @@ + + /* System libraries. */ + ++#include <unistd.h> + #include <sys/types.h> + #include <sys/param.h> + #include <sys/stat.h> +@@ -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 <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/socket.h> +@@ -30,9 +32,6 @@ + #include <setjmp.h> + #include <string.h> + +-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 <unistd.h> + #include <stdio.h> + #include <syslog.h> + #include <string.h> +--- a/misc.c ++++ b/misc.c +@@ -14,11 +14,10 @@ + #include <arpa/inet.h> + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + + #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 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 8c1d117bc8b8..1e9101b68afe 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -28,6 +28,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/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 = [ 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" ]; 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"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index d266f534d669..2b1830ea6797 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/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 5ef909a6d09c..6826df5f6e86 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-openldap" - "--with-db=${db}" + "--with-db" + "--with-db-inc=${db.dev}/include" + "--with-db-lib=${db.out}/lib" "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=${net_snmp}" ]; 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/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 170cc6c84a6a..e22e3a64fac1 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"; }; 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/default.nix b/pkgs/servers/x11/xorg/default.nix index adb5da606df4..e6f5e7ff5887 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 ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 01e990b55743..f45ee7500ed0 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 // { @@ -596,6 +603,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/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/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 <tilde/tilde.h> @@ -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 <stdio.h> #include <chartypes.h> @@ -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/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 {}); }; 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 = [ 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; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 46df958b8396..dce715a6a53e 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. @@ -46,13 +49,16 @@ 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 + , # TODO(@Ericson2314): Make always true and remove + strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform , meta ? {} , passthru ? {} , pos ? # position used in error messages and for meta.position @@ -74,6 +80,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 @@ -94,7 +105,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) @@ -115,34 +128,43 @@ 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 []); + 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" + "checkInputs" "installCheckInputs" "__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 @@ -156,6 +178,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; @@ -179,6 +203,15 @@ 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 (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 = @@ -193,15 +226,7 @@ rec { "/bin/sh" ]; __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); - }); + }; validity = import ./check-meta.nix { inherit lib config meta; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d7a4781448ae..87465df1482a 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. # @@ -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" "$@" } +_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=() - 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 + local -a args=() + _allFlags substitute "$input" "$output" "${args[@]}" } @@ -968,9 +988,11 @@ 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 + foundMakefile=1 + # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 makeFlags="SHELL=$SHELL $makeFlags" @@ -994,18 +1016,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 } @@ -1018,14 +1060,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[@]}" @@ -1091,6 +1131,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 @@ -1106,18 +1159,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 } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 92da0d7873d0..ef46bdeb2133 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; @@ -256,7 +249,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 +290,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 @@ -329,7 +322,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; @@ -351,6 +344,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 ( @@ -362,14 +356,14 @@ in ++ [ /*propagated from .dev*/ linuxHeaders binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] - ++ lib.optionals localSystem.isAarch64 + ++ lib.optionals (!localSystem.isx86) [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; overrides = self: super: { 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. 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 <sanitizer/asan_interface.h> +#include <stdio.h> + +int main(int argc, char **argv) +{ + fprintf(stderr, "ok\n"); + return 0; +} 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 <stdio_ext.h>,,' '' 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/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/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 ]; 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/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" ]; 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/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" ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 33b473df5a22..797ce40a561f 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec{ buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; configureFlags = [ - "--with-bdb=${db}" + "--with-bdb=${db.dev}" "--with-ssl-dir=${openssl.dev}" "--with-lockfile=/run/lock/netatalk" "--localstatedir=/var/lib" 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/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index d1125d572ee9..fea924d0fb05 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + preBuild = '' + substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" cd src ''; @@ -27,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = with platforms; unix; }; } 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"; 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/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/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; { 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; 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/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/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 ]; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 8b9fa4f2f3fc..b4683167f334 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,20 +1,36 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: 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 ]; buildInputs = [ expat libaio boost ]; + 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; + 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"; 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..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" ]; @@ -76,8 +76,10 @@ 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 postInstall = '' moveToOutput bin/curl-config "$dev" 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 = 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/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/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++) { 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"; 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 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/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 8077fb1d93d0..b2d5e96f391c 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; cmakeFlagsArray+=( - -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include + -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl -DROOT_GROUP=root -DWITH_DOC=${if withDocs then "ON" else "OFF"} 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 ]; 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; 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/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"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 0ca4507d5d93..0a760807afbc 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/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 }; } - 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 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 <agruen@gnu.org> +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) [ diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index b463a92ba741..af3db54e96d5 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" ]; 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. 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 ]; 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/aliases.nix b/pkgs/top-level/aliases.nix index 101f4989b319..35a16699d430 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -17,15 +17,27 @@ 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 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 arduino_core = arduino-core; # added 2015-02-04 @@ -48,95 +60,128 @@ 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 + ffadoFull = ffado; # added 2018-05-01 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 + 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 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 - go-pup = pup; # added 2017-12-19 - googleAuthenticator = google-authenticator; # added 2016-10-16 - gnome_doc_utils = gnome-doc-utils; # 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 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 + 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 - 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 + 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 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 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 netcat-openbsd = libressl.nc; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 @@ -145,34 +190,44 @@ 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 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 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 + pulseaudioLight = pulseaudio; # added 2018-04-25 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"; @@ -183,25 +238,34 @@ 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 + 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 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 + suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 - tahoelafs = tahoe-lafs; # added 2018-03-26 - telnet = inetutils; # added 2018-05-15 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 @@ -212,14 +276,18 @@ mapAliases (rec { telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 + telnet = inetutils; # added 2018-05-15 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 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 @@ -230,8 +298,13 @@ mapAliases (rec { winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 x11 = xlibsWrapper; # added 2015-09 + 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 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 @@ -249,6 +322,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 807f7b03ce6c..d2a254244a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -977,7 +977,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 { }; @@ -1664,14 +1663,14 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = hiPrio citrix_receiver_13_9_1; - citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.1"; }; - 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_1 = citrix_receiver.override { version = "13.9.1"; }; + 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 { }; @@ -2390,9 +2389,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 { @@ -2402,7 +2398,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; @@ -2524,7 +2520,7 @@ with pkgs; gazebo7 = callPackage ../applications/science/robotics/gazebo { }; - gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; + gazebo7-headless = gazebo7.override { withHeadless = true; }; }; @@ -2773,11 +2769,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; }; @@ -2805,7 +2801,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 {}; @@ -3460,6 +3455,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; }; @@ -3470,9 +3473,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 { }; @@ -3568,7 +3568,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 { }; @@ -3640,8 +3640,6 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; - lzma = xz; - xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -3799,12 +3797,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 { }); @@ -3851,7 +3851,6 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; metasploit = callPackage ../tools/security/metasploit { }; - msf = metasploit; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -4030,7 +4029,6 @@ with pkgs; nifskope = callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nilfs_utils = nilfs-utils; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -4048,7 +4046,7 @@ with pkgs; nmap = callPackage ../tools/security/nmap { }; - nmap-graphical = callPackage ../tools/security/nmap { + nmap-graphical = nmap.override { graphicalSupport = true; }; @@ -4394,28 +4392,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; }; @@ -4438,7 +4435,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 { }; @@ -4938,7 +4935,6 @@ with pkgs; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; - ag = self.silver-searcher; simpleproxy = callPackage ../tools/networking/simpleproxy { }; @@ -5118,8 +5114,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; @@ -5583,8 +5579,6 @@ with pkgs; tradcpp = callPackage ../development/tools/tradcpp { }; - trang = self.jing-trang; - tre = callPackage ../development/libraries/tre { }; ts = callPackage ../tools/system/ts { }; @@ -5933,15 +5927,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 { }; @@ -6182,8 +6174,6 @@ with pkgs; stripped = false; })); - gccApple = throw "gccApple is no longer supported"; - libstdcxxHook = makeSetupHook { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; @@ -6209,7 +6199,6 @@ with pkgs; libc = libcCross1; }; in wrapCCWith { - name = "gcc-cross-wrapper"; cc = gccFun { # copy-pasted inherit noSysDirs; @@ -6544,18 +6533,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; }; @@ -6786,7 +6776,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; @@ -7152,7 +7142,7 @@ with pkgs; gtk2 = gtk2-x11; }; - lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance { + lxappearance-gtk3 = lxappearance.override { withGtk3 = true; }; @@ -7253,7 +7243,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; @@ -7307,8 +7297,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 { }; @@ -7438,6 +7426,8 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; + solargraph = callPackage ../development/ruby-modules/solargraph { }; + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -7487,22 +7477,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; }; @@ -7597,11 +7586,9 @@ with pkgs; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4 = antlr4_7; - ant = apacheAnt; - apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + ant = apacheAnt; apacheKafka = apacheKafka_1_1; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; @@ -7966,8 +7953,6 @@ with pkgs; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; - m4 = gnum4; - geis = callPackage ../development/libraries/geis { inherit (xorg) libX11 libXext libXi libXtst; }; @@ -7983,6 +7968,7 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnum4 = callPackage ../development/tools/misc/gnum4 { }; + m4 = gnum4; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; @@ -8295,7 +8281,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; }; @@ -8474,8 +8460,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 { @@ -8806,11 +8790,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; @@ -9037,8 +9016,6 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; - fam = gamin; - gamin = callPackage ../development/libraries/gamin { }; ganv = callPackage ../development/libraries/ganv { }; @@ -9090,8 +9067,6 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gflags = google-gflags; - gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { @@ -9153,7 +9128,7 @@ with pkgs; stdenv = crossLibcStdenv; }; - muslCross = callPackage ../os-specific/linux/musl { + muslCross = musl.override { stdenv = crossLibcStdenv; }; @@ -9250,22 +9225,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; }; @@ -9432,13 +9391,15 @@ with pkgs; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { - gtk = gtk2; + gtk = gtk3; }; - gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { - gtk = gtk3; + gtk-mac-integration-gtk2 = gtk-mac-integration.override { + gtk = gtk2; }; + gtk-mac-integration-gtk3 = gtk-mac-integration; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtksourceview = gtksourceview3; @@ -9465,15 +9426,13 @@ 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"; }; + 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 { }; - harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + harfbuzz-icu = harfbuzz.override { withIcu = true; withGraphite2 = true; }; @@ -9523,7 +9482,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc {}; - hwloc-nox = callPackage ../development/libraries/hwloc { + hwloc-nox = hwloc.override { x11Support = false; }; @@ -9660,10 +9619,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"; }; @@ -9722,8 +9682,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 { }; @@ -9855,18 +9816,16 @@ 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"; }; - 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 { }; @@ -9945,7 +9904,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; }; @@ -9990,8 +9949,6 @@ with pkgs; liblo = callPackage ../development/libraries/liblo { }; - liblrdf = librdf; - liblscp = callPackage ../development/libraries/liblscp { }; libe-book = callPackage ../development/libraries/libe-book {}; @@ -10088,11 +10045,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; @@ -10250,7 +10209,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 { }; @@ -10560,6 +10519,8 @@ with pkgs; libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; + libversion = callPackage ../development/libraries/libversion { }; + libvirt = callPackage ../development/libraries/libvirt { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; @@ -10689,7 +10650,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; }; @@ -10847,13 +10808,16 @@ 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 = if hostPlatform.useiOSPrebuilt then null else ncurses6; + ncurses = + if hostPlatform.useiOSPrebuilt + then null + else callPackage ../development/libraries/ncurses { }; neardal = callPackage ../development/libraries/neardal { }; @@ -10927,8 +10891,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; }; @@ -10937,8 +10899,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"; @@ -10967,9 +10927,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 { }; @@ -11116,8 +11073,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 { }; @@ -11129,7 +11084,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"; }; @@ -11185,7 +11143,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 {}; @@ -11352,9 +11310,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 { }; @@ -11389,11 +11345,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 { }; @@ -11476,8 +11428,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 { @@ -11654,7 +11604,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; @@ -11691,7 +11640,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 { }); sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; @@ -11720,17 +11669,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 { }; @@ -12125,7 +12073,7 @@ with pkgs; zlog = callPackage ../development/libraries/zlog { }; - zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib { + zlibStatic = lowPrio (appendToName "static" (zlib.override { static = true; })); @@ -12431,8 +12379,6 @@ with pkgs; java = jdk; }; - fuseki = apache-jena-fuseki; - apcupsd = callPackage ../servers/apcupsd { }; asterisk = asterisk-stable; @@ -12454,7 +12400,6 @@ with pkgs; bird bird6 bird2; bosun = callPackage ../servers/monitoring/bosun { }; - scollector = bosun; cayley = callPackage ../servers/cayley { }; @@ -12527,8 +12472,6 @@ with pkgs; v8 = v8_6_x; }; - etcdctl = etcd; - exim = callPackage ../servers/mail/exim { }; facette = callPackage ../servers/monitoring/facette { }; @@ -12542,7 +12485,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; }; foswiki = callPackage ../servers/foswiki { }; @@ -12657,12 +12600,10 @@ 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 - nginxShibboleth = callPackage ../servers/http/nginx/stable.nix { + nginxShibboleth = nginxStable.override { modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; }; @@ -12716,13 +12657,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; @@ -12735,8 +12674,7 @@ with pkgs; }; # libpulse implementations - - libpulseaudio-vanilla = callPackage ../servers/pulseaudio { + libpulseaudio-vanilla = pulseaudio.override { libOnly = true; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -12800,8 +12738,6 @@ with pkgs; boost = boost159; }; - mysql = mariadb; - mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -12809,7 +12745,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 @@ -12846,8 +12781,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 { }; @@ -12966,7 +12901,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 { }; @@ -12978,8 +12912,6 @@ with pkgs; samba = samba4; - smbclient = samba; - # A lightweight Samba 3, useful for non-Linux-based OSes. samba3_light = lowPrio (samba3.override { pam = null; @@ -13043,10 +12975,6 @@ 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 { }; @@ -13193,7 +13121,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 { }; @@ -13259,8 +13186,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 { @@ -13322,10 +13247,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 { }; @@ -13420,7 +13345,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; }; @@ -13866,8 +13791,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 { @@ -13908,14 +13831,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; @@ -14055,8 +13970,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; @@ -14145,10 +14058,6 @@ with pkgs; sysprof = callPackage ../development/tools/profiling/sysprof { }; - # Provided with sysfsutils. - libsysfs = sysfsutils; - systool = sysfsutils; - sysklogd = callPackage ../os-specific/linux/sysklogd { }; syslinux = callPackage ../os-specific/linux/syslinux { }; @@ -14172,7 +14081,7 @@ with pkgs; sysvinit = callPackage ../os-specific/linux/sysvinit { }; - sysvtools = callPackage ../os-specific/linux/sysvinit { + sysvtools = sysvinit.override { withoutInitTools = true; }; @@ -14224,9 +14133,6 @@ with pkgs; stdenv = crossLibcStdenv; }; - udev = systemd; - libudev = udev; - eudev = callPackage ../os-specific/linux/eudev {}; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; @@ -14424,10 +14330,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 { }; @@ -15264,7 +15166,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 { }; @@ -15373,8 +15275,6 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; - dmtx = dmtx-utils; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -15504,9 +15404,6 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - # for backwards compatibility - emacs25Macport_25_1 = emacs25Macport; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -15741,7 +15638,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 { }; @@ -15763,9 +15659,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; @@ -15902,19 +15798,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; }; - - # the cli binary is actually called tshark and often packaged under this name - tshark = wireshark-cli; + 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 { }; @@ -15935,11 +15828,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-60; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; @@ -15956,7 +15852,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; @@ -16198,7 +16094,7 @@ with pkgs; }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; - graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; + graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; @@ -16440,13 +16336,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; @@ -16702,58 +16597,39 @@ with pkgs; libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = librecad; # backwards compatibility alias, added 2015-10 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-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-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-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; @@ -17120,7 +16996,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; }; @@ -18503,15 +18379,9 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2; - }; + vlc = libsForQt5.vlc; - vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { - gtk = gtk2; - }; - - vlc_qt5 = libsForQt5.vlc; + vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; @@ -18588,7 +18458,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; @@ -18768,15 +18638,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 { @@ -18889,21 +18756,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; @@ -19179,10 +19046,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; @@ -19215,13 +19078,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 { }; @@ -19455,7 +19318,7 @@ with pkgs; pokerth = callPackage ../games/pokerth { }; - pokerth-server = with callPackage ../games/pokerth { }; server; + pokerth-server = pokerth.server; prboom = callPackage ../games/prboom { }; @@ -19724,7 +19587,7 @@ with pkgs; lua = lua5_2; }; - worldofgoo_demo = callPackage ../games/worldofgoo { + worldofgoo_demo = worldofgoo.override { demo = true; }; @@ -20106,9 +19969,9 @@ 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 {}; + liblapack = callPackage ../development/libraries/science/math/liblapack {}; liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack = liblapackWithAtlas; + liblapackWithAtlas = liblapack; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -20195,21 +20058,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; @@ -20492,7 +20355,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; @@ -20649,7 +20512,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; }); @@ -20872,11 +20735,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 { }; @@ -20942,7 +20805,7 @@ with pkgs; nix-du = callPackage ../tools/package-management/nix-du { }; 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 { }; @@ -21431,10 +21294,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 { }; @@ -21549,7 +21412,8 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount - mount wall hostname more sysctl; + mount wall hostname more sysctl getconf + getent; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e6ec2f8ed9d8..41debeefc892 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; { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a0f258bb2da..41a3e7098620 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; @@ -17246,10 +17249,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 = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80e6bf35039c..cfa9537e5301 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 { @@ -6962,6 +6964,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 { @@ -9102,13 +9107,13 @@ in { }); osc = buildPythonPackage { - name = "osc-0.159.0-4-g2d44589"; + name = "osc-0.162.0-55-gb730f88"; disabled = isPy3k; src = pkgs.fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "2d44589886845af7da911aaec9403344e396cd91"; - sha256 = "0s8p7gkp64w6r5rnxpbvl2dgb5p85kq2skcqm6qxn5ddadhw2sfz"; + rev = "b730f880cfe85a8547f569355a21706f27ebfa78"; + sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh"; }; buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; @@ -14259,25 +14264,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}"; @@ -16234,6 +16221,10 @@ EOF }; }; + libversion = callPackage ../development/python-modules/libversion { + inherit (pkgs) libversion; + }; + libvirt = callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt; }; @@ -18175,6 +18166,8 @@ EOF pysdl2 = callPackage ../development/python-modules/pysdl2 { }; pyogg = callPackage ../development/python-modules/pyogg { }; + + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index efced59ad91b..b4eeef1f3def 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 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 diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 36fba3fbd479..c057aa45be6f 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,5 @@ -{ pkgs, buildEnv, runCommand, hostPlatform, lib }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib +, stdenv }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -11,9 +12,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 +31,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 ''; @@ -46,6 +49,16 @@ let eject = { linux = pkgs.utillinux; }; + getconf = { + linux = if hostPlatform.isMusl then pkgs.musl-getconf + else lib.getBin stdenv.cc.libc; + darwin = pkgs.darwin.system_cmds; + }; + 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 = { linux = pkgs.utillinux; darwin = pkgs.getopt; @@ -131,7 +144,7 @@ let }; makeCompat = name': value: buildEnv { - name = name' + "-compat"; + name = name' + "-compat-${version}"; paths = value; }; |