From cbae7a2bbd156fcda89ff03a2fa9bddf95c0a674 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 Mar 2019 12:40:16 -0700 Subject: liblcf: 0.5.4 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/liblcf/versions --- pkgs/development/libraries/liblcf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 8154a74aef5df..313780a9f0f08 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "liblcf-${version}"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "1842hns0rbjncrhwjj7fzg9b3n47adn5jp4dg2zz34gfah3q4ig8"; + sha256 = "1nhwwb32c3x0y82s0w93k0xz8h6xsd0sb4r1a0my8fd8p5rsnwbi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From 3037de0054cce2e4154e646709de5574e2e6e6e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Apr 2019 22:28:13 -0700 Subject: opera: 56.0.3051.99 -> 58.0.3135.127 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opera/versions --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 07a389af8d618..15cefca409c3e 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -39,7 +39,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "56.0.3051.99"; + version = "58.0.3135.127"; rpath = stdenv.lib.makeLibraryPath [ @@ -94,7 +94,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1mf4lpb66w63kafjni5caq9k3lmsqd85161q29z5lr1s2cx9qqm8"; + sha256 = "1nk4zfmb2dv464r1q6n9b66zg7a8h5xfwypzqd791rhmsfjrxn51"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; -- cgit 1.4.1 From 9ce38796b1d529facfff1c32d2df851fd7f639c8 Mon Sep 17 00:00:00 2001 From: Amir Shavit Date: Mon, 15 Apr 2019 13:24:55 +0100 Subject: boost170: init at 1.70.0 --- pkgs/development/libraries/boost/1.70.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.70.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix new file mode 100644 index 0000000000000..5f7b39c1189eb --- /dev/null +++ b/pkgs/development/libraries/boost/1.70.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.70.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_70_0.html + sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b42a58c8a5660..fe47149314081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9377,6 +9377,8 @@ in boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost167; + boost170 = callPackage ../development/libraries/boost/1.70.nix { }; + boost17x = boost170; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; -- cgit 1.4.1 From df2a755d67bc555b6a8fa1307636e03e57643565 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 15:29:47 -0700 Subject: python37Packages.cfgv: 1.4.0 -> 1.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-cfgv/versions --- pkgs/development/python-modules/cfgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 181d4e79b106b..24d22a24d6015 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cfgv"; - version = "1.4.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01mpw8kx0f2py2jwf0fv60k01p11gs0dbar5zq42k4z38xf0bn9r"; + sha256 = "1vxjwga8x9nn5xqbhf5sql7jab3s1la07mxbaqgcfjz8lpp2z7vf"; }; propagatedBuildInputs = [ six ]; -- cgit 1.4.1 From fb9591e8bcd696c69902d3e183c1ae6f0a244c29 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 17:08:13 -0700 Subject: python37Packages.django_modelcluster: 4.3 -> 4.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-django-modelcluster/versions --- pkgs/development/python-modules/django_modelcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 7f89335c1922c..479e66289e644 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9"; + sha256 = "02mrs7aapabapfh7h7n71s8r7zxkmad3yk4rdyfwcf0x36326rsr"; }; doCheck = false; -- cgit 1.4.1 From 7f6baacadd939a5f04dc8f05315fecdff87146e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 17:31:45 -0700 Subject: python37Packages.fonttools: 3.39.0 -> 3.40.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fonttools/versions --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 2db42395186b6..fa1b66b4a5ead 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.39.0"; + version = "3.40.0"; src = fetchPypi { inherit pname version; - sha256 = "0hgv83b4nhk2bl33xa41x0xvsl2b138p974ywkglzckp1123a7z2"; + sha256 = "11x7kjkwk7in84wjvqlbbp4rshj6m8c4259j5z39x16l9smg5idi"; extension = "zip"; }; -- cgit 1.4.1 From 0ffe8864b941de88fbfbbe380e383fc04f3d4f99 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 Apr 2019 15:19:51 +0100 Subject: pythonPackages.asana: 0.7.1 -> 0.8.2, disable for py3.7 --- pkgs/development/python-modules/asana/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 19140925595b6..26a667bea4d1a 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,16 +1,20 @@ -{ buildPythonPackage, pytest, requests, requests_oauthlib, six +{ buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six , fetchFromGitHub, responses, stdenv }: buildPythonPackage rec { pname = "asana"; - version = "0.7.1"; + version = "0.8.2"; + + # upstream reportedly doesn't support 3.7 yet, blocked on + # https://bugs.python.org/issue34226 + disabled = pythonAtLeast "3.7"; src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; rev = "v${version}"; - sha256 = "0vmpy4j1n54gkkg0l8bhw0xf4yby5kqzxnsv07cjc2w38snj5vy1"; + sha256 = "113zwnrpim1pdw8dzid2wpp5gzr2zk26jjl4wrwhgj0xk1cw94yi"; }; checkInputs = [ pytest responses ]; -- cgit 1.4.1 From a94bbd12364f5360351b92d33be84338612c1688 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 27 Apr 2019 19:19:40 +0200 Subject: grafana_reporter: 2.0.1 -> 2.1.0 --- pkgs/servers/monitoring/grafana-reporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 03ed37b8b3f52..1004947d5b122 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "reporter-${version}"; - version = "2.0.1"; + version = "2.1.0"; rev = "v${version}"; goPackagePath = "github.com/IzakMarais/reporter"; @@ -15,7 +15,7 @@ buildGoPackage rec { inherit rev; owner = "IzakMarais"; repo = "reporter"; - sha256 = "0yi7nx8ig5xgkwizddl0gdicnmcdp4qgg1fdxyq04l2y3qs176sg"; + sha256 = "1zindyypf634l4dd2rsvp67ryz9mmzq779x9d01apd04wivd9yf1"; }; postInstall = '' -- cgit 1.4.1 From 3d38c01e5c36f13bf8e667380cb6d7b4e6f3520e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 Apr 2019 23:25:33 +0100 Subject: pythonPackages.basemap: 1.0.7 -> 1.2.0, fixes build on py3.7 upstream seems to have moved to github without updating its pypi packages --- pkgs/development/python-modules/basemap/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 256abef592c12..25b19a2b7314f 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -1,24 +1,29 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchFromGitHub , numpy , matplotlib , pillow , setuptools +, pyproj +, pyshp +, six , pkgs }: buildPythonPackage rec { pname = "basemap"; - version = "1.0.7"; + version = "1.2.0"; - src = fetchurl { - url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; - sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0"; + src = fetchFromGitHub { + owner = "matplotlib"; + repo = "basemap"; + rev = "v${version}rel"; + sha256 = "1p3app8n65rlppkdbp1pb7fa4250kh7hi7lzdsryi2iv88np7193"; }; - propagatedBuildInputs = [ numpy matplotlib pillow ]; - buildInputs = [ setuptools pkgs.geos pkgs.proj ]; + propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; + buildInputs = [ setuptools pkgs.geos ]; # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script configurePhase = '' -- cgit 1.4.1 From 41c65fa5ac6a2d5adf2dafa50ed2e25efcff7aeb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 29 Apr 2019 21:09:40 -0700 Subject: amazon-ecs-cli: 1.13.1 -> 1.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/amazon-ecs-cli/versions --- pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 9988bcc3585ca..d98064df5aaed 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.13.1"; + version = "1.14.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0wiq32szmy2vk7yjjrcfisl9wrydcyiw986vhk0haidxkgw0gkv0"; + sha256 = "1m0vj98sy06bx8wryy9zgsl8pm1zwmlwhi52mzd00fqdfq0haggl"; }; unpackPhase = ":"; -- cgit 1.4.1 From c64087b4a3eb736bd58b4f09729d95c15204cf3d Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 30 Apr 2019 10:56:50 +0200 Subject: runc: 1.0.0-rc7 -> 1.0.0-rc8 Signed-off-by: Vincent Demeester --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 1801dd9eddb6f..f19f4c5b27ea5 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; buildGoPackage rec { name = "runc-${version}"; - version = "1.0.0-rc7"; + version = "1.0.0-rc8"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "1baryjpka8wmzc6c66bir12i390ix3641a06j33shpsb683ws3fj"; + sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; }; goPackagePath = "github.com/opencontainers/runc"; -- cgit 1.4.1 From f518935018ef48787742096888dade420effcae2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Apr 2019 03:08:30 -0700 Subject: aws-sdk-cpp: 1.7.56 -> 1.7.90 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index e53c75e6f74e8..f46571587efd8 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.7.56"; + version = "1.7.90"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0vfw5bqlwm5r0ikziz3jx6yb5v24lwig0m62979zy3ndx36kpb9b"; + sha256 = "0zpqi612qmm0n53crxiisv0vdif43ymg13kafy6vv43j2wmh66ga"; }; # FIXME: might be nice to put different APIs in different outputs -- cgit 1.4.1 From e6562085f999f0fd3e7c8575add2fd10139cfdba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Apr 2019 04:02:08 -0700 Subject: binaryen: 45 -> 83 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/binaryen/versions --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 48661ba407c92..7c3203fe62eb7 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "45"; + defaultVersion = "83"; # Map from git revs to SHA256 hashes sha256s = { - "version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; + "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in -- cgit 1.4.1 From 427dfadfa965a0431a3c8a2bd06e723b3a50332b Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 30 Apr 2019 15:40:12 +0200 Subject: dovecot: 2.3.5.2 -> 2.3.6 fixes CVE-2019-11494 and CVE-2019-11499 https://dovecot.org/pipermail/dovecot-news/2019-April/000408.html --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 466cd5314e686..c639a9a26cb37 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.5.2"; + name = "dovecot-2.3.6"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1whvyg087sjhkd8r0xnk4ij105j135acnfxq6n58c6nqxwdf855s"; + sha256 = "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd"; }; enableParallelBuilding = true; -- cgit 1.4.1 From c38b485197af79e281d3c45d405480b1eaedc911 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 30 Apr 2019 15:56:27 +0200 Subject: dovecot_pigeonhole: 0.5.5 -> 0.5.6 https://dovecot.org/pipermail/dovecot-news/2019-April/000411.html --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 0dc037a06ca7d..6a812863f0523 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "19a9a6rdvdlrm00k2npprj6lrikjhngnmpgg412848rb3ip11anb"; + sha256 = "1f7m2213w4hvqr3lvr03bv4lh92k35gxl01c2x8q8akk7viffbvw"; }; buildInputs = [ dovecot openssl ]; -- cgit 1.4.1 From daca04587c0fd8ba0e03ea62ea31f3709aed8236 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 29 Apr 2019 17:50:46 +0200 Subject: swift: 4.2.3 -> 5.0.1 update Swift * new tweaks to the build process are mostly documented inline * the swiftc wrapper needs the linker path for libicu * some older tweaks could be removed * remove fuzz from patches by updating line numbers * one build fix to libdispatch has been filed upstream --- pkgs/development/compilers/swift/default.nix | 43 ++++++++++------------ ...d-presets-linux-don-t-require-using-Ninja.patch | 4 +- ...presets-linux-allow-custom-install-prefix.patch | 14 +++---- ...uild-presets-linux-don-t-build-extra-libs.patch | 23 ++++++++++++ ...d-presets-linux-plumb-extra-cmake-options.patch | 2 +- .../swift/patches/glibc-arch-headers.patch | 8 ++-- .../swift/patches/libdispatch-fortify-fix.patch | 13 +++++++ .../swift/patches/llvm-include-dirs.patch | 2 +- pkgs/development/compilers/swift/purity.patch | 2 +- 9 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch create mode 100644 pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch (limited to 'pkgs') diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 91fb962f87cc5..8ae011cfcc6b5 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -34,7 +34,7 @@ }: let - v_base = "4.2.3"; + v_base = "5.0.1"; version = "${v_base}-RELEASE"; version_friendly = "${v_base}"; @@ -52,48 +52,48 @@ let # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 clang = fetch { repo = "swift-clang"; - sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7"; + sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k"; }; llvm = fetch { repo = "swift-llvm"; - sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv"; + sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf"; + sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r"; }; cmark = fetch { repo = "swift-cmark"; - sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325"; + sha256 = "079smm79hbwr06bvghd2sb86b8gpkprnzlyj9kh95jy38xhlhdnj"; }; lldb = fetch { repo = "swift-lldb"; - sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b"; + sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi"; }; llbuild = fetch { repo = "swift-llbuild"; - sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q"; + sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms"; }; pm = fetch { repo = "swift-package-manager"; - sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l"; + sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh"; }; xctest = fetch { repo = "swift-corelibs-xctest"; - sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8"; + sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z"; }; foundation = fetch { repo = "swift-corelibs-foundation"; - sha256 = "11kwc5pcq4ibxkyglmqs7h7gka3xkzl9j856x1rq2xdvq756wq2s"; + sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "09c15mn9s5lf2akzfhik70zk91h97nnm8pq1ppfqry2nn3vmib2i"; + sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "09wksqad0w6pk3xdxc278w4mj300h48rvbvx0m4an7npkj6i7n9q"; + sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6"; }; }; @@ -120,6 +120,9 @@ let builder = '' # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" + # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. + # This compiler is not using the Nix wrappers, so it needs some help to find things. + export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" $SWIFT_SOURCE_ROOT/swift/utils/build-script \ --preset=buildbot_linux \ @@ -212,13 +215,12 @@ stdenv.mkDerivation rec { substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ --replace '/usr/include' "${stdenv.cc.libc.dev}/include" - substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \ - --replace '/usr/include' "${stdenv.cc.libc.dev}/include" substituteInPlace swift/utils/build-script-impl \ --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++" patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch} patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} + patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} sed -i swift/utils/build-presets.ini \ @@ -229,8 +231,8 @@ stdenv.mkDerivation rec { -e 's/^stress-test$/# \0/' \ -e 's/^test-optimized$/# \0/' - # https://bugs.swift.org/browse/SR-5779 - sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + # https://bugs.swift.org/browse/SR-10559 + patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch} substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' @@ -241,8 +243,6 @@ stdenv.mkDerivation rec { sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt PREFIX=''${out/#\/} - substituteInPlace swift-corelibs-foundation/build.py \ - --replace usr/lib "$PREFIX/lib" substituteInPlace swift-corelibs-xctest/build_script.py \ --replace usr "$PREFIX" substituteInPlace swiftpm/Utilities/bootstrap \ @@ -262,13 +262,10 @@ stdenv.mkDerivation rec { tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX find $out -type d -empty -delete - # TODO: Use wrappers to get these on the PATH for swift tools, instead - ln -s ${clang}/bin/* $out/bin/ - ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar - wrapProgram $out/bin/swift \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include + --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ + --suffix LIBRARY_PATH : $icu/lib ''; # Hack to avoid TMPDIR in RPATHs. diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch index f2b30e5dcdb6e..79482ac10e693 100644 --- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch @@ -11,8 +11,8 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 7ee57ad2df..e6b0af3581 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -717,7 +717,7 @@ swiftpm - xctest +@@ -721,7 +721,7 @@ swiftpm + dash-dash -build-ninja diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch index 612b33cdb4837..5c1927acb7f1e 100644 --- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -9,17 +9,17 @@ Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix diff --git a/utils/build-presets.ini b/utils/build-presets.ini index e6b0af3581..1095cbaab7 100644 ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -723,7 +723,7 @@ install-lldb - install-llbuild +--- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200 ++++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200 +@@ -728,7 +728,7 @@ install-swiftpm install-xctest + install-libicu -install-prefix=/usr +install-prefix=%(install_prefix)s - swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc - build-swift-static-stdlib - build-swift-static-sdk-overlay + swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc + llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt + install-libcxx -- 2.12.2 diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch new file mode 100644 index 0000000000000..5d766bc25901d --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch @@ -0,0 +1,23 @@ +--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200 ++++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200 +@@ -716,8 +716,6 @@ + llbuild + swiftpm + xctest +-libicu +-libcxx + + dash-dash + +@@ -727,11 +725,9 @@ + install-llbuild + install-swiftpm + install-xctest +-install-libicu + install-prefix=%(install_prefix)s + swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc + llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt +-install-libcxx + build-swift-static-stdlib + build-swift-static-sdk-overlay + build-swift-stdlib-unittest-extra diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch index e84c7eb2a08ad..1d0a6a9577aad 100644 --- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 1739e91dc2..0608fed9c1 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini -@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s +@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s # Path to the .tar.gz package we would create. installable-package=%(installable_package)s diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch index 650e1a2429d46..df906f9c84c7e 100644 --- a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch +++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch @@ -1,13 +1,13 @@ The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories. ---- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200 -+++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200 -@@ -65,7 +65,7 @@ +--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200 ++++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200 +@@ -68,7 +68,7 @@ endif() set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") - set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}") + set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") - if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/") + if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID") set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}") diff --git a/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch b/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch new file mode 100644 index 0000000000000..d23a308d68f4f --- /dev/null +++ b/pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch @@ -0,0 +1,13 @@ +Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning. + +--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200 ++++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200 +@@ -1053,7 +1053,7 @@ + #else + #define _dispatch_client_assert_fail(fmt, ...) do { \ + char *_msg = NULL; \ +- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \ ++ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \ + ##__VA_ARGS__); \ + _dispatch_assert_crash(_msg); \ + free(_msg); \ diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch index 9523943c48014..789c0be7e7a8b 100644 --- a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch +++ b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch @@ -2,7 +2,7 @@ Only use the Nix include dirs when no sysroot is configured. --- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200 +++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200 -@@ -565,7 +565,7 @@ +@@ -641,7 +641,7 @@ // Check for configure-time C include directories. StringRef CIncludeDirs(C_INCLUDE_DIRS); diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch index d10e407260a51..832decdc41f57 100644 --- a/pkgs/development/compilers/swift/purity.patch +++ b/pkgs/development/compilers/swift/purity.patch @@ -11,7 +11,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp index fe3c0191bb..c6a482bece 100644 --- a/lib/Driver/ToolChains/Gnu.cpp +++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -398,13 +398,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, +@@ -380,13 +380,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_static)) { if (Args.hasArg(options::OPT_rdynamic)) CmdArgs.push_back("-export-dynamic"); -- cgit 1.4.1 From 5ad79dc4bb22326e5a98db7bf2b69a76a2e6f01e Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 21 Apr 2019 17:06:50 +0000 Subject: compilation for particular x86_64 architecture --- nixos/modules/services/misc/nix-daemon.nix | 25 +++++++++++++++++++++ pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/still.nix | 2 +- pkgs/applications/science/math/nauty/default.nix | 11 ++++----- pkgs/development/compilers/julia/shared.nix | 2 +- pkgs/development/libraries/crypto++/default.nix | 12 +++------- .../development/libraries/fflas-ffpack/default.nix | 23 +++++++++---------- pkgs/development/libraries/givaro/default.nix | 26 +++++++++------------- pkgs/development/libraries/gsl/default.nix | 2 ++ pkgs/development/libraries/gsl/gsl-1_16.nix | 2 ++ pkgs/development/libraries/linbox/default.nix | 24 +++++++++----------- pkgs/development/libraries/qt-5/modules/qtbase.nix | 17 ++++++++------ .../libraries/qt-5/modules/qtwebengine.nix | 5 ++++- .../python-modules/tensorflow/default.nix | 6 ++--- pkgs/tools/archivers/zpaq/default.nix | 5 +---- pkgs/tools/archivers/zpaq/zpaqd.nix | 4 +--- 16 files changed, 92 insertions(+), 76 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 665215822af8d..62421a648e16d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -60,6 +60,7 @@ let ${optionalString (isNix20 && !cfg.distributedBuilds) '' builders = ''} + system-features = ${toString cfg.systemFeatures} $extraOptions END '' + optionalString cfg.checkConfig ( @@ -360,6 +361,15 @@ in ''; }; + systemFeatures = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "kvm" "big-parallel" "gccarch-skylake" ]; + description = '' + The supported features of a machine + ''; + }; + checkConfig = mkOption { type = types.bool; default = true; @@ -478,6 +488,21 @@ in /nix/var/nix/gcroots/tmp ''; + nix.systemFeatures = mkIf (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( + # can build for arch + mkDefault ( + [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ + { # can also run code for the following achritectures: + "sandybridge" = [ "gccarch-westmere" ]; + "ivybridge" = [ "gccarch-westmere" "gccarch-sandybridge" ]; + "haswell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; + "broadwell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; + "skylake" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; + "skylake-avx512" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; + }.${pkgs.hostPlatform.platform.gcc.arch} + ) + ); + }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a7f24fdf1f38b..75d780f233381 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" "-mno-fma" ]; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 1b7d2b0987f85..9e6671838cd89 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" "-mno-fma" ]; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 7351de53cfce3..226e13c004d73 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, optimize ? false # impure }: stdenv.mkDerivation rec { name = "nauty-${version}"; @@ -11,13 +10,15 @@ stdenv.mkDerivation rec { sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y"; }; outputs = [ "out" "dev" ]; - configureFlags = lib.optionals (!optimize) [ + configureFlags = { # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - "--disable-popcnt" - "--disable-clz" - ]; + "default" = [ "--disable-clz" "--disable-popcnt" ]; + "westmere" = [ "--disable-clz" ]; + "sandybridge" = [ "--disable-clz" ]; + "ivybridge" = [ "--disable-clz" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; buildInputs = []; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index ffa5e3ba55d00..6706cf1e2bd40 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}" or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index cbd3e40541599..61a825cd3745f 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -18,17 +18,11 @@ stdenv.mkDerivation rec { ]; - configurePhase = let - marchflags = - if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona -mtune=generic" else - ""; - in - '' + configurePhase = '' sed -i GNUmakefile \ - -e 's|-march=native|${marchflags} -fPIC|g' \ + -e 's|-march=native|-fPIC|g' \ -e '/^CXXFLAGS =/s|-g ||' - ''; + ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 2dd58e64585ac..a37a11f5cb0c3 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas , fetchpatch , gmpxx -, optimize ? false # impure }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -40,19 +39,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-l${blas.linkName}" "--with-lapack-libs=-l${blas.linkName}" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ]; + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 0773daa2d09a2..bfbce57b0a6ab 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx -, optimize ? false # impure -}: +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "givaro"; @@ -19,19 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ]; + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9fd3f8a7a998b..1867d6cb8f60d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; + NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + patches = [ # ToDo: there might be more impurities than FMA support check ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 69fe1b0db554f..02d88e67cdd82 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; + NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + patches = [ # ToDo: there might be more impurities than FMA support check ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index a9a649e2de762..ef2dbb10fba10 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -7,7 +7,6 @@ , blas , fflas-ffpack , gmpxx -, optimize ? false # impure , withSage ? false # sage support }: stdenv.mkDerivation rec { @@ -37,19 +36,18 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-l${blas.linkName}" "--disable-optimization" - ] ++ stdenv.lib.optionals (!optimize) [ + ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "--disable-sse" - "--disable-sse2" - "--disable-sse3" - "--disable-ssse3" - "--disable-sse41" - "--disable-sse42" - "--disable-avx" - "--disable-avx2" - "--disable-fma" - "--disable-fma4" - ] ++ stdenv.lib.optionals withSage [ + "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + "haswell" = [ "--disable-fma4" ]; + "broadwell" = [ "--disable-fma4" ]; + "skylake" = [ "--disable-fma4" ]; + "skylake-avx512" = [ "--disable-fma4" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"} + ++ stdenv.lib.optionals withSage [ "--enable-sage" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 92ac8a2420137..71d27c33a9289 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -266,15 +266,18 @@ stdenv.mkDerivation { ++ ( if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] - else lib.optional (compareVersion "5.9.0" >= 0) [ "-sse2" ] + else lib.optionals (compareVersion "5.9.0" >= 0) { + "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx" - "-no-avx2" "-no-mips_dsp" "-no-mips_dspr2" ] diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 91b7acf436543..af58040188742 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,7 +103,10 @@ EOF ''); NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin [ + # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 + # TODO: investigate and fix properly + lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++ + lib.optionals stdenv.isDarwin [ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 8163243eb0a44..a8f902fdb38fe 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -8,9 +8,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? false -, avx2Support ? false -, fmaSupport ? false +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] }: assert cudaSupport -> nvidia_x11 != null diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 309604999ba20..48b3a91b971a5 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { CPPFLAGS = with stdenv; "" + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + "-Dunix"; - CXXFLAGS = with stdenv; "" - + (lib.optionalString isi686 "-march=i686 -mtune=generic ") - + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ") - + "-O3 -DNDEBUG"; + CXXFLAGS = "-O3 -DNDEBUG"; in '' buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 344f088909065..611654331c3b1 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -11,10 +11,8 @@ let sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ] + compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" - ++ stdenv.lib.optional (stdenv.hostPlatform.isi686) "-march=i686" - ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "-march=nocona" ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); in stdenv.mkDerivation { -- cgit 1.4.1 From 3d3f83dc514d4fe8716df41f6d5ccb6f217b1c25 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 30 Apr 2019 14:39:05 +0000 Subject: gsl: remove disable-fma.patch `NIX_CFLAGS_COMPILE = [ "-mno-fma" ];` disables FMA in a more reliable way. `platform.gcc.arch = "skylake"` resulting in gcc command line flag -march=skylake was able to enable FMA even with disable-fma.patch applied --- pkgs/development/libraries/gsl/default.nix | 5 ---- pkgs/development/libraries/gsl/disable-fma.patch | 32 ------------------------ pkgs/development/libraries/gsl/gsl-1_16.nix | 2 -- 3 files changed, 39 deletions(-) delete mode 100644 pkgs/development/libraries/gsl/disable-fma.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 1867d6cb8f60d..6e6b74d514e96 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -10,11 +10,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - ]; - # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch deleted file mode 100644 index bb1eda9ccccd2..0000000000000 --- a/pkgs/development/libraries/gsl/disable-fma.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/configure.ac 2011-09-22 16:13:22 +0000 -+++ b/configure.ac 2011-11-26 23:55:24 +0000 -@@ -381,6 +381,28 @@ - AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE) - AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE) - -+dnl check for compiler flags to disable use of FMA -+save_cflags="$CFLAGS" -+AC_CACHE_CHECK([for compiler flags to disable use of FMA], ac_cv_c_fma_flags, -+[ -+if test X"$GCC" = Xyes; then -+ fma_flags='-ffp-contract=off' -+else -+ fma_flags= -+fi -+if test X"$fma_flags" != X; then -+ CFLAGS="$fma_flags $CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_fma_flags="$fma_flags"],[ac_cv_c_fma_flags="none"]) -+else -+ ac_cv_c_fma_flags="none" -+fi]) -+ -+if test "$ac_cv_c_fma_flags" != "none" ; then -+ CFLAGS="$ac_cv_c_fma_flags $save_cflags" -+else -+ CFLAGS="$save_cflags" -+fi -+ - dnl Check for IEEE control flags - - save_cflags="$CFLAGS" - diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 02d88e67cdd82..07dee287714a6 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) patches = [ - # ToDo: there might be more impurities than FMA support check - ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html (fetchpatch { name = "bug-39055.patch"; url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; -- cgit 1.4.1 From ed7ae04ae4d80d1c83eb6f757a75560342026852 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Apr 2019 13:05:35 -0700 Subject: flacon: 5.2.0 -> 5.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flacon/versions --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a97b539e02a8a..2d2d88308cc15 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0vmbwpfjq66qv3zp7mss3hsxy6dxjybqfm7k2xyc0w181qclg1ya"; + sha256 = "1j8gzk92kn10yb7rmvrnyq0ipda2swnkmsavqsk5ws0z600p3k93"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; -- cgit 1.4.1 From 457b48cc0360380ecd906afdeb314fec93b89168 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 30 Apr 2019 20:24:09 -0400 Subject: binutils: apply patch when cross compiling from darwin Fixes #60546 --- pkgs/development/tools/misc/binutils/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 4e2f26fd691b5..0c46ce20d0eb3 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -4,6 +4,7 @@ , withAllTargets ? false, libbfd, libopcodes , enableShared ? true , noSysDirs, gold ? true, bison ? null +, fetchpatch }: let @@ -60,7 +61,14 @@ stdenv.mkDerivation rec { ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch - ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; + ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [ + (fetchpatch { + url = "https://sourceware.org/bugzilla/attachment.cgi?id=11141"; + name = "gold-threads.patch"; + sha256 = "0p26dxpba8n7z3pwjg7qf94f0gzbvwkjq0j9ng1w3sljj0gyaf1j"; + }) + ]; outputs = [ "out" "info" "man" ]; -- cgit 1.4.1 From ba3b9c0eb8430093069ed319cbfcd7ad48e69edb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 03:52:16 -0700 Subject: mbedtls: 2.16.0 -> 2.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mbedtls/versions --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 7d070364a63c4..a72d5a825c6a1 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; + sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw"; }; nativeBuildInputs = [ cmake ninja perl python ]; -- cgit 1.4.1 From 0fb118a8ca718ac032e7b26a258324f8ce9ee8c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 06:45:50 -0700 Subject: neo4j: 3.5.4 -> 3.5.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 73ec5038fe3d6..c3f19a1cbe5bc 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0fqp3k0gr5qb2a7ck093fw581db9fmfvhsich740d588ik749jbh"; + sha256 = "1dphg1xyh8h7dx74nrcc9aspiylnskqnmysim9k39v8myf7a77mq"; }; buildInputs = [ makeWrapper jre8 which gawk ]; -- cgit 1.4.1 From f0632ffb6fd5069bc1689ee2f088a8dec1471595 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 07:06:13 -0700 Subject: now-cli: 15.0.4 -> 15.0.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/now-cli/versions --- pkgs/development/web/now-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index a0e8b814d8edb..943fb457f008b 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "15.0.4"; + version = "15.0.10"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "7d8fedccce402b3572834cb13a63b343ac2df9e6ad120937289ee88ce6e48d4c"; + sha256 = "00w9bniz87jjvizl364hpfssvbl1y1fdzp0732j348x528px2krh"; }; sourceRoot = "."; -- cgit 1.4.1 From 0dbdf29237335cb49334793d838384cafa01cf0b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 May 2019 00:15:30 +0200 Subject: atomicparsley: fix cross --- pkgs/tools/video/atomicparsley/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 74f4c562102ca..f0ad4297c003a 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { cf-private ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; meta = with stdenv.lib; { -- cgit 1.4.1 From 51104c94208daaeeea77ab3c09647e8be3c6c902 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 1 May 2019 16:47:56 -0500 Subject: papirus-icon-theme: 20190331 -> 20190501 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 60653c75bea81..b13dcf9b422ea 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20190331"; + version = "20190501"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0kprnax26qwnxjcd0rrgdbj00835byaamkabjxi2z8lh0k47ap85"; + sha256 = "1sdzbvlzzg42vqahjqcsj6v87y1xhchw7bgiv8jgwd2n4l3gg2zy"; }; nativeBuildInputs = [ gtk3 ]; -- cgit 1.4.1 From 75425e0067ff72939e13c089e28eef2f2acfa03b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 1 May 2019 07:24:45 -0500 Subject: bubblewrap: 0.3.1 -> 0.3.3 https://github.com/projectatomic/bubblewrap/releases/tag/v0.3.3 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index ba07f75bb36d8..3ac9e3c0e9462 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"; + sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; -- cgit 1.4.1 From 239c5456646b66efe5b8a46e4104de1121bebbb6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 21:25:25 -0700 Subject: python37Packages.fastcache: 1.0.2 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fastcache/versions --- pkgs/development/python-modules/fastcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index 5638e8412b56c..f50eb8f53bb11 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastcache"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1rl489zfbm2x67n7i6r7r4nhrhwk6yz3yc7x9y2rky8p95vhaw46"; + sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From a8cc90c3e083924a3a4b4d38613f90d44bb25510 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 21:43:32 -0700 Subject: python37Packages.funcy: 1.11 -> 1.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-funcy/versions --- pkgs/development/python-modules/funcy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 0b6149cbc2185..fd36c7590b5ec 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "b5e399eb739afcb5a3ad38302b7817f6e7fee6f5fc79b213a5d82ea8bce0d9e6"; + sha256 = "0vdbh0ykmjsvq4vb3hrx5327q9ccl1jhbjca59lsr0v0ghwb0grz"; }; # No tests -- cgit 1.4.1 From 65f033d93f8eecf397821478217f7e79abd55414 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:42:55 -0700 Subject: python37Packages.imageio-ffmpeg: 0.2.0 -> 0.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-imageio-ffmpeg/versions --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index f72698fd0d13c..5d07024656ec8 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -6,10 +6,10 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { - sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + sha256 = "1hnn00xz9jyksnx1g0r1icv6ynbdnxq4cfnmb58ikg6ymi20al18"; inherit pname version; }; -- cgit 1.4.1 From 765f6d323dbd93f08b8c36c8b090287ecb683709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 23:51:22 -0700 Subject: python37Packages.Nuitka: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-nuitka/versions --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index b586a36aa88ad..57b48f991891f 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54"; + sha256 = "0nzk6r724dyai33fi7xmc6jn57pkcwqm553vlv0r11blvc92d7pp"; }; checkInputs = [ vmprof pyqt4 ]; -- cgit 1.4.1 From 4fedec83a8ece491e85e8cdc0d1d7e9282c7250d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 00:48:29 -0700 Subject: python37Packages.pudb: 2018.1 -> 2019.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pudb/versions --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 028af67b9af8c..bcba04fdfd27b 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2018.1"; + version = "2019.1"; src = fetchPypi { inherit pname version; - sha256 = "0vl7rbqyxa2vfa02dg7f5idf1j7awpfcj0dg46ks59xp8539g2wd"; + sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c"; }; propagatedBuildInputs = [ pygments urwid ]; -- cgit 1.4.1 From a7bcea5f8ac7fa6596fc1dd155e1613c016bf7bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 01:34:22 -0700 Subject: python37Packages.pymediainfo: 3.1 -> 4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pymediainfo/versions --- pkgs/development/python-modules/pymediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 42902bc7045a8..67318bac9bf81 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "3.1"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7"; + sha256 = "1yjs208c34p2xsc0r8vbi264ii5hixh546718n06b7v670glqjir"; }; postPatch = '' -- cgit 1.4.1 From 98a95efd7d548e11409624f6651ad89fa1f41a97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 02:52:57 -0700 Subject: python37Packages.rfc3986: 1.2.0 -> 1.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rfc3986/versions --- pkgs/development/python-modules/rfc3986/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 4ffb182626c3b..bc36e5cba80a2 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw"; + sha256 = "1jprl2zm3pw2rfbda9rhg3v5bm8q36b8c9i4k8znimlf1mv8bcic"; }; checkInputs = [ pytest ]; -- cgit 1.4.1 From 4ba39234909c3c1c44a100c1612a7abb4499d6c9 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Thu, 2 May 2019 12:03:46 +0200 Subject: swift: enable tests (WIP) add check phase for running some of the Swift test suite A small number of tests is failing, which needs investigation, so the check phase remains disabled by default. --- pkgs/development/compilers/swift/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 8ae011cfcc6b5..31e2e806fbc4d 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -250,9 +250,19 @@ stdenv.mkDerivation rec { --replace usr/lib "$PREFIX/lib" ''; + buildPhase = builder; + doCheck = false; - buildPhase = builder; + checkInputs = [ file ]; + + # TODO: investigate the non-working tests + checkPhase = '' + checkTarget=check-swift-all + ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' + + ninjaCheckPhase + ''; installPhase = '' mkdir -p $out -- cgit 1.4.1 From 73e39eda1b6d28d50a2084ba1f37c453ed3f3201 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:24:52 -0700 Subject: python37Packages.unittest-xml-reporting: 2.4.0 -> 2.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-unittest-xml-reporting/versions --- pkgs/development/python-modules/unittest-xml-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 84803a55b33dd..624ff585c36cc 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "2.4.0"; + version = "2.5.1"; propagatedBuildInputs = [six]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qnlz1k77rldgd5dfrj6nhlsjj71xzqy6s4091djpk0s2p8y1550"; + sha256 = "0v6xcs8nx82yw037h296zk0vz5ka4idm4xdpxkcm4h4fnpj8428l"; }; meta = with lib; { homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; -- cgit 1.4.1 From 19f9c4bb14310353a5ae7d2f814f22cb2aadfb9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:56:45 -0700 Subject: python37Packages.XlsxWriter: 1.1.6 -> 1.1.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-xlsxwriter/versions --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index e7c5595fe087d..096dfb6a77998 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.6"; + version = "1.1.7"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "1hmagwh2k61r90a9xgp3xj24wb97ckllvgn82vsin9kvhhj1459i"; + sha256 = "1zv5222bymfr7046ps5512x1kk7ipcx46jjxylaap1p6llqj7zlj"; }; meta = { -- cgit 1.4.1 From 02aa93e8094febb6b31ede760a9b6d039dca524b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:02:01 -0700 Subject: python37Packages.zeroconf: 0.21.3 -> 0.22.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-zeroconf/versions --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index b77215a2d2466..709ba455b5cce 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.21.3"; + version = "0.22.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713"; + sha256 = "09dqfbj37l7vnj0fj4a82dqgq9mwm6fnsnsmljg25k1ygcn5hrpy"; }; propagatedBuildInputs = [ ifaddr ] -- cgit 1.4.1 From e0214127c74532c2d862043437f3e2a9a2cabb13 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 2 May 2019 13:36:28 -0700 Subject: cocoapods-beta: 1.7.0.beta.3 -> 1.7.0.rc.1 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset-beta.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 37b8602b4b4c5..64eb87294a430 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.0.beta.3) + cocoapods (1.7.0.rc.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.0.beta.3) + cocoapods-core (= 1.7.0.rc.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.0.beta.3) + cocoapods-core (1.7.0.rc.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.2) + xcodeproj (1.9.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 0b207415eb550..e5841c4d2d33f 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03xnnj5di75wqsd1c9ca9gfnzc4lqr8k2cx5gca5979b7kxb2x1z"; + sha256 = "1wdy3kjlz121i6b0njq09xz6wvw6l6pkwabgswbmk5b8m74q97ml"; type = "gem"; }; - version = "1.7.0.beta.3"; + version = "1.7.0.rc.1"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwnjdcwj4nc1cjl9pf0dlh83x2s6x0v491fpcmw3342vbs0v4sq"; + sha256 = "0k7zb0afy49hb24mfg8ypdsbk6j1sr9m8bwqm8p11w4113wbv95w"; type = "gem"; }; - version = "1.7.0.beta.3"; + version = "1.7.0.rc.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -292,9 +292,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; + sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.0"; }; } \ No newline at end of file -- cgit 1.4.1 From 0df09b0947fa13a32b8db1d8c9f51c4e50c0d3df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 17:35:49 -0700 Subject: vte: 0.56.1 -> 0.56.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vte/versions --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 7089da984a972..33262325674e7 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.56.1"; + version = "0.56.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z6w4vrz51bjnvk773j4pnrqfmkvaaa58yc6yi3jwcx90b68xyh2"; + sha256 = "0dyj2dqbzap37dvjax6vy2kwfqsw9d1hrc4ji33lha3mk1q3b5bf"; }; passthru = { -- cgit 1.4.1 From 94237b34524f40e5499e32a382419d9284e20b96 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 2 May 2019 21:00:05 -0400 Subject: release-cross.nix: add mesa to platforms mesa is very portable and useful. we should make sure these work on all of the platforms we support --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 86864bb17a75b..acccd155e08d8 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -24,6 +24,7 @@ let libcCross = nativePlatforms; nix = nativePlatforms; nixUnstable = nativePlatforms; + mesa = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { -- cgit 1.4.1 From 4a9188a0b77bf923143e70ddd5c0ecae219053d5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 2 May 2019 21:28:10 -0400 Subject: valgrind: mark broken platforms taken from http://valgrind.org/info/platforms.html --- pkgs/development/tools/analysis/valgrind/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 78f40913eb5fa..88a53a7667ed1 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -91,5 +91,11 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; + badPlatforms = [ + "armv5tel-linux" "armv6l-linux" "armv6m-linux" + "sparc-linux" "sparc64-linux" + "riscv32-linux" "riscv64-linux" + "alpha-linux" + ]; }; } -- cgit 1.4.1 From efd44a3a7a82dc1ca3a5cb14a4cec3dcb448052a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 2 May 2019 21:29:12 -0400 Subject: libseccomp: mark bad platforms taken from https://github.com/seccomp/libseccomp#supported-architectures --- pkgs/development/libraries/libseccomp/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 54ca09a7b0db9..6b38bcf2c7789 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -28,7 +28,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21; platforms = platforms.linux; - badPlatforms = platforms.riscv; + badPlatforms = [ + "alpha-linux" + "riscv64-linux" "riscv32-linux" + "sparc-linux" "sparc64-linux" + ]; maintainers = with maintainers; [ thoughtpolice ]; }; } -- cgit 1.4.1 From b7950c560af055a87650eec265ab4bfd09144777 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 2 May 2019 21:30:32 -0400 Subject: kexectools: mark bad platforms --- pkgs/os-specific/linux/kexectools/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index bb96e5dea576d..8adb862a265f3 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; + badPlatforms = [ + "riscv64-linux" "riscv32-linux" + "sparc-linux" "sparc64-linux" + ]; license = licenses.gpl2; - badPlatforms = platforms.riscv; }; } -- cgit 1.4.1 From 7b7b56def426e727578028492398490046f20b55 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 3 May 2019 02:04:20 -0500 Subject: bitcoin: 0.17.3 -> 0.18.0, enable and run unit tests https://bitcoincore.org/en/releases/0.18.0/ --- pkgs/applications/altcoins/bitcoin.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index b50508342bf99..288bc1a9cf546 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck , zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent , withGui }: with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.17.1"; + version = "0.18.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy"; + sha256 = "5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] @@ -31,11 +31,14 @@ stdenv.mkDerivation rec{ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + checkInputs = [ rapidcheck ]; + doCheck = true; # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ]; + checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ] + ++ [ "LC_ALL=C.UTF-8" ]; enableParallelBuilding = true; -- cgit 1.4.1 From 6b5848e26b27655727c85d2103ad740fac333507 Mon Sep 17 00:00:00 2001 From: Dmitry Kudriavtsev Date: Fri, 3 May 2019 09:21:52 -0700 Subject: miraclecast: 20170427 -> 20190403 --- pkgs/os-specific/linux/miraclecast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index c7990466ca73b..b65486cb2fe11 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "miraclecast-${version}"; - version = "1.0-20170427"; + version = "1.0-20190403"; src = fetchFromGitHub { owner = "albfan"; repo = "miraclecast"; - rev = "a395c3c7afc39a958ae8ab805dea0f5d22118f0c"; - sha256 = "03kbjajv2x0i2g68c5aij0icf9waxnqkc9pp32z60nc8zxy9jk1y"; + rev = "960a785e10523cc525885380dd03aa2c5ba11bc7"; + sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; -- cgit 1.4.1 From 2a0125c0cefc4ee6204a844e7d71bab6727063d9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 3 May 2019 19:14:42 +0200 Subject: php71: 7.1.28 -> 7.1.29 Changelog: https://www.php.net/ChangeLog-7.php#7.1.29 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 97aa610273b17..ecb6a8821724e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -258,8 +258,8 @@ let in { php71 = generic { - version = "7.1.28"; - sha256 = "1jal5kr3h9krgb4x46l7wg9czfiigax6vni6cagfdi8zzqrqg7kk"; + version = "7.1.29"; + sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; -- cgit 1.4.1 From 6f3625a1c6f30a19788dbd3c444dadc1d295eb74 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 3 May 2019 19:19:34 +0200 Subject: php72: 7.2.17 -> 7.2.18 Changelog: https://www.php.net/ChangeLog-7.php#7.2.18 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ecb6a8821724e..58a8a45409b19 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -266,8 +266,8 @@ in { }; php72 = generic { - version = "7.2.17"; - sha256 = "0xag1735q92kj8p09gyydxknisgz7h56pksr44qwnykddymi3a4i"; + version = "7.2.18"; + sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; -- cgit 1.4.1 From a320372e175e4941472f54249ad306c27692336a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 3 May 2019 19:31:58 +0200 Subject: php73: 7.3.4 -> 7.3.5 Changelog: https://www.php.net/ChangeLog-7.php#7.3.5 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 58a8a45409b19..073f3dfdc30ea 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -274,8 +274,8 @@ in { }; php73 = generic { - version = "7.3.4"; - sha256 = "0y1bl4nwpr0z11wsdizrs3nvkx1xs3xzy7mn8gj4jdn82a13sb1f"; + version = "7.3.5"; + sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; -- cgit 1.4.1 From 847eb76cf87b8425b71df8b89d2e485b586e3d9c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:18:14 +0200 Subject: gitlab: update.py: properly sort version numbers, ignore invalid versions --- pkgs/applications/version-management/gitlab/update.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 26dc3d39eb1bc..0ec743cb67d77 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -9,6 +9,7 @@ import logging import subprocess import json import pathlib +from distutils.version import LooseVersion from typing import Iterable import requests @@ -18,6 +19,7 @@ logger = logging.getLogger(__name__) class GitLabRepo: + version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?") def __init__(self, owner: str, repo: str): self.owner = owner self.repo = repo @@ -31,8 +33,13 @@ class GitLabRepo: r = requests.get(self.url + "/tags?format=atom", stream=True) tree = ElementTree.fromstring(r.content) - return sorted((e.text for e in tree.findall( - '{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True) + versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] + # filter out versions not matching version_regex + versions = filter(self.version_regex.match, versions) + + # sort, but ignore v and -ee for sorting comparisons + versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) + return versions def get_git_hash(self, rev: str): out = subprocess.check_output(['nix-prefetch-git', self.url, rev]) @@ -202,7 +209,6 @@ def update_gitaly(): click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}") - @cli.command('update-gitlab-shell') def update_gitlab_shell(): """Update gitlab-shell""" -- cgit 1.4.1 From 61bf39c5a1b4d3316f42a47e5ca66cf1963a363b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:20:01 +0200 Subject: gitlab-shell: 8.7.1 -> 9.0.0 --- pkgs/applications/version-management/gitlab/gitlab-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index c3199142da3f9..be0cf838f9089 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.7.1"; + version = "9.0.0"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia"; + sha256 = "0437pigcgd5qi9ars8br1l058h2mijyv02axlr8wdb1vjsss857g"; }; buildInputs = [ ruby bundler go ]; -- cgit 1.4.1 From 030bc8086b5b58a5328c58503b5b01c2958e8d27 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:20:20 +0200 Subject: gitaly: 1.27.2 -> 1.34.1 --- .../version-management/gitlab/gitaly/Gemfile | 10 +-- .../version-management/gitlab/gitaly/Gemfile.lock | 38 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 +- .../version-management/gitlab/gitaly/gemset.nix | 84 ++++++++++++++-------- 4 files changed, 82 insertions(+), 54 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 8a8ce5771cf4a..c111744a1a18e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -5,14 +5,14 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' -gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.13.0' +gem 'gitlab-markup', '~> 1.7.0' +gem 'gitaly-proto', '~> 1.22.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' -gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false +gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'grpc', '~> 1.15.0' -gem 'sentry-raven', '~> 2.7.2', require: false +gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 4deb64c4cd5bd..fec103a23a40f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - activesupport (5.0.7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -36,15 +36,15 @@ GEM ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.13.0) + gitaly-proto (1.22.0) grpc (~> 1.0) - github-linguist (6.2.0) + github-linguist (6.4.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) mime-types (>= 1.19) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.5) + gitlab-gollum-lib (4.2.7.7) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) @@ -52,7 +52,7 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) + gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) gitlab-grit (2.8.2) @@ -60,20 +60,20 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.3) + google-protobuf (3.7.1) + googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) hashdiff (0.3.8) - i18n (1.1.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - json (2.1.0) + json (2.2.0) licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) @@ -88,7 +88,7 @@ GEM msgpack (1.2.6) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -141,20 +141,20 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.10.0) - rugged (0.28.0) + rugged (0.28.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.7.4) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) simplecov (0.9.2) docile (~> 1.1.0) multi_json (~> 1.0) simplecov-html (~> 0.9.0) simplecov-html (0.9.0) - stringex (2.8.4) + stringex (2.8.5) thread_safe (0.3.6) timecop (0.9.1) tzinfo (1.2.5) @@ -182,11 +182,11 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.13.0) + gitaly-proto (~> 1.22.0) github-linguist (~> 6.1) - gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.5) + gitlab-gollum-lib (~> 4.2.7.7) + gitlab-gollum-rugged_adapter (~> 0.4.4.2) + gitlab-markup (~> 1.7.0) google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) @@ -198,7 +198,7 @@ DEPENDENCIES rspec-parameterized rubocop (~> 0.50) rugged (~> 0.28) - sentry-raven (~> 2.7.2) + sentry-raven (~> 2.9.0) simplecov (~> 0.9.0) timecop vcr (~> 4.0.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 8bb365f3d141b..476ceee30d03f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.27.2"; + version = "1.34.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0"; + sha256 = "1nj1vw3qzfg5azx70ssbjicwqjxd6ka2fkk4rj5bby53755ywl7b"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 61abc97ed548a..9b0f37e36bced 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -9,12 +9,14 @@ }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.7.2"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -178,21 +180,25 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; + sha256 = "114q2qnd6196xvzmv3jia4n4j4wm3rizqbvxjd9156g0hc20q6yf"; type = "gem"; }; - version = "1.13.0"; + version = "1.22.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y"; + sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.1"; }; github-markup = { source = { @@ -204,21 +210,25 @@ }; gitlab-gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; + sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf"; type = "gem"; }; - version = "4.2.7.5"; + version = "4.2.7.7"; }; gitlab-gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; + sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4"; type = "gem"; }; - version = "0.4.4.1"; + version = "0.4.4.2"; }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; @@ -230,12 +240,14 @@ version = "2.8.2"; }; gitlab-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; type = "gem"; }; - version = "1.6.5"; + version = "1.7.0"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -247,21 +259,25 @@ version = "1.0.1"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.1"; + version = "3.7.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; + sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -282,12 +298,14 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.1.1"; + version = "1.6.0"; }; ice_nine = { source = { @@ -298,12 +316,14 @@ version = "0.11.2"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; licensee = { dependencies = ["rugged"]; @@ -398,12 +418,14 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -593,12 +615,14 @@ version = "1.10.0"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; safe_yaml = { source = { @@ -619,12 +643,14 @@ }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.0"; }; simplecov = { dependencies = ["docile" "multi_json" "simplecov-html"]; @@ -644,12 +670,14 @@ version = "0.9.0"; }; stringex = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; + sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; thread_safe = { source = { -- cgit 1.4.1 From 41d95302c032b3cb7941737ae3953fd5d2342942 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:20:43 +0200 Subject: gitlab-workhorse: 8.3.3 -> 8.5.2 --- .../version-management/gitlab/gitlab-workhorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 6c1bffed51a9d..a98c41699c75e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.3.3"; + version = "8.5.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "08v5ga9qbrs1xciw4cjhsjpqcp6cxzymc2y39la2a4lgb2cgyi10"; + sha256 = "0c1wpp81wr4x00pmc2z41xh4vy7yk97fkcg0cdy7gbz2hc5cm296"; }; buildInputs = [ git go ]; -- cgit 1.4.1 From 02124aa8fbebaec448e33a6fcf4c90d6fec7a926 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:21:55 +0200 Subject: gitlab-ce: 11.9.11 -> 11.10.4 --- .../version-management/gitlab/data.json | 16 ++-- .../version-management/gitlab/rubyEnv-ce/Gemfile | 21 ++--- .../gitlab/rubyEnv-ce/Gemfile.lock | 63 +++++++------ .../gitlab/rubyEnv-ce/gemset.nix | 100 +++++++++++---------- 4 files changed, 101 insertions(+), 99 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 376e00a3da876..a891f008d6701 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,17 +1,17 @@ { "ce": { - "version": "11.9.11", - "repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6", - "deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb", + "version": "11.10.4", + "repo_hash": "02rvf5ikahydswjldzg99k8han051ap7v8h9mcjgrr4xmj301hxm", + "deb_hash": "0sigpp5lhg4pl88gsgf7dq2k7mi2wgaz0vdsl25c97w1daw7a60c", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.4-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.9.11", + "rev": "v11.10.4", "passthru": { - "GITALY_SERVER_VERSION": "1.27.2", + "GITALY_SERVER_VERSION": "1.34.1", "GITLAB_PAGES_VERSION": "1.5.0", - "GITLAB_SHELL_VERSION": "8.7.1", - "GITLAB_WORKHORSE_VERSION": "8.3.3" + "GITLAB_SHELL_VERSION": "9.0.0", + "GITLAB_WORKHORSE_VERSION": "8.5.2" } }, "ee": { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index 1fd519d8be41e..1c7ad5abcb56b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -42,11 +42,11 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # Spam and anti-bot protection -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication @@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.2.0' -gem 'gitlab-markup', '~> 1.6.5' +gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -128,7 +128,7 @@ gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.11' -gem 'bootstrap_form', '~> 2.7.0' +gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' @@ -139,10 +139,7 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem 'rack', '2.0.6' +gem 'rack', '~> 2.0.7' group :unicorn do gem 'unicorn', '~> 5.4.1' @@ -158,7 +155,7 @@ end gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 5.0' +gem 'acts-as-taggable-on', '~> 6.0' # Background jobs gem 'sidekiq', '~> 5.2.1' @@ -170,7 +167,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' gem 'fugit', '~> 1.1' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '~> 0.16.4' # Colored output to console gem 'rainbow', '~> 3.0' @@ -268,9 +265,7 @@ gem 'addressable', '~> 2.5.2' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' -gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' -gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' @@ -424,7 +419,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 27a2821cedb27..3314a769949a0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -43,8 +43,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -65,7 +65,7 @@ GEM atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) + attr_required (1.0.1) awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -87,7 +87,9 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.1) msgpack (~> 1.0) - bootstrap_form (2.7.0) + bootstrap_form (4.2.0) + actionpack (>= 5.0) + activemodel (>= 5.0) brakeman (4.2.1) browser (2.5.3) builder (3.2.3) @@ -260,7 +262,7 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) - fugit (1.1.7) + fugit (1.1.9) et-orbi (~> 1.1, >= 1.1.7) raabro (~> 1.1) fuubar (2.2.0) @@ -279,12 +281,12 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.13.0) + gitaly-proto (1.19.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) gitlab-styles (2.5.1) @@ -382,8 +384,8 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.6.0) @@ -401,7 +403,6 @@ GEM activesupport multipart-post oauth (~> 0.5, >= 0.5.0) - jquery-atwho-rails (1.3.2) js_regex (3.1.1) character_set (~> 1.1) regexp_parser (~> 1.1) @@ -587,7 +588,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (1.1.3) + pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -619,18 +620,18 @@ GEM puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.6) + rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) rack rack-cors (1.0.2) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) + rack-oauth2 (1.9.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack rack-protection (2.0.5) rack rack-proxy (0.6.0) @@ -683,7 +684,7 @@ GEM optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (4.13.1) json recursive-open-struct (1.1.0) redis (3.3.5) @@ -788,7 +789,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rugged (0.28.0) + rugged (0.28.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -814,12 +815,10 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) - thor (~> 0.14) selenium-webdriver (3.12.0) childprocess (~> 0.5) rubyzip (~> 1.2) - sentry-raven (2.7.4) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.11.0) @@ -954,7 +953,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 5.0) + acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) asana (~> 0.8.1) @@ -970,7 +969,7 @@ DEPENDENCIES better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) bootsnap (~> 1.4) - bootstrap_form (~> 2.7.0) + bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) bullet (~> 5.5.0) @@ -1021,10 +1020,10 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.13.0) + gitaly-proto (~> 1.19.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) - gitlab-markup (~> 1.6.5) + gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.1.1) @@ -1047,12 +1046,11 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text - httparty (~> 0.13.3) + httparty (~> 0.16.4) icalendar influxdb (~> 0.2) jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) - jquery-atwho-rails (~> 1.3.2) js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) @@ -1106,10 +1104,10 @@ DEPENDENCIES pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer - rack (= 2.0.6) + rack (~> 2.0.7) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.2.1) + rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rails (= 5.0.7.2) rails-controller-testing @@ -1121,7 +1119,7 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.0) re2 (~> 1.1.1) - recaptcha (~> 3.0) + recaptcha (~> 4.11) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1148,7 +1146,6 @@ DEPENDENCIES sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - select2-rails (~> 3.5.9) selenium-webdriver (~> 3.12) sentry-raven (~> 2.7) settingslogic (~> 2.0.9) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 123fa70678e33..ea96e4e4d936c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -114,12 +114,14 @@ }; acts-as-taggable-on = { dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; + sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; type = "gem"; }; - version = "5.0.0"; + version = "6.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -215,12 +217,14 @@ version = "3.1.0"; }; attr_required = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; + sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; awesome_print = { source = { @@ -331,12 +335,15 @@ version = "1.4.1"; }; bootstrap_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; + sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; type = "gem"; }; - version = "2.7.0"; + version = "4.2.0"; }; brakeman = { source = { @@ -1054,12 +1061,14 @@ }; fugit = { dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.9"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1116,12 +1125,14 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; + sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1"; type = "gem"; }; - version = "1.13.0"; + version = "1.19.0"; }; github-markup = { source = { @@ -1141,12 +1152,14 @@ version = "3.1.1"; }; gitlab-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; type = "gem"; }; - version = "1.6.5"; + version = "1.7.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1444,13 +1457,15 @@ version = "0.6.0"; }; httparty = { - dependencies = ["json" "multi_xml"]; + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; + sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; type = "gem"; }; - version = "0.13.7"; + version = "0.16.4"; }; httpclient = { source = { @@ -1522,14 +1537,6 @@ }; version = "1.4.1"; }; - jquery-atwho-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9"; - type = "gem"; - }; - version = "1.3.2"; - }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { @@ -2236,12 +2243,14 @@ version = "1.2.0"; }; pg = { + groups = ["development" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.4"; }; po_to_json = { dependencies = ["json"]; @@ -2372,12 +2381,14 @@ version = "1.1.6"; }; rack = { + groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rack-accept = { dependencies = ["rack"]; @@ -2406,13 +2417,15 @@ version = "1.0.2"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; + dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; + sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; type = "gem"; }; - version = "1.2.3"; + version = "1.9.3"; }; rack-protection = { dependencies = ["rack"]; @@ -2585,12 +2598,14 @@ }; recaptcha = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; + sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; type = "gem"; }; - version = "3.0.0"; + version = "4.13.1"; }; recursive-open-struct = { source = { @@ -2972,12 +2987,14 @@ version = "1.2.2"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; safe_yaml = { source = { @@ -3050,15 +3067,6 @@ }; version = "2.3.7"; }; - select2-rails = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; - type = "gem"; - }; - version = "3.5.9.3"; - }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; source = { @@ -3070,12 +3078,14 @@ }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.0"; }; settingslogic = { source = { -- cgit 1.4.1 From d237c8a182269a9ed78ff433c1421f7b370d6bf9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 May 2019 20:22:08 +0200 Subject: gitlab-ee: 11.9.11 -> 11.10.4 --- .../version-management/gitlab/data.json | 16 +-- .../version-management/gitlab/rubyEnv-ee/Gemfile | 24 ++-- .../gitlab/rubyEnv-ee/Gemfile.lock | 67 ++++++------ .../gitlab/rubyEnv-ee/gemset.nix | 121 +++++++++++++-------- 4 files changed, 129 insertions(+), 99 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a891f008d6701..1b296e1f4121e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -15,18 +15,18 @@ } }, "ee": { - "version": "11.9.11", - "repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph", - "deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb", + "version": "11.10.4", + "repo_hash": "06nf94k0ay9kmx060j387hydyf6crv0f1pjb691r3y6s713m6php", + "deb_hash": "1g0mlyzm2ikpblmy529wg6az5biiqczpr3kyp2mk4yjkdvg59jjp", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.4-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.9.11-ee", + "rev": "v11.10.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.27.2", + "GITALY_SERVER_VERSION": "1.34.1", "GITLAB_PAGES_VERSION": "1.5.0", - "GITLAB_SHELL_VERSION": "8.7.1", - "GITLAB_WORKHORSE_VERSION": "8.3.3" + "GITLAB_SHELL_VERSION": "9.0.0", + "GITLAB_WORKHORSE_VERSION": "8.5.2" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index 894832dac1713..88b787ea9da3a 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -42,14 +42,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos # Spam and anti-bot protection -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication @@ -126,7 +126,7 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.2.0' -gem 'gitlab-markup', '~> 1.6.5' +gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' @@ -138,7 +138,7 @@ gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' gem 'truncato', '~> 0.7.11' -gem 'bootstrap_form', '~> 2.7.0' +gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' @@ -149,10 +149,7 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem 'rack', '2.0.6' +gem 'rack', '~> 2.0.7' group :unicorn do gem 'unicorn', '~> 5.4.1' @@ -168,7 +165,7 @@ end gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 5.0' +gem 'acts-as-taggable-on', '~> 6.0' # Background jobs gem 'sidekiq', '~> 5.2.1' @@ -180,7 +177,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' gem 'fugit', '~> 1.1' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '~> 0.16.4' # Colored output to console gem 'rainbow', '~> 3.0' @@ -278,9 +275,7 @@ gem 'addressable', '~> 2.5.2' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' -gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' -gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' @@ -308,6 +303,9 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' +# Snowplow events tracking +gem 'snowplow-tracker', '~> 0.6.1' + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false @@ -439,7 +437,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 16be6ab2d663f..b41584d531247 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -43,8 +43,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -65,7 +65,7 @@ GEM atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) + attr_required (1.0.1) awesome_print (1.8.0) aws-sdk (2.9.32) aws-sdk-resources (= 2.9.32) @@ -95,7 +95,9 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.1) msgpack (~> 1.0) - bootstrap_form (2.7.0) + bootstrap_form (4.2.0) + actionpack (>= 5.0) + activemodel (>= 5.0) brakeman (4.2.1) browser (2.5.3) builder (3.2.3) @@ -142,6 +144,7 @@ GEM concurrent-ruby-ext (1.1.3) concurrent-ruby (= 1.1.3) connection_pool (2.2.2) + contracts (0.11.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -284,7 +287,7 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) - fugit (1.1.7) + fugit (1.1.9) et-orbi (~> 1.1, >= 1.1.7) raabro (~> 1.1) fuubar (2.2.0) @@ -303,13 +306,13 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.13.0) + gitaly-proto (1.19.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) gitlab-license (1.0.0) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) gitlab-styles (2.5.1) @@ -409,8 +412,8 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.6.0) @@ -429,7 +432,6 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) - jquery-atwho-rails (1.3.2) js_regex (3.1.1) character_set (~> 1.1) regexp_parser (~> 1.1) @@ -617,7 +619,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (1.1.3) + pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -649,18 +651,18 @@ GEM puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.6) + rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) rack rack-cors (1.0.2) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) + rack-oauth2 (1.9.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack rack-protection (2.0.5) rack rack-proxy (0.6.0) @@ -713,7 +715,7 @@ GEM optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (4.13.1) json recursive-open-struct (1.1.0) redis (3.3.5) @@ -818,7 +820,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rugged (0.28.0) + rugged (0.28.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -844,12 +846,10 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) - thor (~> 0.14) selenium-webdriver (3.12.0) childprocess (~> 0.5) rubyzip (~> 1.2) - sentry-raven (2.7.4) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.11.0) @@ -877,6 +877,8 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slack-notifier (1.5.1) + snowplow-tracker (0.6.1) + contracts (~> 0.7, <= 0.11) spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) @@ -984,7 +986,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 5.0) + acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) asana (~> 0.8.1) @@ -1001,7 +1003,7 @@ DEPENDENCIES better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) bootsnap (~> 1.4) - bootstrap_form (~> 2.7.0) + bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) bullet (~> 5.5.0) @@ -1056,11 +1058,11 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.13.0) + gitaly-proto (~> 1.19.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) - gitlab-markup (~> 1.6.5) + gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.1.1) @@ -1084,12 +1086,11 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text - httparty (~> 0.13.3) + httparty (~> 0.16.4) icalendar influxdb (~> 0.2) jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) - jquery-atwho-rails (~> 1.3.2) js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) @@ -1145,10 +1146,10 @@ DEPENDENCIES pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer - rack (= 2.0.6) + rack (~> 2.0.7) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.2.1) + rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rails (= 5.0.7.2) rails-controller-testing @@ -1160,7 +1161,7 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.0) re2 (~> 1.1.1) - recaptcha (~> 3.0) + recaptcha (~> 4.11) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1187,7 +1188,6 @@ DEPENDENCIES sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - select2-rails (~> 3.5.9) selenium-webdriver (~> 3.12) sentry-raven (~> 2.7) settingslogic (~> 2.0.9) @@ -1198,6 +1198,7 @@ DEPENDENCIES simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) + snowplow-tracker (~> 0.6.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 0116da7ca9432..1d355ef8e873b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -114,12 +114,14 @@ }; acts-as-taggable-on = { dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; + sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; type = "gem"; }; - version = "5.0.0"; + version = "6.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -215,12 +217,14 @@ version = "3.1.0"; }; attr_required = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; + sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; awesome_print = { source = { @@ -366,12 +370,15 @@ version = "1.4.1"; }; bootstrap_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; + sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; type = "gem"; }; - version = "2.7.0"; + version = "4.2.0"; }; brakeman = { source = { @@ -576,6 +583,16 @@ }; version = "2.2.2"; }; + contracts = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz"; + type = "gem"; + }; + version = "0.11.0"; + }; crack = { dependencies = ["safe_yaml"]; source = { @@ -1142,12 +1159,14 @@ }; fugit = { dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.9"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1204,12 +1223,14 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; + sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1"; type = "gem"; }; - version = "1.13.0"; + version = "1.19.0"; }; github-markup = { source = { @@ -1237,12 +1258,14 @@ version = "1.0.0"; }; gitlab-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; type = "gem"; }; - version = "1.6.5"; + version = "1.7.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1549,13 +1572,15 @@ version = "0.6.0"; }; httparty = { - dependencies = ["json" "multi_xml"]; + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; + sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; type = "gem"; }; - version = "0.13.7"; + version = "0.16.4"; }; httpclient = { source = { @@ -1635,14 +1660,6 @@ }; version = "1.3.1"; }; - jquery-atwho-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9"; - type = "gem"; - }; - version = "1.3.2"; - }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { @@ -2365,12 +2382,14 @@ version = "1.2.0"; }; pg = { + groups = ["development" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.4"; }; po_to_json = { dependencies = ["json"]; @@ -2501,12 +2520,14 @@ version = "1.1.6"; }; rack = { + groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rack-accept = { dependencies = ["rack"]; @@ -2535,13 +2556,15 @@ version = "1.0.2"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; + dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; + sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; type = "gem"; }; - version = "1.2.3"; + version = "1.9.3"; }; rack-protection = { dependencies = ["rack"]; @@ -2714,12 +2737,14 @@ }; recaptcha = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; + sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; type = "gem"; }; - version = "3.0.0"; + version = "4.13.1"; }; recursive-open-struct = { source = { @@ -3101,12 +3126,14 @@ version = "1.2.2"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; safe_yaml = { source = { @@ -3179,15 +3206,6 @@ }; version = "2.3.7"; }; - select2-rails = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; - type = "gem"; - }; - version = "3.5.9.3"; - }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; source = { @@ -3199,12 +3217,14 @@ }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.0"; }; settingslogic = { source = { @@ -3300,6 +3320,17 @@ }; version = "1.5.1"; }; + snowplow-tracker = { + dependencies = ["contracts"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w"; + type = "gem"; + }; + version = "0.6.1"; + }; spring = { dependencies = ["activesupport"]; source = { -- cgit 1.4.1 From 7451a6a107979c30aff5b0b4a2f6f37dcb980333 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 2 May 2019 22:18:12 +0100 Subject: pythonPackages.purepng: fix for py3.7, enable tests the pypi package includes pre-cythonized versions of some components, however these were cythonized with a py3.7-unaware cython which is what caused the main breakage. fetching the equivalent version from github allows us to offer either the pure-python version or one we cythonize ourselves if the cython package is provided. the added bonus of using a github checkout is that the tests are included, so enable these. these tests revealed that for full py3.7 compatibility an additional patch is needed from an upstream PR. --- .../development/python-modules/purepng/default.nix | 34 +++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index 49e4d93a5342f..cecd7cc576d96 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -1,17 +1,43 @@ { stdenv , buildPythonPackage -, fetchPypi +, python +, fetchFromGitHub +, fetchpatch +, cython ? null +, numpy ? null }: buildPythonPackage rec { pname = "purepng"; version = "0.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d"; + src = fetchFromGitHub { + owner = "Scondo"; + repo = "purepng"; + rev = "449aa00e97a8d7b8a200eb9048056d4da600a345"; + sha256 = "105p7sxn2f21icfnqpah69mnd74r31szj330swbpz53k7gr6nlsv"; }; + patches = [ + (fetchpatch { + name = "fix-py37-stopiteration-in-generators.patch"; + url = "https://github.com/Scondo/purepng/pull/28/commits/62d71dfc2be9ffdc4b3e5f642af0281a8ce8f946.patch"; + sha256 = "1ag0pji3p012hmj8kadcd0vydv9702188c0isizsi964qcl4va6m"; + }) + ]; + patchFlags = "-p1 -d code"; + + # cython is optional - if not supplied, the "pure python" implementation will be used + nativeBuildInputs = [ cython ]; + + # numpy is optional - if not supplied, tests simply have less coverage + checkInputs = [ numpy ]; + # checkPhase begins by deleting source dir to force test execution against installed version + checkPhase = '' + rm -r code/png + ${python.interpreter} code/test_png.py + ''; + meta = with stdenv.lib; { description = "Pure Python library for PNG image encoding/decoding"; homepage = https://github.com/scondo/purepng; -- cgit 1.4.1 From b86fe70cd0eb1c20654e0381125f945be0d8c605 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 2 May 2019 22:20:06 +0100 Subject: pythonPackages.purepng: add self as maintainer looks like I've had more contact with this package than anyone... --- pkgs/development/python-modules/purepng/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index cecd7cc576d96..ece8938749392 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { description = "Pure Python library for PNG image encoding/decoding"; homepage = https://github.com/scondo/purepng; license = licenses.mit; + maintainers = with maintainers; [ ris ]; }; } -- cgit 1.4.1 From e3ce12f2adda6b67ca001dbbd758f9b1f5824366 Mon Sep 17 00:00:00 2001 From: Matthew Glazar Date: Fri, 3 May 2019 16:10:49 -0700 Subject: duplicity: 0.7.18.2 -> 0.7.19 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b5accb3b82b01..e14a62c8114d7 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.18.2"; + version = "0.7.19"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"; + sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; -- cgit 1.4.1 From fcf83a23aaababfd179ac57b96127276a3bb5111 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 3 May 2019 20:54:12 -0500 Subject: bitcoin: cleanup check-only input, move to checkInputs Per reviewer request, good call thanks! --- pkgs/applications/altcoins/bitcoin.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 288bc1a9cf546..d1802f774f28e 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec{ sha256 = "5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] - ++ optionals doCheck [ python3 ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq miniupnpc protobuf libevent] ++ optionals stdenv.isLinux [ utillinux ] @@ -31,7 +30,7 @@ stdenv.mkDerivation rec{ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ rapidcheck ]; + checkInputs = [ rapidcheck python3 ]; doCheck = true; -- cgit 1.4.1 From e4ba38da5354bf806526036de71590c599e64330 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.dde-api: 3.18.1 -> 3.18.3 --- pkgs/desktops/deepin/dde-api/default.nix | 4 ++-- pkgs/desktops/deepin/dde-api/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 8db376e01fd7d..b0e908c847e1b 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.18.1"; + version = "3.18.3"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -34,7 +34,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728"; + sha256 = "0sbzjpjy2d7j22v5sw3mf472lcnsy81n2rgly87k79r5gk9x89ar"; }; goDeps = ./deps.nix; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index 03758f0d43e12..380f07d3d1948 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/fogleman/gg"; - rev = "0403632d5b905943a1c2a5b2763aaecd568467ec"; - sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n"; + rev = "72436a171bf31757dc87fb8fa9f7485307350307"; + sha256 = "116ysxj7nv9zw5ff75p2mriwf6fx4qzdik9za8cy0l0vih78qvjq"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; - sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; + rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; + sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; - sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; + rev = "6d32002ffd7577f23673706728e1c510698cecb1"; + sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; - sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; + rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7"; + sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha"; }; } { -- cgit 1.4.1 From b67e9f3958c4c73b27a1864eea4f47eec733080a Mon Sep 17 00:00:00 2001 From: Milan Pässler Date: Sat, 4 May 2019 02:35:55 +0200 Subject: viu: init at 0.1 --- pkgs/tools/graphics/viu/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/viu/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix new file mode 100644 index 0000000000000..1d554b1faf602 --- /dev/null +++ b/pkgs/tools/graphics/viu/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "viu"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "atanunq"; + repo = "viu"; + rev = "v${version}"; + sha256 = "1j2sr8mhnbyzm168spzr4mk8gkjlfqh993b80sf2zv2sy83p8gfv"; + }; + + cargoSha256 = "14pf2xvkk9qqq9qj5agxmfl3npgy6my961yfzv7p977712kdakh3"; + + meta = with lib; { + description = "A command-line application to view images from the terminal written in Rust"; + homepage = "https://github.com/atanunq/viu"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f34990d9cee1..f2db9a5a41150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6303,6 +6303,8 @@ in vit = callPackage ../applications/misc/vit { }; + viu = callPackage ../tools/graphics/viu { }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; -- cgit 1.4.1 From 20a19eb202a6b5dfdb424c582861b71de2b29a08 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 30 Apr 2019 17:23:38 +0200 Subject: hue-cli: use bundlerApp --- pkgs/tools/networking/hue-cli/Gemfile.lock | 4 ++-- pkgs/tools/networking/hue-cli/default.nix | 19 ++++++++++++------- pkgs/tools/networking/hue-cli/gemset.nix | 10 ++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock index 3b1f657070081..8109cd96ac23d 100644 --- a/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -6,7 +6,7 @@ GEM json hue-lib (0.7.4) json - json (2.1.0) + json (2.2.0) PLATFORMS ruby @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.15.1 + 1.17.2 diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index 4f8d1039e5ea5..ae51bb69bda11 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -1,10 +1,15 @@ -{ bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "hue-cli-${version}"; - - version = (import gemset).hue-cli.version; - inherit ruby; +bundlerApp { + pname = "hue-cli"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "hue" ]; + + meta = with lib; { + description = "Command line interface for controlling Philips Hue system's lights and bridge"; + homepage = https://github.com/birkirb/hue-cli; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ manveru ]; + }; } diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix index d1af93ff154cd..69d12f25a80e6 100644 --- a/pkgs/tools/networking/hue-cli/gemset.nix +++ b/pkgs/tools/networking/hue-cli/gemset.nix @@ -1,6 +1,8 @@ { hue-cli = { dependencies = ["hue-lib" "json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10gjf59pamfy2m17fs271d9ffrg1194b1m6vxzn6p7smzry52h9z"; @@ -10,6 +12,8 @@ }; hue-lib = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pyl8g8gisdhl79gbzvnddqrsbq0lmflzg7n6yi6xrp5b5290shz"; @@ -18,11 +22,13 @@ version = "0.7.4"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; } \ No newline at end of file -- cgit 1.4.1 From 545af899c2b4178a5bf8ffe5636e04a6939ad055 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 4 May 2019 08:11:12 -0400 Subject: kupfer: fix broken build --- pkgs/applications/misc/kupfer/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 33a2cf9320952..7acbd3389f9a9 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -30,6 +30,10 @@ buildPythonApplication rec { buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; + # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' + # see https://github.com/NixOS/nixpkgs/issues/56943 for details + strictDeps = false; + postInstall = let pythonPath = (stdenv.lib.concatMapStringsSep ":" (m: "${m}/lib/${python.libPrefix}/site-packages") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fe00d164ef79..3554588f847f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18433,7 +18433,11 @@ in kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { }; + kupfer = callPackage ../applications/misc/kupfer { + # using python36 as there appears to be a waf issue with python37 + # see https://github.com/NixOS/nixpkgs/issues/60498 + python3Packages = python36Packages; + }; lame = callPackage ../development/libraries/lame { }; -- cgit 1.4.1 From fc32b49933ed3930af1fe578d180e36565e9da67 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 4 May 2019 08:14:37 -0400 Subject: kupfer: switch from `name` to `pname` --- pkgs/applications/misc/kupfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 7acbd3389f9a9..81cba3f56378d 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -14,7 +14,7 @@ with python3Packages; buildPythonApplication rec { - name = "kupfer-${version}"; + pname = "kupfer"; version = "319"; src = fetchurl { -- cgit 1.4.1 From 091de095c92ab1d2932ec9dd5e810ea2575e2432 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 4 May 2019 15:31:02 +0000 Subject: -mno-fma is x86_64 only; it hinders aarch64 compilation --- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/still.nix | 2 +- pkgs/development/libraries/gsl/default.nix | 3 ++- pkgs/development/libraries/gsl/gsl-1_16.nix | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 75d780f233381..ccf0b69d7c662 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" "-mno-fma" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 9e6671838cd89..200677435eb61 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" "-mno-fma" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 6e6b74d514e96..c8846509d004c 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; - NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 07dee287714a6..e5772c8772ec5 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; - NIX_CFLAGS_COMPILE = [ "-mno-fma" ]; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { -- cgit 1.4.1 From de467e740e648824216f2571fed02cc684751fe1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 May 2019 16:48:25 +0100 Subject: rapid-photo-downloader: add vmtouch to wrapped PATH without this, the analyze-pv-structure executable complains: "To run this program, you need to install vmtouch." --- pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 0f19a296df396..b244bed9294ba 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev , udisks, gexiv2, gst_all_1, libnotify -, exiftool, gdk_pixbuf, libmediainfo +, exiftool, gdk_pixbuf, libmediainfo, vmtouch }: python3Packages.buildPythonApplication rec { @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set PYTHONPATH \"$PYTHONPATH\"" - "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool ]}" + "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}" "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; -- cgit 1.4.1 From 1330269c1556e5600b1ea11061712cf649e72d4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 09:28:51 -0700 Subject: rebar3: 3.9.1 -> 3.10.0 (#60765) * rebar3: 3.9.1 -> 3.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rebar3/versions * rebar3: don't use fetchurl for mutable GitHub archives + parse_trans 3.3.0 hash has changed --- .../tools/build-managers/rebar3/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index ad4cbeda0f85e..60b6fd1953edd 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, +{ stdenv, fetchFromGitHub, fetchHex, erlang, tree, hexRegistrySnapshot }: let - version = "3.9.1"; + version = "3.10.0"; bootstrapper = ./rebar3-nix-bootstrap; @@ -65,17 +65,19 @@ let parse_trans = fetchHex { pkg = "parse_trans"; version = "3.3.0"; - sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; + sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp"; }; in -stdenv.mkDerivation { - name = "rebar3-${version}"; +stdenv.mkDerivation rec { + pname = "rebar3"; inherit version erlang; - src = fetchurl { - url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "1n6287av29ws3bvjxxmw8s2j8avwich4ccisnnrnypfbm1khlcxp"; + src = fetchFromGitHub { + owner = "rebar"; + repo = pname; + rev = version; + sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2"; }; inherit bootstrapper; @@ -121,7 +123,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rebar/rebar3; - description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to distribute or -- cgit 1.4.1 From ceeded17a73f0b1c03247d64fe2c10469133563a Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.dde-daemon: 3.24.1 -> 3.27.1 --- pkgs/desktops/deepin/dde-daemon/default.nix | 5 +++-- pkgs/desktops/deepin/dde-daemon/deps.nix | 34 ++++++++++++++--------------- 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 954d0971c250d..4f6b0f4908b9e 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.24.1"; + version = "3.27.1"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y"; + sha256 = "1rbv7fals2bwhalw1hh3swmrdzclqbhny782shnrwqv53235xda3"; }; patches = [ @@ -87,6 +87,7 @@ buildGoPackage rec { ''; buildPhase = '' + export PAM_MODULE_DIR="$out/lib/security" # compilation of the nm module is failing #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code make -C go/src/${goPackagePath} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index fab2f9f93b20b..352a6c0e5193c 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -36,13 +36,22 @@ sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; }; } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; + sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; + }; + } { goPackagePath = "github.com/linuxdeepin/go-x11-client"; fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; - sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; + rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; + sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; }; } { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; - sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; + rev = "6d32002ffd7577f23673706728e1c510698cecb1"; + sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; - sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; + rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7"; + sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "e3703dcdd614d2d7488fff034c75c551ea25da95"; - sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -99,13 +108,4 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } - { - goPackagePath = "pkg.deepin.io/lib"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83"; - sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc"; - }; - } ] -- cgit 1.4.1 From 97e29f33d4b3caa1f288e0bd375dc8423b127d86 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.dde-network-utils: 0.1.2 -> 0.1.4 --- pkgs/desktops/deepin/dde-network-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index f183d0e15f823..84c7c9207eca3 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-network-utils"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv"; + sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1"; }; nativeBuildInputs = [ -- cgit 1.4.1 From d63335e52433762818cac432f1aadd8242a1aff2 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.dde-polkit-agent: 0.2.4 -> 0.2.6 --- pkgs/desktops/deepin/dde-polkit-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 17b88738c36fc..2c5dfa33053b4 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-polkit-agent"; - version = "0.2.4"; + version = "0.2.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6"; + sha256 = "1ih78sxhnn6hbx9mzhalx95dk18f217mjbvymf8dky2vkmw8vnmx"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 4a5efb7f237631b4f3d6e5f4b344545aa3d6a13b Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.dde-session-ui: 4.9.0 -> 4.9.6 --- pkgs/desktops/deepin/dde-session-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index a61a0fdbb84eb..f6d70e330ea0e 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.9.0"; + version = "4.9.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3"; + sha256 = "1wk5mjv1g9my80cxpcycqkm2gjc5r5rrcpxmsl06w4g2c19k50x1"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 073a5fd8846237d756cf3351e4656cc93a13cf49 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.deepin-desktop-base: 2019.03.29 -> 2019.04.24 --- pkgs/desktops/deepin/deepin-desktop-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index b5e75c217b1e7..6e6d02f17e06a 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2019.03.29"; + version = "2019.04.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq"; + sha256 = "0mdfjkyjrccxlsg05mf80qcw8v5srlp80rvjkpnnbhfscq1fnpgn"; }; nativeBuildInputs = [ deepin.setupHook ]; -- cgit 1.4.1 From e1bbe456cc09ec7ecc1ef9d61315d354e0cad779 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.deepin-icon-theme: 15.12.68 -> 15.12.69 --- pkgs/desktops/deepin/deepin-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 3b6b61c1ae76f..5976b7cb1af10 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.68"; + version = "15.12.69"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf"; + sha256 = "1y6r2as3acqkq8z1d44c82jfplihscmqc9fgpq1j0anznwcdj73k"; }; nativeBuildInputs = [ gtk3 xcursorgen ]; -- cgit 1.4.1 From 3712ba6fec99058bc9ce7b1211274088dcd3bc1d Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.deepin-image-viewer: 1.3.10 -> 1.3.13 --- pkgs/desktops/deepin/deepin-image-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 7e2840f0f3f2d..54e9db4cb495d 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.3.10"; + version = "1.3.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk"; + sha256 = "1ql3li63qiw92jx5jzmx3k115vdn3cjfysja3afjhmfngq1xibmj"; }; nativeBuildInputs = [ -- cgit 1.4.1 From b294febb6f45e398e27ea6fb7f313ffba046215a Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.deepin-menu: 3.4.1 -> 3.4.6 --- pkgs/desktops/deepin/deepin-menu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 5de292805b653..990c6a850ff1c 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-menu"; - version = "3.4.1"; + version = "3.4.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0aga4d4qwd7av6aa4cynhk0sidns7m7y6x0rq1swnkpr9ksr80gi"; + sha256 = "1gxf3slqx1s15bjrds29sas7ah6kp8c4pjvzwipncyx6qfgczj2a"; }; nativeBuildInputs = [ -- cgit 1.4.1 From f8a64e73f69b8a3ade2167c65fd7b86fee39fd78 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:41:59 -0300 Subject: deepin.deepin-movie-reborn: 3.2.21 -> 3.2.22.1 --- pkgs/desktops/deepin/deepin-movie-reborn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 8a675ca1169ea..914e77d851577 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.21"; + version = "3.2.22.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9"; + sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 04e0f425d5e7f8764e954f902af6f18ea02896a2 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.deepin-screenshot: 4.1.8 -> 4.1.10 --- pkgs/desktops/deepin/deepin-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 6585bc78c5887..9313b903c62a0 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-screenshot"; - version = "4.1.8"; + version = "4.1.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1zhjchflgws2q74b9fgdjy2wzifjhimnrrq1sxlv395793xv8lrr"; + sha256 = "00zmmnvm5wv9fkc9fbqs23jsqs1mnr68afl4irj6y287ic0pj61i"; }; nativeBuildInputs = [ -- cgit 1.4.1 From a1bf0238310a1d60c7e6f819f2fa06c9e208df1d Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.deepin-terminal: 3.2.1.2 -> 3.2.2.1 --- pkgs/desktops/deepin/deepin-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 74337974accad..cbee49c0572ff 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-terminal"; - version = "3.2.1.2"; + version = "3.2.2.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90"; + sha256 = "08bhdd9q4aqy5yjbpqy918j63c3b2rrdqdkxh3fk258n1fm72gmw"; }; nativeBuildInputs = [ -- cgit 1.4.1 From f0d80d0d08dd1d5f07e3e5165566bf0cbc7b3bc7 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.deepin-turbo: 0.0.2 -> 0.0.3 --- pkgs/desktops/deepin/deepin-turbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index 6a343f816b94a..d5702a55d903d 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-turbo"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5"; + sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3"; }; nativeBuildInputs = [ -- cgit 1.4.1 From b3252f5a97c52ba79effcc9773f3975723bf9943 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.deepin-wm: 1.9.37 -> 1.9.38 --- pkgs/desktops/deepin/deepin-wm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index d1ae0557aaa76..37e4cb2002b22 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.37"; + version = "1.9.38"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi"; + sha256 = "1qhdnv4x78f0gkr94q0j8x029fk9ji4m9jdipgrdm83pnahib80g"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0c82c7b41bde1eda9eec29079c90ce658268bb63 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.dtkcore: 2.0.10 -> 2.0.12.1 --- pkgs/desktops/deepin/dtkcore/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 4081a40a96e26..15e2c8be799ed 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -3,19 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.10"; + version = "2.0.12.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7"; + sha256 = "1akfzkdhgsndm6rlr7snhpznxj0w351v6rr8vvnr6ka2dw75xsl4"; }; nativeBuildInputs = [ pkgconfig qmake pythonPackages.wrapPython + deepin.setupHook ]; buildInputs = [ @@ -23,21 +24,18 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Only define QT_HOST_DATA if it is empty - sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf - sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf + searchHardCodedPaths # debugging # Fix shebang sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," ''; - preConfigure = '' - qmakeFlags="$qmakeFlags QT_HOST_DATA=$out" - ''; + qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ]; postFixup = '' chmod +x $out/lib/dtk2/*.py wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath" + searchHardCodedPaths $out # debugging ''; enableParallelBuilding = true; -- cgit 1.4.1 From fd2e9fe84d49b149c9d64c585af042793adbbbdb Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.dtkwidget: 2.0.10 -> 2.0.12.3 --- pkgs/desktops/deepin/dtkwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index b55a5fbc9fe9c..ff92ced6e7a07 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.10"; + version = "2.0.12.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6"; + sha256 = "0z71il09gj1frkxfw3av97szh17spr6ss1k07l0prk1s1wm7yyfr"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3ccc8f15d852ec7b155b96294ef12fb1a444049f Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.dtkwm: 2.0.9 -> 2.0.11 --- pkgs/desktops/deepin/dtkwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 7154ae3da6a9f..c0834ace8f8c9 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwm"; - version = "2.0.9"; + version = "2.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab"; + sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0fcb5005cc3ec379587757a157cf3f640ca34aab Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.go-dbus-factory: 0.4.0 -> 0.7.0 --- pkgs/desktops/deepin/go-dbus-factory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index ad2926fa403fd..5d526017f8dac 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-dbus-factory"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00"; + sha256 = "080bcwbq00d91iazgl59cp5ra2x6xkhnc41ipvglvrkibq9zi1a4"; }; makeFlags = [ "PREFIX=${placeholder ''out''}" ]; -- cgit 1.4.1 From 2e60d60bb1a6580d48ca9c78dfebd06922fa3b15 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.go-gir-generator: 2.0.0 -> 2.0.1 --- pkgs/desktops/deepin/go-gir-generator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index 03c906585e3d7..aef87f04b1231 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16"; + sha256 = "0jdhfnwrpp77893zxljr453w23kahqsdpd8a8i5jp6pyvkdm816j"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 9f40dae0c4ad1ce5a5fdb4b83d7d183a8c9cb992 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:00 -0300 Subject: deepin.go-lib: 1.10.0 -> 1.10.2 --- pkgs/desktops/deepin/go-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 41315c4409011..a6282b979f76b 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.10.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m"; + sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf"; }; buildInputs = [ -- cgit 1.4.1 From b742f14a0461874bc933955ddc3da2d6289b48d3 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:01 -0300 Subject: deepin.qt5dxcb-plugin: 1.1.25 -> 1.1.27 --- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 7d2c89165087a..ee597184381c4 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.25"; + version = "1.1.27"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp"; + sha256 = "1hs7r17qsqn3hgfjd0scagpj1dqys7i1507vxadfac4h1ahyxaz7"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 1b7597f3dc261e38758e8b730aab311dc6cbae27 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 08:42:01 -0300 Subject: deepin.qt5integration: 0.3.8 -> 0.3.11 --- pkgs/desktops/deepin/qt5integration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 634bac5cf97dd..55084ed9484a0 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.8"; + version = "0.3.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n"; + sha256 = "1p3bnjy449vy5mpxassjv6sr2dp887gsss000szk5s0p1agmydxq"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 660b67a1f258cdc262352569a5bc6ab2f32b6f78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 09:48:00 -0700 Subject: wallabag: 2.3.6 -> 2.3.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wallabag/versions --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 688c3cacc79e5..ac0348482ead8 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.3.6"; + version = "2.3.7"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "0m0dy3r94ks5pfxyb9vbgrsm0vrwdl3jd5wqwg4f5vd107lq90q1"; + sha256 = "1kv2jy47darj6lysyxyaw5d5z5kwqdalbpv0hsg8i7zav09dw8z2"; }; outputs = [ "out" ]; -- cgit 1.4.1 From e59bc5b8ceec4e487ac09028b54b877c5b70d736 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 10:16:20 -0700 Subject: woeusb: 3.2.12 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/woeusb/versions --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index c505438250740..12a97a2e8e466 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.12"; + version = "3.3.0"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "14arz0g95favbl5vsngxm3xznva223x67a9as5n2mpf5bbkd9zx5"; + sha256 = "1w3m3qbjn0igydsbpf22w29lzf1pkxv7dlny5mbyrb6j0q6wlx0b"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; -- cgit 1.4.1 From a5062a2807b7f4a2595c47dbbdb512caa426ff6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 10:42:55 -0700 Subject: xmlsec: 1.2.26 -> 1.2.28 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmlsec/versions --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 94f1d187267e5..b19bf000b0d4d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.26"; + version = "1.2.28"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; + sha256 = "1m12caglhyx08g8lh2sl3nkldlpryzdx2d572q73y3m33s0w9vhk"; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From ef8dfcc07f0d202007e6d84ef71f3fce4e7102f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 11:38:05 -0700 Subject: zynaddsubfx: 3.0.4 -> 3.0.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zynaddsubfx/versions --- pkgs/applications/audio/zynaddsubfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index b8cca7c72015b..7bc1c07befa17 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "18m4ax0x06y1hx4g2g3gf02v0bldkrrb5m7fsr5jlfp1kvjd2j1x"; + sha256 = "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; -- cgit 1.4.1 From e0dbf2c3f1cefb13792cfc75ab627b496e245e08 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sat, 4 May 2019 21:55:52 +0200 Subject: wpscan: 3.4.3 -> 3.5.3, use bundlerApp --- pkgs/tools/security/wpscan/Gemfile | 2 +- pkgs/tools/security/wpscan/Gemfile.lock | 26 +++++++++++++------------- pkgs/tools/security/wpscan/default.nix | 2 +- pkgs/tools/security/wpscan/gemset.nix | 32 ++++++++++++++++---------------- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/wpscan/Gemfile b/pkgs/tools/security/wpscan/Gemfile index 3b5e4282ab58a..5d76cd24f3eaa 100644 --- a/pkgs/tools/security/wpscan/Gemfile +++ b/pkgs/tools/security/wpscan/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'wpscan', '= 3.4.3' +gem 'wpscan' diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 877e3f4b53bfe..bf03aba141819 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,34 +1,34 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.2) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - cms_scanner (0.0.41.3) + cms_scanner (0.5.1) nokogiri (~> 1.10.0) - opt_parse_validator (~> 0.0.16.6) + opt_parse_validator (~> 1.7.2) public_suffix (~> 3.0.0) ruby-progressbar (~> 1.10.0) typhoeus (~> 1.3.0) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) ethon (0.12.0) ffi (>= 1.3.0) ffi (1.10.0) - i18n (1.5.2) + i18n (1.6.0) concurrent-ruby (~> 1.0) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) - opt_parse_validator (0.0.16.6) + opt_parse_validator (1.7.2) activesupport (>= 4.2, < 5.3.0) - addressable (~> 2.5.0) + addressable (>= 2.5, < 2.7) public_suffix (3.0.3) ruby-progressbar (1.10.0) thread_safe (0.3.6) @@ -36,8 +36,8 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - wpscan (3.4.3) - cms_scanner (~> 0.0.41.2) + wpscan (3.5.3) + cms_scanner (~> 0.5.0) xmlrpc (0.3.0) yajl-ruby (1.4.1) @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - wpscan (= 3.4.3) + wpscan BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 9049318c249db..85455325f695f 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -15,7 +15,7 @@ bundlerApp { description = "Black box WordPress vulnerability scanner"; homepage = https://wpscan.org/; license = licenses.unfreeRedistributable; - maintainers = [ maintainers.nyanloutre ]; + maintainers = with maintainers; [ nyanloutre manveru ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 6377f05607fec..c0ad80bd99b16 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; cms_scanner = { dependencies = ["nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m09dlyd4c51nd81dp09nddjpp81n1y0k8g36jf4d78nlgsc83s6"; + sha256 = "03hvvqq0s35a6l7lx9zpagv0gcdzhw7jvhzssiaiy6y81cx4z9pn"; type = "gem"; }; - version = "0.0.41.3"; + version = "0.5.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; ethon = { dependencies = ["ffi"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "088xnnpi7hq243n44fmgqvjr0m86ivk8r87k9b3ddq3b7nl6nyf9"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; mini_portile2 = { groups = ["default"]; @@ -100,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.3"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127qxgf6kvv4fnnn5bxx8ivfknjf3ydz3vkxrxj26mva4ijwnkl4"; + sha256 = "14zp0260x652pf75maq9ydvqsqgv8ji9w85gjk8f0vwjykf1151n"; type = "gem"; }; - version = "0.0.16.6"; + version = "1.7.2"; }; public_suffix = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13wmgmkh7n2jkgf46q9755nsvj34fag1gnns7rlbynkk1277ng6x"; + sha256 = "0j4v24iwy35q7qy3l8zr5r8mjn7nc7ahdiq13dpgjwrprvrw1jk2"; type = "gem"; }; - version = "3.4.3"; + version = "3.5.3"; }; xmlrpc = { groups = ["default"]; -- cgit 1.4.1 From f91b7984b4f82a3b4e1c5a42160fd59ddb1f5376 Mon Sep 17 00:00:00 2001 From: Maximilian Güntner Date: Sat, 4 May 2019 22:32:43 +0200 Subject: matrix-synapse: 0.99.3 -> 0.99.3.2 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d942e5fa8d313..e181b850ea425 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.3"; + version = "0.99.3.2"; src = fetchPypi { inherit pname version; - sha256 = "03300dplzckydwfvbn4w1sfc77b461cvgpi3qkhbv9jnnzz5y28g"; + sha256 = "0jcmav15ms3859174zpqf11hb7xdql4fgqmxlxpxjllzipq4fwiz"; }; patches = [ -- cgit 1.4.1 From 44f79bfde521c79c982342f590df0aa5e586c00c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 14:44:29 -0700 Subject: xsecurelock: 1.2 -> 1.3.1 (#60933) * xsecurelock: 1.2 -> 1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xsecurelock/versions * xsecurelock: 1.3 -> 1.3.1 --- pkgs/tools/X11/xsecurelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 5cbf3cf3a8f08..1d4786bd6ecc2 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xsecurelock-${version}"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "1vaw2m3yyfazj1x7xdwppmm0ch075q399g5vzrmhhrkzdrs53r1x"; + sha256 = "17666b0ah5pfspxbfx9cw3lfmzx6b47r54bacwzzhfq6wbw6ci6k"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 71fd2482b41619b55caa2c2198854f34fc90a1db Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 4 May 2019 16:44:12 +0200 Subject: xmonad-with-packages: Remove ghc manpage This package should only install the xmonad manpage but not GHC's (it doesn't even install GHC in the path). Installing both manpages makes this package conflict with the GHC derivation. Fixes #60914 --- pkgs/applications/window-managers/xmonad/wrapper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index bc7a5174e26b6..f5c9f12a23f6d 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -8,8 +8,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildCommand = '' - mkdir -p $out/bin $out/share - ln -s ${xmonadEnv}/share/man $out/share/man + install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" -- cgit 1.4.1 From f17ab3dcff1313091d3a48f36d83d3052d64f823 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 4 May 2019 19:22:57 -0300 Subject: deepin: add option to enable searching FHS hard coded paths in binaries --- pkgs/desktops/deepin/setup-hook.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh index 63a43bb58407e..ce1d7330a2221 100755 --- a/pkgs/desktops/deepin/setup-hook.sh +++ b/pkgs/desktops/deepin/setup-hook.sh @@ -1,17 +1,28 @@ # Helper functions for deepin packaging searchHardCodedPaths() { - # looks for ocurrences of hard coded paths in given (current) - # directory and command invocations for the purpose of debugging a - # derivation + # Usage: + # + # searchHardCodedPaths [-a] [] + # + # Looks for ocurrences of FHS hard coded paths and command + # invocations in the given path (default: current directory) for + # the purpose of debugging a derivation. The option -a enables + # processing binary files as if they were text. + + local binary + if [ "$1" = "-a" ]; then + binary="-a" + shift + fi - local dir=$1 + local path=$1 - echo ----------- looking for command invocations - grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true + echo ----------- looking for command invocations in $path + grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true - echo ----------- looking for hard coded paths - grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true + echo ----------- looking for hard coded paths in $path + grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true echo ----------- done } -- cgit 1.4.1 From 6c327820b76fb41160f45da7f3a224bb16d7f0fc Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 29 Apr 2019 03:08:53 +0000 Subject: grab-site: 2.1.11 -> 2.1.15 --- pkgs/tools/backup/grab-site/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 7209afd8e7ed1..2947c5fc1b47b 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,14 +1,14 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - version = "2.1.11"; + version = "2.1.15"; name = "grab-site-${version}"; src = fetchFromGitHub { rev = "${version}"; - owner = "ludios"; + owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "0w24ngr2b7nipqiwkxpql2467b5aq2vbknkb0sry6a457kb5ppsl"; + sha256 = "1h3ajsj1c2wlxji1san97vmjd9d97dv0rh0jw1p77irkcvhzfpj8"; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Crawler for web archiving with WARC output"; - homepage = https://github.com/ludios/grab-site; + homepage = https://github.com/ArchiveTeam/grab-site; license = licenses.mit; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; -- cgit 1.4.1 From f15adc548f27390342adc829a3ab42c174e8fea9 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 4 May 2019 20:45:12 +0000 Subject: chromium: 74.0.3729.108 -> 74.0.3729.131 CVE-2019-5827 CVE-2019-5824 --- .../networking/browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 566ec6006aa1c..6e96cf217f59d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; - sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h"; - version = "74.0.3729.108"; + sha256 = "1b5hpf1j7ygvh15p11jswr8qf33b6k7l8nnsda93fya5bkc34mgd"; + sha256bin64 = "1mwia5l9zz858186m9kj2daq38jw75fipyhh3ncvhkw5hqggx0cd"; + version = "75.0.3770.18"; }; dev = { - sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44"; - sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa"; - version = "75.0.3766.2"; + sha256 = "1mmkj89pmbkgf6p7wb1q75j1rsrqcf7wncy3rl03rlhj64b231w7"; + sha256bin64 = "0mjcdg8las81lyrgyqymsb80k4wwzsib4sw3nyxd3cgrdxgc5vi9"; + version = "76.0.3783.0"; }; stable = { - sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; - sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c"; - version = "74.0.3729.108"; + sha256 = "11m9mlzrqzmz7rhl0ff7lry2s4yjrdkfi36qfv48m1cg5y2cfy6i"; + sha256bin64 = "034w01k0c84bx33agc2pj8149ff8rfxnsw371ankx0nzhjbn74ln"; + version = "74.0.3729.131"; }; } -- cgit 1.4.1 From 31cf973dc7a766f5f329e02cd9c723ecca9cd407 Mon Sep 17 00:00:00 2001 From: cresh Date: Sun, 5 May 2019 02:22:15 +0200 Subject: squirrel-sql: Add MSSQL driver. (#55626) --- pkgs/development/tools/database/squirrel-sql/default.nix | 2 ++ pkgs/servers/sql/mssql/jdbc/builder.sh | 6 ++++++ pkgs/servers/sql/mssql/jdbc/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/mssql/jdbc/builder.sh create mode 100644 pkgs/servers/sql/mssql/jdbc/default.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index eab4c855e1c74..5eb7651f199b9 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \ --set CLASSPATH "$cp" \ --set JAVA_HOME "${jre}" + # Make sure above `CLASSPATH` gets picked up + substituteInPlace $out/share/squirrel-sql/squirrel-sql.sh --replace "-cp \"\$CP\"" "-cp \"\$CLASSPATH:\$CP\"" mkdir -p $out/share/icons/hicolor/32x32/apps ln -s $out/share/squirrel-sql/icons/acorn.png \ diff --git a/pkgs/servers/sql/mssql/jdbc/builder.sh b/pkgs/servers/sql/mssql/jdbc/builder.sh new file mode 100644 index 0000000000000..a5ba86cb08087 --- /dev/null +++ b/pkgs/servers/sql/mssql/jdbc/builder.sh @@ -0,0 +1,6 @@ +source $stdenv/setup + +set -e + +mkdir -p $out/share/java +cp $src $out/share/java/mssql-jdbc.jar diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix new file mode 100644 index 0000000000000..f6edfe388aca4 --- /dev/null +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "mssql-jdbc"; + version = "7.2.2"; + builder = ./builder.sh; + + src = fetchurl { + url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/${pname}-${version}.jre8.jar"; + sha256 = "09psxjy1v3khq8lcq6h9mbgyijsgawf0z2qryk1l91ypnwl8s3pg"; + }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54bfa04090ed7..77e706b716143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7902,7 +7902,7 @@ in squeak = callPackage ../development/compilers/squeak { }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { - drivers = [ mysql_jdbc postgresql_jdbc ]; + drivers = [ mssql_jdbc mysql_jdbc postgresql_jdbc ]; }; stalin = callPackage ../development/compilers/stalin { }; @@ -14276,6 +14276,8 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; + mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { }; -- cgit 1.4.1 From 41d4eb51f0c51cef016b1cb497a7db7eb9d811c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 18:37:27 -0700 Subject: bacula: 9.4.2 -> 9.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bacula/versions --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 05d8a71777682..e2a9944bd4808 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.4.2"; + name = "bacula-9.4.3"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "1878jk541b8gvqbh15f0k3bvki1mx02q8mxnxhn9fdc1qk9083d4"; + sha256 = "07ablpfc4q7yr6hmff21dssqpg8gvvq2xfnfs9s3danwc321rd2g"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] -- cgit 1.4.1 From 224f0f3751990aaa1f10a1f307bbb9f2c8990061 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 5 May 2019 00:20:08 -0300 Subject: enlightenment.efl: 1.22.1 -> 1.22.2 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 0ab50bd53f05c..5545142fdc3ac 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "04mfjvaxi36b7r6kn4n0nq2gj97cbldk9iqnr5pf8jnm8plyblr0"; + sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n"; }; nativeBuildInputs = [ pkgconfig gtk3 ]; -- cgit 1.4.1 From 829c0c81b65c11ffe972bbf8afd111b110223b06 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 29 Apr 2019 23:50:07 +0200 Subject: speech-denoiser: init at unstable-07-10-2019 --- .../applications/audio/speech-denoiser/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/speech-denoiser/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix new file mode 100644 index 0000000000000..2401dc60b09a9 --- /dev/null +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }: + +let + speech-denoiser-src = fetchFromGitHub { + owner = "lucianodato"; + repo = "speech-denoiser"; + rev = "04cfba929630404f8d4f4ca5bac8d9b09a99152f"; + sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4"; + }; + + rnnoise-nu = stdenv.mkDerivation rec { + pname = "rnnoise-nu"; + version = "unstable-07-10-2019"; + src = speech-denoiser-src; + sourceRoot = "source/rnnoise"; + nativeBuildInputs = [ autoreconfHook ]; + configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ]; + installTargets = [ "install-rnnoise-nu" ]; + }; +in +stdenv.mkDerivation rec { + pname = "speech-denoiser"; + version = "unstable-07-10-2019"; + + src = speech-denoiser-src; + + nativeBuildInputs = [ pkgconfig meson ninja ]; + buildInputs = [ lv2 rnnoise-nu ]; + + postPatch = '' + substituteInPlace meson.build \ + --replace "cc.find_library('rnnoise-nu',dirs: meson.current_source_dir() + '/rnnoise/.libs/',required : true)" "cc.find_library('rnnoise-nu', required : true)" + ''; + + meta = with stdenv.lib; { + description = "Speech denoise lv2 plugin based on RNNoise library"; + homepage = https://github.com/lucianodato/speech-denoiser; + license = licenses.lgpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 847815cfe79c9..8e78418be8c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5822,6 +5822,8 @@ in spaceFM = callPackage ../applications/misc/spacefm { }; + speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; + squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfuse = callPackage ../tools/filesystems/squashfuse { }; -- cgit 1.4.1 From 886544102f78ad8a31566f953fc593f156d67bdc Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 5 May 2019 06:29:51 +0100 Subject: rambox-pro: Switch to using correct electron path --- pkgs/applications/networking/instant-messengers/rambox/pro.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 2054f4cea1961..1106aa86a0a8f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/lib/electron/.electron-wrapped $out/bin/ramboxpro \ + makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \ --add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \ --prefix PATH : ${xdg_utils}/bin ''; -- cgit 1.4.1 From a75b1c656afeacc316a48fb21f61f35c7d974893 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 22:44:10 -0700 Subject: drawpile: 2.1.7 -> 2.1.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drawpile/versions --- pkgs/applications/graphics/drawpile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 75cd9447b86f0..cba103b0e9e5a 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "1nk1rb1syrlkxq7qs101ifaf012mq42nmq1dbkssnx6niydi3bbd"; + sha256 = "1gm58zb7nh9h6v0i5pr49sfi17piik5jj757nhl0wrd10nwkipn5"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 569aff03abe9a4a7c5bcd29bb79a573d51cffac6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 22:54:09 -0700 Subject: dune: 1.9.1 -> 1.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dune/versions --- pkgs/development/tools/ocaml/dune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 632fe9fff325d..cf82b391ff966 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0z4jnj0a5vxjqlwksplhag9b3s3iqdcpcpjjzfazv5jdl5cf58f9"; + sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2"; }; buildInputs = [ ocaml findlib ]; -- cgit 1.4.1 From c9c6325e78811c2af4e39c9c68ddf1b4ba8b72f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 23:18:47 -0700 Subject: pantheon.elementary-files: 4.1.7 -> 4.1.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/elementary-files/versions --- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index fc9d8b5236dd2..c90d9a566f8d8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "files"; - version = "4.1.7"; + version = "4.1.8"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih"; + sha256 = "1frslwbqnv3mwv5dpb1sbhxnwl87cps2ambkkhnn9wwckjpm7p8f"; }; passthru = { -- cgit 1.4.1 From f029f8c5adbf6338672a8e71427e6790b304f48b Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Thu, 2 May 2019 19:04:55 +0200 Subject: fasttext: init at 0.2.0 --- .../science/machine-learning/fasttext/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/fasttext/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix new file mode 100644 index 0000000000000..0ae9a74d0d0a5 --- /dev/null +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, cmake}: + +stdenv.mkDerivation rec { + pname = "fasttext"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastText"; + rev = version; + sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Library for text classification and representation learning"; + homepage = https://fasttext.cc/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 847815cfe79c9..632a77cfaa04d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17446,6 +17446,8 @@ in exrtools = callPackage ../applications/graphics/exrtools { }; + fasttext = callPackage ../applications/science/machine-learning/fasttext { }; + fbpanel = callPackage ../applications/window-managers/fbpanel { }; fbreader = callPackage ../applications/misc/fbreader { -- cgit 1.4.1 From 5e2551a83f6af03760e2d2781210d71785ee13b2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 May 2019 02:43:48 -0500 Subject: doctl: 1.12.2 -> 1.16.0 Signed-off-by: Austin Seipp --- pkgs/development/tools/doctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 6acc977247c7c..7762dc2f372a8 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,8 +4,8 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "12"; - patch = "2"; + minor = "16"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; @@ -21,7 +21,7 @@ buildGoPackage rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "01li9ywzvmzmhqgk9a5li2wkqmdn7jl8pqz2rn7dnay4fr2259fv"; + sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv"; }; meta = { -- cgit 1.4.1 From 4beb8e24b644f0b271fd71b50a6aaf25e6f3b4d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 00:58:20 -0700 Subject: freetds: 1.00.111 -> 1.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freetds/versions --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 5c70df02cdc8f..d8bb9e8e85b0a 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.111"; + version = "1.1.6"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "17vn95bjiib3ia3h64b7akcmgmj6wfjx7w538iylhf9whqvssi4j"; + sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; }; buildInputs = [ -- cgit 1.4.1 From 97bed5c78714741e37ec20277d7900e7485984c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 01:26:40 -0700 Subject: geos: 3.7.1 -> 3.7.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geos/versions --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index d857c9931fe94..ae8d88d12d9ef 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.7.1"; + name = "geos-3.7.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0"; + sha256 = "01vpkncvq1i1191agq03yg1h7d0igj10gv5z2mqk24nnwrdycri1"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 750fcf776081141c2ca853f98f3513a5c636eac4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 May 2019 10:09:56 -0700 Subject: wings: 2.2.3 -> 2.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wings/versions --- pkgs/applications/graphics/wings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 0a4e9ada0787c..6d600260b065c 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { - name = "wings-2.2.3"; + name = "wings-2.2.4"; src = fetchurl { url = "mirror://sourceforge/wings/${name}.tar.bz2"; - sha256 = "1b9xdmh0186xxs92i831vm9yq0il1hngi8bl9a1q7fs26wb8js1g"; + sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; }; ERL_LIBS = "${cl}/lib/erlang/lib"; -- cgit 1.4.1 From 3ce7d1f0dbe724d43df94d531392ecdfcdade9ef Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 5 May 2019 10:34:08 +0200 Subject: wings3d: correct license is Tcl/Tk --- pkgs/applications/graphics/wings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 6d600260b065c..8d6eca7ef32c5 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.wings3d.com/; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; - license = "BSD"; + license = stdenv.lib.licenses.tcltk; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; -- cgit 1.4.1 From 75d1439f8f1400a8ae3ece260693b90d99daf6d0 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 5 May 2019 09:09:20 +0000 Subject: chromium: add myself as maintainer (#60961) --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index faa5bc121cb83..aec4ec1284e9b 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ bendlas ]; + maintainers = with maintainers; [ bendlas ivan ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; -- cgit 1.4.1 From 25e05609583c0d3976eaa23761f56a6ad105ad22 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 5 May 2019 11:24:34 +0200 Subject: mstpd: 0.0.5.20171113 -> 0.0.7 --- pkgs/os-specific/linux/mstpd/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index ea5790b495b9e..492a9321a21cf 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -1,22 +1,28 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { - name = "mstpd-0.0.5.20171113"; +stdenv.mkDerivation rec { + pname = "mstpd"; + version = "0.0.7"; src = fetchFromGitHub { - owner = "mstpd"; - repo = "mstpd"; - rev = "2522c6eed201bce8dd81e1583f28748e9c552d0d"; - sha256 = "0ckk386inwcx3776hf15w78hpw4db2rgv4zgf0i3zcylr83hhsr2"; + owner = pname; + repo = pname; + rev = version; + sha256 = "01majib6d1rixngf8c8vcrj1akf8nsqpxhdfdxxi2xwg23vx8f1a"; }; nativeBuildInputs = [ autoreconfHook ]; - installFlags = [ "DESTDIR=$(out)" ]; + configureFlags = [ + "--prefix=$(out)" + "--sysconfdir=$(out)/etc" + "--sbindir=$(out)/sbin" + "--libexecdir=$(out)/lib" + ]; meta = with stdenv.lib; { description = "Multiple Spanning Tree Protocol daemon"; - homepage = https://sourceforge.net/projects/mstpd/; + homepage = "https://github.com/mstpd/mstpd"; license = licenses.gpl2; platforms = platforms.linux; }; -- cgit 1.4.1 From f11c3edbc6af9943c0047f24a28524d6765da11d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 02:50:14 -0700 Subject: gtranslator: 3.32.0 -> 3.32.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtranslator/versions --- pkgs/tools/text/gtranslator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 20f1bc845cde2..69924bb234b5d 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dqigah7x6h3afw5jcs3lw3h9y0acj72arcgxr89l6galvknr2xa"; + sha256 = "1nmlj41wm02lbgrxdlpqpcgdab5cxsvggvqnk43v6kk86q27pcz1"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 7bee906a5b636b85ba567851ea2ecf9454f9d1d0 Mon Sep 17 00:00:00 2001 From: royneary Date: Sun, 5 May 2019 12:26:09 +0200 Subject: libreoffice: install the unopkg extension management tool --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a7f24fdf1f38b..787854ae8a92f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -258,7 +258,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter simpress soffice; do + for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a done -- cgit 1.4.1 From fb0481903f71e9f1fee2bc7236fa3050bba8959e Mon Sep 17 00:00:00 2001 From: royneary Date: Sun, 5 May 2019 13:23:08 +0200 Subject: libreoffice: install unopkg for libreoffice-still too --- pkgs/applications/office/libreoffice/still.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 1b7d2b0987f85..9dbc078b01d64 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter simpress soffice; do + for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a done -- cgit 1.4.1 From 171642e8b761a4c525cc228578437a97d577f509 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 May 2019 19:35:37 +0100 Subject: pythonPackages.fiona: fix tests on py27 by including mock in checkInputs --- pkgs/development/python-modules/fiona/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index b8d203d515a90..ebd100037b256 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 -, pytest, boto3 +, pytest, boto3, mock , gdal }: @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest boto3 - ]; + ] ++ stdenv.lib.optional (pythonOlder "3.4") mock; checkPhase = '' rm -r fiona # prevent importing local fiona -- cgit 1.4.1 From 480f86ea6d2f9b375632649273f09219c77b7ede Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 06:12:17 -0700 Subject: libiio: 0.17 -> 0.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libiio/versions --- pkgs/development/libraries/libiio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index ec025d31ce3f8..ee8029966dc25 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; + sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk"; }; outputs = [ "out" "lib" "dev" "python" ]; -- cgit 1.4.1 From fa94ece59d6e55acdba13174f5fc589d7710a7c4 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 5 May 2019 10:48:46 -0300 Subject: deepin.qcef: 1.1.4.6 -> 1.1.6 --- pkgs/desktops/deepin/qcef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 18d64c5645ca8..6dfbf1583b507 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -42,14 +42,14 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qcef"; - version = "1.1.4.6"; + version = "1.1.6"; srcs = [ (fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs"; + sha256 = "1x0vb4nkfa1lq0nh6iqpxfvsqmb6qfn305pbc92bsqpgiqd7jvb1"; name = pname; }) (fetchFromGitHub { -- cgit 1.4.1 From 534e2b304375c0523fa4725d4fb4ecb5b78267ce Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 5 May 2019 11:02:29 -0300 Subject: deepin.qcef: does not build on aarch64-linux --- pkgs/desktops/deepin/qcef/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 6dfbf1583b507..f70193398827f 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/linuxdeepin/qcef; license = licenses.lgpl3; platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available maintainers = with maintainers; [ romildo ]; }; } -- cgit 1.4.1 From e82c74be5e137a91d54306e43110d7d7adbf1c0f Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 5 May 2019 17:14:14 +0200 Subject: libwmf: 0.2.8.4 -> 0.2.12 Includes the previous security fixes: - CVE-2006-3376 - CVE-2009-1364 - CVE-2015-0848+4588+4695+4696 + fixes CVE-2019-6978 (in libgd) --- .../libraries/libwmf/CVE-2006-3376.patch | 28 ---- .../libraries/libwmf/CVE-2009-1364.patch | 11 -- .../libwmf/CVE-2015-0848+4588+4695+4696.patch | 186 --------------------- pkgs/development/libraries/libwmf/default.nix | 34 ++-- 4 files changed, 15 insertions(+), 244 deletions(-) delete mode 100644 pkgs/development/libraries/libwmf/CVE-2006-3376.patch delete mode 100644 pkgs/development/libraries/libwmf/CVE-2009-1364.patch delete mode 100644 pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/libwmf/CVE-2006-3376.patch b/pkgs/development/libraries/libwmf/CVE-2006-3376.patch deleted file mode 100644 index 4c7519d9c101f..0000000000000 --- a/pkgs/development/libraries/libwmf/CVE-2006-3376.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player.c -+++ libwmf-0.2.8.4/src/player.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - -@@ -132,8 +133,14 @@ - } - } - --/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); -- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); -+ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) -+ { -+ API->err = wmf_E_InsMem; -+ WMF_DEBUG (API,"bailing..."); -+ return (API->err); -+ } -+ -+ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); - - if (ERR (API)) - { WMF_DEBUG (API,"bailing..."); - diff --git a/pkgs/development/libraries/libwmf/CVE-2009-1364.patch b/pkgs/development/libraries/libwmf/CVE-2009-1364.patch deleted file mode 100644 index e2a4501662c69..0000000000000 --- a/pkgs/development/libraries/libwmf/CVE-2009-1364.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/extra/gd/gd_clip.c -+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c -@@ -70,6 +70,7 @@ - { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); - if (more == 0) return; - im->clip->max += 8; -+ im->clip->list = more; - } - im->clip->list[im->clip->count] = (*rect); - im->clip->count++; - diff --git a/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch b/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch deleted file mode 100644 index 54d47800298bb..0000000000000 --- a/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2593,9 +2593,10 @@ static int meta_dc_restore (wmfAPI* API, - polyrect.BR = 0; - - polyrect.count = 0; -+ -+ if (FR->region_clip) FR->region_clip (API,&polyrect); - } - -- if (FR->region_clip) FR->region_clip (API,&polyrect); - - return (changed); - } -@@ -3067,7 +3068,7 @@ static int meta_pen_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3181,7 +3182,7 @@ static int meta_brush_create (wmfAPI* AP - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3288,7 +3289,7 @@ static int meta_font_create (wmfAPI* API - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3396,7 +3397,7 @@ static int meta_palette_create (wmfAPI* - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); ---- libwmf-0.2.8.4.orig/src/ipa/ipa.h -+++ libwmf-0.2.8.4/src/ipa/ipa.h -@@ -48,7 +48,7 @@ static int ReadBlobByte (BMPS - static unsigned short ReadBlobLSBShort (BMPSource*); - static unsigned long ReadBlobLSBLong (BMPSource*); - static long TellBlob (BMPSource*); --static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); -+static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); - static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); - static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); - static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); ---- libwmf-0.2.8.4.orig/src/ipa/ipa/bmp.h -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h -@@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src) - % - % - */ --static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) -+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) - { int byte; - int count; - int i; -@@ -870,12 +870,14 @@ static void DecodeImage (wmfAPI* API,wmf - U32 u; - - unsigned char* q; -+ unsigned char* end; - - for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; - - byte = 0; - x = 0; - q = pixels; -+ end = pixels + bmp->width * bmp->height; - - for (y = 0; y < bmp->height; ) - { count = ReadBlobByte (src); -@@ -884,7 +886,10 @@ static void DecodeImage (wmfAPI* API,wmf - { /* Encoded mode. */ - byte = ReadBlobByte (src); - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = (unsigned char) byte; - } - else -@@ -896,13 +901,15 @@ static void DecodeImage (wmfAPI* API,wmf - else - { /* Escape mode. */ - count = ReadBlobByte (src); -- if (count == 0x01) return; -+ if (count == 0x01) return 1; - switch (count) - { - case 0x00: - { /* End of line. */ - x = 0; - y++; -+ if (y >= bmp->height) -+ return 0; - q = pixels + y * bmp->width; - break; - } -@@ -910,13 +917,20 @@ static void DecodeImage (wmfAPI* API,wmf - { /* Delta mode. */ - x += ReadBlobByte (src); - y += ReadBlobByte (src); -+ if (y >= bmp->height) -+ return 0; -+ if (x >= bmp->width) -+ return 0; - q = pixels + y * bmp->width + x; - break; - } - default: - { /* Absolute mode. */ - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = ReadBlobByte (src); - } - else -@@ -943,7 +957,7 @@ static void DecodeImage (wmfAPI* API,wmf - byte = ReadBlobByte (src); /* end of line */ - byte = ReadBlobByte (src); - -- return; -+ return 1; - } - - /* -@@ -1143,8 +1157,18 @@ static void ReadBMPImage (wmfAPI* API,wm - } - } - else -- { /* Convert run-length encoded raster pixels. */ -- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); -+ { -+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ -+ { -+ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) -+ { WMF_ERROR (API,"corrupt bmp"); -+ API->err = wmf_E_BadFormat; -+ } -+ } -+ else -+ { WMF_ERROR (API,"Unexpected pixel depth"); -+ API->err = wmf_E_BadFormat; -+ } - } - - if (ERR (API)) diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index bf685862adf17..e7aa5f7ecc9f3 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, zlib, imagemagick, libpng, pkgconfig, glib -, freetype, libjpeg, libxml2 }: +{ stdenv, fetchFromGitHub, pkgconfig +, freetype, glib, imagemagick, libjpeg, libpng, libxml2, zlib +}: -stdenv.mkDerivation { - name = "libwmf-0.2.8.4"; +stdenv.mkDerivation rec { + pname = "libwmf"; + version = "0.2.12"; - src = fetchurl { - url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz; - sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v"; + src = fetchFromGitHub { + owner = "caolanm"; + repo = pname; + rev = "v${version}"; + sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib imagemagick libpng glib freetype libjpeg libxml2 ]; - - patches = [ - ./CVE-2006-3376.patch ./CVE-2009-1364.patch - ./CVE-2015-0848+4588+4695+4696.patch - (fetchpatch { - name = "libwmf-0.2.8.4-CVE-2016-9011-debian.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=842090;filename=libwmf-0.2.8.4-CVE-2016-9011-debian.patch;msg=10"; - sha256 = "15vnqrj1dlvn0g8ccrxj2r2cyb1rv0qf0kfangxfgsi5h8is0c2b"; - }) - ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "WMF library from wvWare"; - homepage = http://wvware.sourceforge.net/libwmf.html; - license = licenses.gpl2; + homepage = "http://wvware.sourceforge.net/libwmf.html"; + downloadPage = "https://github.com/caolanm/libwmf/releases"; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } -- cgit 1.4.1 From e867007dc8e7a1b541786251a5dbfe4539c100d3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 5 May 2019 11:16:17 -0400 Subject: linux: 4.19.39 -> 4.19.40 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 8517a8e7e0a7d..a51130872202f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.39"; + version = "4.19.40"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19d2dsvscdp0dasmgjck916mhd68kg4y374f555nxvw1afdrmpql"; + sha256 = "1c1z0z5ac4zy8fp2lxbwapzwby4p9w8bx3wnlysbzmqmi96wvn3g"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 9d6aef817b22ff1261e15058f648bdcb4eeda698 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 5 May 2019 11:16:44 -0400 Subject: linux: 5.0.12 -> 5.0.13 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 0203caadc78b0..11172b9576f52 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.12"; + version = "5.0.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1w082lh8krjrpf8rp1ab6b7lcn86p7d1y2ipp604kl3rcqcph0hy"; + sha256 = "0y9lsmmalixrh1z72rxdaqb007j6b4wqfshl2bvza95a3yzm5zdw"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 92e243d56d8d3ce73ab3271669239b0007302d0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 08:22:30 -0700 Subject: mediainfo: 18.12 -> 19.04 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mediainfo/versions --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index a3320a16ee91b..8bbb179d9d517 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.12"; + version = "19.04"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d"; + sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From 912e7abd69bc6bdcbe068f3501b5c2a7530cbb76 Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Sun, 5 May 2019 17:23:41 +0200 Subject: cargo-asm: 0.1.16 -> 0.1.17 This version has some improvements across the board, such as improved demangling of LLVM-IR. --- pkgs/development/tools/rust/cargo-asm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 246f5b18843c2..8fb0b63727a2c 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "cargo-asm-${version}"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "gnzlbg"; repo = "cargo-asm"; - rev = "7d0ece74657edb002bd8530227b829b31fd19dcd"; - sha256 = "0mzbh5zw5imlaagm5zjbjk9kqdnglm398rxkqisd22h6569ppqpc"; + rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145"; + sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; }; - cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b"; + cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit 1.4.1 From 7ca3dec610c69dcf4e29fa986767a59662c3a97f Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 5 May 2019 17:56:07 +0200 Subject: oxidized: 0.26.2 -> 0.26.3 (#60480) --- pkgs/tools/admin/oxidized/Gemfile | 2 +- pkgs/tools/admin/oxidized/Gemfile.lock | 12 ++++++------ pkgs/tools/admin/oxidized/gemset.nix | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index 4ff04d4829c85..bddfe1adee53e 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'oxidized', '0.26.2' +gem 'oxidized', '0.26.3' gem 'oxidized-web', '0.13.1' gem 'oxidized-script', '0.6.0' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 9946b35057d6b..89129ccb25f69 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: asetus (0.3.0) - backports (3.12.0) + backports (3.14.0) charlock_holmes (0.7.6) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) @@ -13,9 +13,9 @@ GEM htmlentities (4.3.4) json (2.2.0) multi_json (1.13.1) - net-ssh (5.1.0) + net-ssh (5.2.0) net-telnet (0.1.1) - oxidized (0.26.2) + oxidized (0.26.3) asetus (~> 0.1) net-ssh (~> 5) net-telnet (~> 0.1.1) @@ -45,8 +45,8 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rugged (0.28.0) - sass (3.7.3) + rugged (0.28.1) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -70,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - oxidized (= 0.26.2) + oxidized (= 0.26.3) oxidized-script (= 0.6.0) oxidized-web (= 0.13.1) diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index ba1a21c4a3866..de7714aced8df 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ba6n9l4kki56s2cszarps14zp2wlhw7nfawb8qwsxy3a57v4mw4"; + sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; charlock_holmes = { groups = ["default"]; @@ -96,10 +96,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; net-telnet = { groups = ["default"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130h99wijfvv443wgdllxvlq880m0m31rxvrszq5wdii7ad977s5"; + sha256 = "07hpxmdjkfpkc00ln3hhh5qkj0lyhcmgbi0jza2c8cnjyy9sc73x"; type = "gem"; }; - version = "0.26.2"; + version = "0.26.3"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; sass = { dependencies = ["sass-listen"]; @@ -223,10 +223,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vll3bm1dllhqjxxj639nj3afsp12hlppgpysxrgcg24jb2xl2qn"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.7.3"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; -- cgit 1.4.1 From 83779429ecd06aa1bafb43707a80061c5ac6b3f5 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 20 Oct 2018 11:02:53 -0300 Subject: deepin.deepin-anything: init at 0.0.7 --- pkgs/desktops/deepin/deepin-anything/default.nix | 64 ++++++++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-anything/default.nix (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix new file mode 100644 index 0000000000000..39e3a66af5e28 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, + dtkcore, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-anything"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1qggqjjqz2y51pag0v5qniv6763mgrmzjmr7248xx2paw3a923vk"; + }; + + outputs = [ "out" "modsrc" ]; + + nativeBuildInputs = [ + pkgconfig + deepin.setupHook + ]; + + buildInputs = [ + dtkcore + qtbase + udisks2-qt5 + utillinux + ]; + + enableParallelBuilding = true; + + makeFlags = [ + "DEB_HOST_MULTIARCH=" + "PREFIX=${placeholder ''out''}" + ]; + + postPatch = '' + searchHardCodedPaths # for debugging + fixPath $modsrc /usr/src Makefile + fixPath $out /usr Makefile + fixPath $out /usr server/tool/tool.pro + fixPath $out /etc server/tool/tool.pro + fixPath $out /usr/bin \ + server/tool/deepin-anything-tool.service \ + server/tool/com.deepin.anything.service \ + server/monitor/deepin-anything-monitor.service + sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro + ''; + + postFixup = '' + searchHardCodedPaths $out # for debugging + searchHardCodedPaths $modsrc # for debugging + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Deepin file search tool"; + homepage = https://github.com/linuxdeepin/deepin-anything; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 6a1fb5d97b7b4..ccc2270a8edf9 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -15,6 +15,7 @@ let dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; + deepin-anything = callPackage ./deepin-anything { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; -- cgit 1.4.1 From 868ed9f2c42b2fd6976fc0a3502fbeebce7b868e Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 13 Apr 2019 17:26:15 -0300 Subject: linuxPackages.deepin-anything: init at 0.0.7 --- pkgs/os-specific/linux/deepin-anything/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/deepin-anything/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/deepin-anything/default.nix b/pkgs/os-specific/linux/deepin-anything/default.nix new file mode 100644 index 0000000000000..4139cc153cddc --- /dev/null +++ b/pkgs/os-specific/linux/deepin-anything/default.nix @@ -0,0 +1,22 @@ +{ stdenv, deepin, kernel }: + +stdenv.mkDerivation { + pname = "deepin-anything-module"; + version = "${deepin.deepin-anything.version}-${kernel.version}"; + src = deepin.deepin-anything.modsrc; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildPhase = '' + make -C src/deepin-anything-0.0 kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + ''; + + installPhase = '' + install -m 644 -D -t $out/lib/modules/${kernel.modDirVersion}/extra src/deepin-anything-0.0/*.ko + ''; + + meta = deepin.deepin-anything.meta // { + description = deepin.deepin-anything.meta.description + " (kernel modules)"; + badPlatforms = [ "aarch64-linux" ]; # the kernel module is not building + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b86fa5c3d0877..cbaa27be343d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15131,6 +15131,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; exfat-nofuse = callPackage ../os-specific/linux/exfat { }; -- cgit 1.4.1 From 1a25840733ace2bddc7b51d813fc7ad804a3059e Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 5 May 2019 19:10:40 +0200 Subject: opera: add at-spi2-core to RPATH --- pkgs/applications/networking/browsers/opera/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 15cefca409c3e..2d09c5c51403f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -34,6 +34,7 @@ , stdenv , systemd , at-spi2-atk +, at-spi2-core }: let @@ -86,6 +87,7 @@ let libpulseaudio.out at-spi2-atk + at-spi2-core ]; in stdenv.mkDerivation { -- cgit 1.4.1 From 79d08d64c67025094107245784afb233a6fec251 Mon Sep 17 00:00:00 2001 From: Adam Oliver Zsigmond Date: Thu, 2 May 2019 09:54:24 +0200 Subject: aws-iam-authenticator 2018-07-29 -> 0.4.0 --- .../security/aws-iam-authenticator/default.nix | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 39c0c02890bd3..44282d5f96434 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,27 +1,22 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "aws-iam-authenticator-${version}"; - # This is meant to be a stable release, but since the rename from - # heptio, there has been no release. Please pin this to an actual - # release once that happens. - version = "2018-07-29"; - rev = "01dd27d77ec1e2ec640a010970f00b2f8074b0b5"; + pname = "aws-iam-authenticator"; + version = "0.4.0"; goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; - src = fetchgit { - inherit rev; - url = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; - sha256 = "1n7khd2qvl527x3ac6f89smf12za92g08d9v2j393i7n9l1rgw38"; + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; }; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.srhb ]; + license = licenses.asl20; + maintainers = [ maintainers.srhb ]; }; } -- cgit 1.4.1 From 661d9e59cd81efb5b93d84206af8e589ece3b47d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 10:25:57 -0700 Subject: nzbget: 20.0 -> 21.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nzbget/versions --- pkgs/tools/networking/nzbget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 2b5669e3f31e4..af7c4401daecf 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "20.0"; + version = "21.0"; src = fetchurl { url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "0vyhmjg3ipjlv41il6kklys3m6rhqifdkv25a7ak772l6ba3dp04"; + sha256 = "0lwd0pfrs4a5ms193hgz2qiyf7grrc925dw6y0nfc0gkp27db9b5"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 3cb1274745b00cf9d6b3cfb6d5658f99cf9511fd Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 5 May 2019 19:29:25 +0200 Subject: easyrpg-player: 0.5.4 -> 0.6.0 Changelog: https://blog.easyrpg.org/2019/03/easyrpg-player-0-6-0-preemptive-attack/ --- pkgs/games/easyrpg-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 75763907425b4..c8b85da213a5f 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "easyrpg-player-${version}"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "1k1b5ws48h1ylarbcfsxyvajl0fdzmi3db8y3m8iq4fg3f0yslg8"; + sha256 = "0b0c4wwqldjf37sf7zldnbgvfmyqcvpjvhs949gb3r8i5cffzm58"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; - homepage = https://easyrpg.org/; + homepage = "https://easyrpg.org/"; license = licenses.gpl3; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; -- cgit 1.4.1 From bb4f35b9cc156ebe91b86e4d43aaac0a01169d41 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 May 2019 12:34:56 -0400 Subject: pantheon.elementary-settings-daemon: fix #14168 Is the same fix as in #57620 just for Pantheon's settings daemon. --- .../elementary-settings-daemon/default.nix | 5 +++++ .../global-backlight-helper.patch | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch (limited to 'pkgs') diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index eeca04eff4e8f..aa451ba75166f 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata mousetweaks; }) + ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" @@ -98,6 +99,10 @@ stdenv.mkDerivation rec { # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop + + # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + mkdir -p $out/bin/elementary-settings-daemon + ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch new file mode 100644 index 0000000000000..dcdc83934ba63 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -0,0 +1,26 @@ +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { +diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +index f16300f8..79d6bd17 100644 +--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in ++++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +@@ -25,7 +25,7 @@ + no + yes + +- @libexecdir@/gsd-backlight-helper ++ /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + + + -- cgit 1.4.1 From 3571e09fb24e9da3ad240e9bc75e7ed9530071a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 11:18:57 -0700 Subject: ocamlPackages.re: 1.8.0 -> 1.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocaml4.06.1-re/versions --- pkgs/development/ocaml-modules/re/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index b2413b7dddd63..29fb4fd09b2a0 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "re"; - version = "1.8.0"; + version = "1.9.0"; minimumOCamlVersion = "4.02"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; + sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; }; buildInputs = [ ounit ]; -- cgit 1.4.1 From bdd85ebab43e662dc87cbc0a7d7f3ce251cd603a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 11:24:04 -0700 Subject: ocamlPackages.ppxlib: 0.5.0 -> 0.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocaml4.06.1-ppxlib/versions --- pkgs/development/ocaml-modules/ppxlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 468738224deae..e50deafd6e2d7 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"; + sha256 = "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 8d9e99992eee499897dee18628d6a48362cb34db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 11:37:30 -0700 Subject: ocamlPackages.ppx_derivers: 1.2 -> 1.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocaml4.06.1-ppx_derivers/versions --- pkgs/development/ocaml-modules/ppx_derivers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 0482e04b1c4ad..20b78870f93b7 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ppx_derivers"; - version = "1.2"; + version = "1.2.1"; minimumOCamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "diml"; repo = pname; rev = version; - sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; + sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; }; meta = { -- cgit 1.4.1 From d5a188d4d6e2b6eae0780e954e38336cabe3cf63 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 20 Apr 2019 08:51:44 -0300 Subject: deepin.deepin-mutter: set plugins dir from environment variable --- .../deepin-mutter/deepin-mutter.plugins-dir.patch | 41 ++++++++++++++++++++++ pkgs/desktops/deepin/deepin-mutter/default.nix | 10 +++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch b/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch new file mode 100644 index 0000000000000..4a57b501e01e2 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch @@ -0,0 +1,41 @@ +From 8eeb4febcae517080d6638f8953e02335df79f01 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Sat, 20 Apr 2019 00:28:47 -0300 +Subject: [PATCH] Get plugins dir from environment variable + +--- + src/compositor/meta-plugin-manager.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c +index ac5716db..d000100b 100644 +--- a/src/compositor/meta-plugin-manager.c ++++ b/src/compositor/meta-plugin-manager.c +@@ -56,14 +56,22 @@ meta_plugin_manager_set_plugin_type (GType gtype) + void + meta_plugin_manager_load (const gchar *plugin_name) + { +- const gchar *dpath = MUTTER_PLUGIN_DIR "/"; ++ const gchar *env_var; ++ const gchar *dpath; + gchar *path; + MetaModule *module; + ++ env_var = g_getenv ("DEEPIN_MUTTER_PLUGINS_DIR"); ++ g_debug ("$DEEPIN_MUTTER_PLUGINS_DIR: %s\n", env_var); ++ ++ dpath = env_var == NULL || strlen (env_var) == 0 ? MUTTER_PLUGIN_DIR : env_var; ++ g_debug ("dpath: %s\n", dpath); ++ + if (g_path_is_absolute (plugin_name)) + path = g_strdup (plugin_name); + else +- path = g_strconcat (dpath, plugin_name, ".so", NULL); ++ path = g_strconcat (dpath, "/", plugin_name, ".so", NULL); ++ g_debug ("path: %s\n", path); + + module = g_object_new (META_TYPE_MODULE, "path", path, NULL); + if (!module || !g_type_module_use (G_TYPE_MODULE (module))) +-- +2.21.0 + diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index fc26440a3ef17..47419a8a76281 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -44,8 +44,12 @@ stdenv.mkDerivation rec { xorg.libxkbfile ]; + patches = [ + ./deepin-mutter.plugins-dir.patch + ]; + postPatch = '' - searchHardCodedPaths + searchHardCodedPaths # debugging ''; configureFlags = [ @@ -57,6 +61,10 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + postFixup = '' + searchHardCodedPaths $out # debugging + ''; + enableParallelBuilding = true; passthru.updateScript = deepin.updateScript { inherit name; }; -- cgit 1.4.1 From 179bc50f6e7c9e6ac16d84987648c048d09ef8e6 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 20 Apr 2019 09:54:07 -0300 Subject: deepin.deepin-mutter: use absolute path in desktop file --- pkgs/desktops/deepin/deepin-mutter/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index 47419a8a76281..83afe1ee24f72 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { postPatch = '' searchHardCodedPaths # debugging + sed -i -e "s,Exec=deepin-mutter,Exec=$out/bin/deepin-mutter," data/mutter.desktop.in ''; configureFlags = [ -- cgit 1.4.1 From f38bf3ba4e1f1f5aa587e622476be8a8a0919f80 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 28 Apr 2019 06:35:25 +0000 Subject: ocamlPackages.bap: 1.4.0 -> 1.6.0 libbap: 2018-03-01 -> 2019-04-05 --- pkgs/development/libraries/libbap/default.nix | 6 +++--- pkgs/development/ocaml-modules/bap/default.nix | 17 ++++++----------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 15 +-------------- 4 files changed, 11 insertions(+), 29 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 5153b63e91c5a..2a129bc648f04 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2018-03-01"; + version = "master-2019-04-05"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; - sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; + rev = "1a89db62f1239a15d310b400f74e151c0a64f37f"; + sha256 = "0mln9adjgxzhjmjayq06ahgiay4vj5kmnzdxqz3nsik9h3npycd6"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 445ff3ecb18a6..64bbd91a3d568 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -2,29 +2,25 @@ , ocaml, findlib, ocamlbuild, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp, utop, + ppx_tools_versioned, which, makeWrapper, writeText }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-bap-${version}"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; + sha256 = "0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; + sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk"; }; - patches = [(fetchpatch { - url = "https://github.com/BinaryAnalysisPlatform/bap/commit/e4ee3a1e5b427e8d8991e7462b06123178c0a046.patch"; - sha256 = "1yq33zd2sdacclr20g05c1q050m7x7vfbl66qdgansh23dr4fnxk"; - })]; - createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' @@ -35,10 +31,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm_38 + llvm_38 ppx_tools_versioned utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -64,6 +60,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionOlder ocaml.version "4.03"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbaa27be343d1..a637d0ff152bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10966,7 +10966,7 @@ in libb2 = callPackage ../development/libraries/libb2 { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_05) bap ocaml findlib ctypes; + inherit (ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 44ee8a0c94929..2d4e34f270fea 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -57,20 +57,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { - inherit (janeStreet_0_9_0) core_kernel ppx_jane parsexp; - ezjsonm = ezjsonm.override { - inherit (janeStreet_0_9_0) sexplib; - hex = hex.override { - cstruct = cstruct.override { - inherit (janeStreet_0_9_0) sexplib; - }; - }; - }; - uri = uri_1_9.override { - inherit (janeStreet_0_9_0) ppx_sexp_conv sexplib; - }; - }; + bap = callPackage ../development/ocaml-modules/bap { }; batteries = callPackage ../development/ocaml-modules/batteries { }; -- cgit 1.4.1 From eff7bc3f337d50fece03d3d2b009f4278b9166af Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 28 Apr 2019 06:35:44 +0000 Subject: ocamlPackages.uri_1_9: remove at 1.9.6 --- pkgs/development/ocaml-modules/uri/default.nix | 25 +++++-------------------- pkgs/top-level/ocaml-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 24 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 0f3578806d833..011acf01839ec 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,33 +1,18 @@ { lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit -, re, sexplib0, sexplib, stringext -, legacy ? false +, re, sexplib0, stringext }: -let params = - if legacy then rec { - version = "1.9.6"; - archive = version; - sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; - inherit sexplib; - } else rec { - version = "2.2.0"; - archive = "v${version}"; - sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi"; - sexplib = sexplib0; - } -; in - buildDunePackage rec { pname = "uri"; - inherit (params) version; + version = "2.2.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${params.archive}.tbz"; - inherit (params) sha256; + url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi"; }; buildInputs = [ ounit ]; - propagatedBuildInputs = [ ppx_sexp_conv re params.sexplib stringext ]; + propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ]; doCheck = true; meta = { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2d4e34f270fea..8886647420c5e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -738,10 +738,6 @@ let then callPackage ../development/ocaml-modules/uri { } else callPackage ../development/ocaml-modules/uri/legacy.nix { }; - uri_1_9 = callPackage ../development/ocaml-modules/uri { - legacy = true; - }; - uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { legacyVersion = true; }; -- cgit 1.4.1 From f13c5ccc4175f04f40d3326d6ed5239da402f968 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 22 Apr 2019 15:14:54 +0000 Subject: prometheus_2: 2.8.1 -> 2.9.2 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 548049cdac5d7..4475c16cde79d 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.8.1"; - sha256 = "0x8w0qdh4lcf19nmdlhvgzpy08c2a932d3k49cjwhi5npcsf858n"; + version = "2.9.2"; + sha256 = "1nbvw9ia15ls3l2pydc9hdfs057kjlg0cm8h4w9sjjnsssbikl26"; }; } -- cgit 1.4.1 From 9e9b96f07343ceb3f012fb07b6d73e0916ca0a87 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 19 Apr 2019 10:42:17 -0300 Subject: nixos/deepin: install polkit local authority files in /etc --- nixos/modules/services/desktops/deepin/deepin.nix | 6 ++++++ pkgs/desktops/deepin/dde-api/default.nix | 26 +++++++++++++++++------ pkgs/desktops/deepin/dde-daemon/default.nix | 17 ++++++++++++--- 3 files changed, 39 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix index 45098cd783bd8..7570625078457 100644 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ b/nixos/modules/services/desktops/deepin/deepin.nix @@ -69,6 +69,12 @@ isSystemUser = true; }; + environment.etc = { + "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla"; + "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla"; + "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla"; + }; + services.deepin.deepin-menu.enable = true; services.deepin.deepin-turbo.enable = true; }) diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index b0e908c847e1b..76c0861cb3a72 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -68,15 +68,10 @@ buildGoPackage rec { rfkill # run xcur2png # run #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) - ]; + ]; postPatch = '' - searchHardCodedPaths # debugging - - sed -i -e "s|/var|$out/var|" Makefile - - # TODO: confirm where to install grub themes - sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile + searchHardCodedPaths # debugging fixPath $out /usr/lib/deepin-api \ lunar-calendar/main.go \ @@ -90,6 +85,19 @@ buildGoPackage rec { misc/systemd/system/deepin-shutdown-sound.service \ theme_thumb/gtk/gtk.go \ thumbnails/gtk/gtk.go + fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes + fixPath $out /var Makefile + + # This package wants to install polkit local authority files into + # /var/lib. Nix does not allow a package to install files into /var/lib + # because it is outside of the Nix store and should contain applications + # state information (persistent data modified by programs as they + # run). Polkit looks for them in both /etc/polkit-1 and + # /var/lib/polkit-1 (with /etc having priority over /var/lib). An + # work around is to install them to $out/etc and simlnk them to + # /etc in the deepin module. + + sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile ''; buildPhase = '' @@ -103,6 +111,10 @@ buildGoPackage rec { remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* ''; + postFixup = '' + searchHardCodedPaths $out # debugging + ''; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 4f6b0f4908b9e..c709c2894c480 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -66,7 +66,7 @@ buildGoPackage rec { ]; postPatch = '' - searchHardCodedPaths + searchHardCodedPaths # debugging patchShebangs network/nm_generator/gen_nm_consts.py fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go @@ -78,12 +78,21 @@ buildGoPackage rec { fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile - sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile + sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + - searchHardCodedPaths + # This package wants to install polkit local authority files into + # /var/lib. Nix does not allow a package to install files into /var/lib + # because it is outside of the Nix store and should contain applications + # state information (persistent data modified by programs as they + # run). Polkit looks for them in both /etc/polkit-1 and + # /var/lib/polkit-1 (with /etc having priority over /var/lib). An + # work around is to install them to $out/etc and simlnk them to + # /etc in the deepin module. + + sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile ''; buildPhase = '' @@ -104,6 +113,8 @@ buildGoPackage rec { for binary in $out/lib/deepin-daemon/*; do wrapProgram $binary "''${gappsWrapperArgs[@]}" done + + searchHardCodedPaths $out # debugging ''; passthru.updateScript = deepin.updateScript { inherit name; }; -- cgit 1.4.1 From b5e4b3879cd5f0092bfa834d23e43a045e72e2d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 13:55:11 -0700 Subject: phrasendrescher: 1.0 -> 1.2.2c (#46215) * phrasendrescher: 1.0 -> 1.2.2b Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from phrasendrescher * phrasendrescher: 1.2.2b -> 1.2.2c and refactor --- pkgs/tools/security/phrasendrescher/default.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix index 294e296ba6e0e..93dc75c1f32db 100644 --- a/pkgs/tools/security/phrasendrescher/default.nix +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, libssh2, gpgme }: stdenv.mkDerivation rec { - name = "phrasendrescher-${version}"; - version = "1.0"; + pname = "phrasendrescher"; + version = "1.2.2c"; src = fetchurl { - url = "http://leidecker.info/projects/phrasendrescher/${name}.tar.gz"; - sha256 = "1r0j7ms3i324p6if9cg8i0q900zqfjpvfr8pwj181x8ascysbbf2"; + url = "http://leidecker.info/projects/${pname}/${pname}-${version}.tar.gz"; + sha256 = "18vg6h294219v14x5zqm8ddmq5amxlbz7pw81lcmpz8v678kwyph"; }; - buildInputs = [ openssl ]; + postPatch = '' + substituteInPlace configure \ + --replace 'SSL_LIB="ssl"' 'SSL_LIB="crypto"' + ''; + + buildInputs = [ openssl libssh2 gpgme ]; + + configureFlags = "--with-plugins"; meta = with stdenv.lib; { - description = "Cracking tool that finds passphrases of SSH keys"; - homepage = http://leidecker.info/projects/phrasendrescher.shtml; + description = "A modular and multi processing pass phrase cracking tool"; + homepage = "http://leidecker.info/projects/phrasendrescher/index.shtml"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; -- cgit 1.4.1 From 8d48a54285d4287d9eafc3136127a2dc71727a74 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 5 May 2019 23:48:42 +0200 Subject: cloc: 1.80 -> 1.82 --- pkgs/tools/misc/cloc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 903b5b13f845b..38041f0b32dab 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.80"; + version = "1.82"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp"; + rev = version; + sha256 = "0fsz07z0slfg58512fmnlj8pnxkc360bgf7fclg60v9clvcjbjsw"; }; setSourceRoot = '' -- cgit 1.4.1 From 1f6ddfc7e039e0f1003116b8e9e7110f363e26e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 5 May 2019 23:57:14 +0200 Subject: firefox: 66.0.3 -> 66.0.4 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f4125374583ad..83181aae87080 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "66.0.3"; + ffversion = "66.0.4"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "31pfzgys4dv4fskaasz47fviksjj9xp60r875q0i7z1n6kx25fzkpsg18a98fkqm3g8qmljccy93w68ysywnh1zzrv8djsaza7l0mz8"; + sha512 = "0mz2xrznma3hwb2b36hlv4qmnzbfcfhrxbxqhc8yyqxnc0fm4vxbbzh1pzvghp4182n98l1dignw95v11pfgi3gss7sz1zkiywz47sw"; }; patches = [ -- cgit 1.4.1 From 1eae2945b427a315529e7c91b73bdc31378d0641 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 15:17:08 -0700 Subject: python37Packages.altair: 2.4.1 -> 3.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-altair/versions --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index b870e9197f87a..ccba946abbb40 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "2.4.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1lqln4510qqqla6s8z4ca0271qrhq6yyznsijsdn3nssvxsynqpc"; + sha256 = "0x4zm1xia6sln8dhwd803jlcii2a62fx3rlnj5vsa8g3anfc2v24"; }; postPatch = '' -- cgit 1.4.1 From 152c051ac06f558aa5b7683dd70aba80e8ce97a0 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Wed, 1 May 2019 14:30:13 -0700 Subject: amber: init at 0.5.2 --- pkgs/tools/text/amber/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/amber/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix new file mode 100644 index 0000000000000..c8f380739a6a0 --- /dev/null +++ b/pkgs/tools/text/amber/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "amber"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + rev = "v${version}"; + sha256 = "0jwrkd6qhxj2mqsfmhk687k15f7gf36gjyxnynj0yh8db2db6mjc"; + }; + + cargoSha256 = "0iv8zvglwaihcc89dk9kkhchbj1g3v8wq8jcbrgcbclcsyymmplc"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A code search-and-replace tool"; + homepage = https://github.com/dalance/amber; + license = with licenses; [ mit ]; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89d2fafdef4c4..6a39a325172fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -518,6 +518,10 @@ in amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; + amber = callPackage ../tools/text/amber { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ammonite = callPackage ../development/tools/ammonite {}; amtterm = callPackage ../tools/system/amtterm {}; -- cgit 1.4.1 From a784a005eb070b4f7b6ec2d6770cd65e64906f46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 15:43:41 -0700 Subject: python37Packages.braintree: 3.52.0 -> 3.53.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-braintree/versions --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 6604901a512fb..393285636b60b 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.52.0"; + version = "3.53.0"; src = fetchPypi { inherit pname version; - sha256 = "0p8qmmc3fmjz7i5yjyxx9sxkhfq38kr0mws4dh3k5kxl6an02mp4"; + sha256 = "026apwkjn83la7jm0azz3qajg26nza3gh49zd37j0rsp6cgmfa24"; }; propagatedBuildInputs = [ requests ]; -- cgit 1.4.1 From 5489da1a2bf1c5f9a9075d29ca1fce97d57423fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 16:06:03 -0700 Subject: python37Packages.cerberus: 1.2 -> 1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-cerberus/versions --- pkgs/development/python-modules/cerberus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 4c34217502181..adf363e051311 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cerberus"; - version = "1.2"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a"; + sha256 = "0afhm8x812shj1fbj9jri6wcrlv0avcfis7619sl140mlhpgpzkz"; }; checkInputs = [ pytestrunner pytest ]; -- cgit 1.4.1 From 9260a4fa28f2931e182809d3ddad7678bdc67542 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 16:48:29 -0700 Subject: python37Packages.django-cors-headers: 2.5.2 -> 2.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-django-cors-headers/versions --- pkgs/development/python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index dba790612ed36..bc635461f528b 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "2.5.2"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "fb44f6b9f10de847919305c3f0d38fcfbadfe0dd5cf1c866f37df66ad0dda1bb"; + sha256 = "0ljyfbpg34n7b8k31xc4q9c922p836km9wxh0algdxxfkam7z667"; }; propagatedBuildInputs = [ django ]; -- cgit 1.4.1 From 38af84ad528ca442dc582cef5585690e3d5b22f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 16:54:11 -0700 Subject: python37Packages.djangorestframework: 3.9.2 -> 3.9.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-djangorestframework/versions --- pkgs/development/python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 750d74d1e291c..49e5c5f0b6a02 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.2"; + version = "3.9.3"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp"; + sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118"; }; # Test settings are missing -- cgit 1.4.1 From 11aca36b9eb40fb51f9ae0e7550c22919275cc1b Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 5 May 2019 21:45:44 -0400 Subject: vscode-extensions.WakaTime.vscode-wakatime: 2.0.7 -> 2.0.9 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 6bff59e4f0394..f4c8ca8647d93 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.0.7"; - sha256 = "049m57s8hcaa3q812331vgpaibkidf3x221hyxpglfk3sarxvqwv"; + version = "2.0.9"; + sha256 = "0fbliim80ydq90c606jhl79fdcmmpb9fs402mvy3g9zmjixspnpb"; }; postPatch = '' -- cgit 1.4.1 From e47dd1bb34eddedec03af4a673cd2a043544161f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 May 2019 20:47:29 -0500 Subject: cedille: fix hash --- .../applications/science/logic/cedille/default.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index e27173651913e..4cef49788c044 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, texinfo , alex , happy , Agda @@ -19,11 +17,11 @@ stdenv.mkDerivation rec { owner = "cedille"; repo = "cedille"; rev = "v${version}"; - sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r"; + sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb"; fetchSubmodules = true; }; - nativeBuildInputs = [ texinfo alex happy ]; + nativeBuildInputs = [ alex happy ]; buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ]; LANG = "en_US.UTF-8"; @@ -31,26 +29,10 @@ stdenv.mkDerivation rec { lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - patches = [ - # texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86 - (fetchpatch { - url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch"; - sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x"; - }) - ]; - postPatch = '' patchShebangs create-libraries.sh - patchShebangs docs/src/compile-docs.sh - ''; - - # We regenerate the info file in order to fix the direntry - preBuild = '' - rm -f docs/info/cedille-info-main.info ''; - buildFlags = [ "all" "cedille-docs" ]; - installPhase = '' install -Dm755 -t $out/bin/ cedille install -Dm755 -t $out/bin/ core/cedille-core -- cgit 1.4.1 From 89a650a593dc00dc34570e34190dbba36f70d889 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 May 2019 20:47:13 -0700 Subject: python37Packages.awkward: 0.8.15 -> 0.9.0 (#61014) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-awkward/versions --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index ea41b8b299093..057f20fce5263 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.15"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0d1ae42babfe7fdde324eea685c71ecc638132b2015ffa22687d52d36dc1c78b"; + sha256 = "140fdncibnlpdqr6hk8lhgkv7m2v8786rips5qp92r05agfzbhs0"; }; nativeBuildInputs = [ pytestrunner ]; -- cgit 1.4.1 From e034a519a455ad00c50b084b8b616ae0508df300 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Mon, 6 May 2019 12:51:09 +0900 Subject: SDL2: add fcitx support (#60991) --- pkgs/development/libraries/SDL2/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 8f1b7d93d002a..2909b16d65d84 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -9,6 +9,7 @@ , dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus +, fcitxSupport ? false, fcitx , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus + ++ optional fcitxSupport fcitx ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL # Needed for NSDefaultRunLoopMode symbols. -- cgit 1.4.1 From 76ac8a30edd210ccc5684252ed66e7f0382b021b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 5 May 2019 02:58:49 -0500 Subject: dhcpcd: 7.2.1 -> 7.2.2 https://roy.marples.name/archives/dhcpcd-discuss/0002428.html --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index b0102a557c227..65d4d368b1063 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.1"; + name = "dhcpcd-7.2.2"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "1s2gli943v9vblp553h76xd8y0hmfps3fj0k75kibhk3ymrjcw97"; + sha256 = "17m0ig9n4p6m98j8wp4dwnl2cfg2rg3v6vqpsahls9x9rccgzdrx"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 4b1e12c5b7d9eefda56ab507d9741051c790a362 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Mon, 6 May 2019 05:13:44 +0200 Subject: pythonPackages.imread: 0.6 -> 0.7.0 Mostly trivial update of version and hashes, but also explicitly use the right dependencies --- pkgs/development/python-modules/imread/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index d65010732ca59..0711283a1b837 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,22 +1,28 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , nose -, pkgs +, pkgconfig +, libjpeg +, libpng +, libtiff +, libwebp , numpy }: buildPythonPackage rec { pname = "python-imread"; - version = "0.6"; + version = "0.7.0"; - src = pkgs.fetchurl { - url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz"; - sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f"; + src = fetchPypi { + inherit version; + pname = "imread"; + sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y"; }; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; meta = with stdenv.lib; { -- cgit 1.4.1 From fa6af70ead15ef2f7501d28736f1af429ec05a89 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 5 May 2019 15:42:22 +0900 Subject: memtest86: 4.3.6 -> 8.0 This updates memtest86 to (almost) the latest version. memtest86-4.3.6 is the older version. It was open source, but marked broken. memtest86-8.0 is the newer version. It is no longer open source, but it is possible to build and use. There appear to be no restrictions on its use or redistribution. --- pkgs/tools/misc/memtest86/default.nix | 55 +++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 18 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 2e364e33fc68f..4e63f582e3c1d 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,32 +1,51 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }: + +stdenv.mkDerivation rec { + name = "memtest86"; + version = "8.0"; -stdenv.mkDerivation { - name = "memtest86-4.3.6"; - src = fetchurl { - url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; - sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; + # TODO: The latest version of memtest86 is actually 8.1, but apparently the + # company has stopped distributing versioned binaries of memtest86: + # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505 + # However, it does look like redistribution is okay, so if we had + # somewhere to host binaries that we make sure to version, then we could + # probably keep up with the latest versions released by the company. + url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; + sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw"; }; - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi + nativeBuildInputs = [ libguestfs-with-appliance unzip ]; + + unpackPhase = '' + unzip -q $src -d . ''; - NIX_CFLAGS_COMPILE = "-I."; - installPhase = '' mkdir -p $out - cp memtest.bin $out/ + + # memtest86 is distributed as a bootable USB image. It contains the actual + # memtest86 EFI app. + # + # The following command uses libguestfs to extract the actual EFI app from the + # usb image so that it can be installed directly on the hard drive. This creates + # the ./BOOT/ directory with the memtest86 EFI app. + guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT . + + cp -r BOOT/* $out/ ''; - meta = { + meta = with lib; { homepage = http://memtest86.com/; + downloadPage = https://www.memtest86.com/download.htm; description = "A tool to detect memory errors, to be run from a bootloader"; - broken = true; + # The Memtest86 License for the Free Edition states, + # "MemTest86 Free Edition is free to download with no restrictions on usage". + # However the source code for Memtest86 does not appear to be available. + # + # https://www.memtest86.com/license.htm + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 2845c175ddab6a3361c193040d63eedcfe5bc100 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 5 May 2019 19:38:39 +0900 Subject: Update pkgs/tools/misc/memtest86/default.nix Co-Authored-By: cdepillabout --- pkgs/tools/misc/memtest86/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 4e63f582e3c1d..49087194278a8 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://memtest86.com/; - downloadPage = https://www.memtest86.com/download.htm; + downloadPage = "https://www.memtest86.com/download.htm"; description = "A tool to detect memory errors, to be run from a bootloader"; # The Memtest86 License for the Free Edition states, # "MemTest86 Free Edition is free to download with no restrictions on usage". -- cgit 1.4.1 From 621cb999bd1c9af140cfeb263a14de21916d1e09 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 5 May 2019 23:26:32 +0900 Subject: Rename to memtest86-efi. --- pkgs/tools/misc/memtest86-efi/default.nix | 55 +++++++++++++++++++++++++++++++ pkgs/tools/misc/memtest86/default.nix | 55 ++++++++++--------------------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 75 insertions(+), 37 deletions(-) create mode 100644 pkgs/tools/misc/memtest86-efi/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix new file mode 100644 index 0000000000000..e6ebff69d95df --- /dev/null +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }: + +stdenv.mkDerivation rec { + pname = "memtest86-efi"; + version = "8.0"; + + src = fetchurl { + # TODO: The latest version of memtest86 is actually 8.1, but apparently the + # company has stopped distributing versioned binaries of memtest86: + # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505 + # However, it does look like redistribution is okay, so if we had + # somewhere to host binaries that we make sure to version, then we could + # probably keep up with the latest versions released by the company. + url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; + sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw"; + }; + + nativeBuildInputs = [ libguestfs-with-appliance unzip ]; + + unpackPhase = '' + unzip -q $src -d . + ''; + + installPhase = '' + mkdir -p $out + + # memtest86 is distributed as a bootable USB image. It contains the actual + # memtest86 EFI app. + # + # The following command uses libguestfs to extract the actual EFI app from the + # usb image so that it can be installed directly on the hard drive. This creates + # the ./BOOT/ directory with the memtest86 EFI app. + guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT . + + cp -r BOOT/* $out/ + ''; + + meta = with lib; { + homepage = http://memtest86.com/; + downloadPage = "https://www.memtest86.com/download.htm"; + description = "A tool to detect memory errors, to be run from a bootloader"; + longDescription = '' + An UEFI app that is able to detect errors in RAM. It can be run from a + bootloader. Released under a proprietary freeware license. + ''; + # The Memtest86 License for the Free Edition states, + # "MemTest86 Free Edition is free to download with no restrictions on usage". + # However the source code for Memtest86 does not appear to be available. + # + # https://www.memtest86.com/license.htm + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 49087194278a8..2e364e33fc68f 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,51 +1,32 @@ -{ lib, stdenv, fetchurl, unzip, utillinux, libguestfs-with-appliance }: - -stdenv.mkDerivation rec { - name = "memtest86"; - version = "8.0"; +{ stdenv, fetchurl }: +stdenv.mkDerivation { + name = "memtest86-4.3.6"; + src = fetchurl { - # TODO: The latest version of memtest86 is actually 8.1, but apparently the - # company has stopped distributing versioned binaries of memtest86: - # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505 - # However, it does look like redistribution is okay, so if we had - # somewhere to host binaries that we make sure to version, then we could - # probably keep up with the latest versions released by the company. - url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw"; + url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; + sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; }; - nativeBuildInputs = [ libguestfs-with-appliance unzip ]; - - unpackPhase = '' - unzip -q $src -d . + preBuild = '' + # Really dirty hack to get Memtest to build without needing a Glibc + # with 32-bit libraries and headers. + if test "$system" = x86_64-linux; then + mkdir gnu + touch gnu/stubs-32.h + fi ''; + NIX_CFLAGS_COMPILE = "-I."; + installPhase = '' mkdir -p $out - - # memtest86 is distributed as a bootable USB image. It contains the actual - # memtest86 EFI app. - # - # The following command uses libguestfs to extract the actual EFI app from the - # usb image so that it can be installed directly on the hard drive. This creates - # the ./BOOT/ directory with the memtest86 EFI app. - guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT . - - cp -r BOOT/* $out/ + cp memtest.bin $out/ ''; - meta = with lib; { + meta = { homepage = http://memtest86.com/; - downloadPage = "https://www.memtest86.com/download.htm"; description = "A tool to detect memory errors, to be run from a bootloader"; - # The Memtest86 License for the Free Edition states, - # "MemTest86 Free Edition is free to download with no restrictions on usage". - # However the source code for Memtest86 does not appear to be available. - # - # https://www.memtest86.com/license.htm - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ cdepillabout ]; - platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4ad2e424a9e6..676858dc5110c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4378,6 +4378,8 @@ in memtest86 = callPackage ../tools/misc/memtest86 { }; + memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; + memtest86plus = callPackage ../tools/misc/memtest86+ { }; meo = callPackage ../tools/security/meo { -- cgit 1.4.1 From 4a27b3cd35d79311025edf0c4b00b71e557c4745 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 5 May 2019 23:29:29 +0900 Subject: Small grammar fix. --- pkgs/tools/misc/memtest86-efi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index e6ebff69d95df..c839c1f5e6c45 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { downloadPage = "https://www.memtest86.com/download.htm"; description = "A tool to detect memory errors, to be run from a bootloader"; longDescription = '' - An UEFI app that is able to detect errors in RAM. It can be run from a + A UEFI app that is able to detect errors in RAM. It can be run from a bootloader. Released under a proprietary freeware license. ''; # The Memtest86 License for the Free Edition states, -- cgit 1.4.1 From ad042f186f4242f9689805884914fd2ec9f52955 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 6 May 2019 13:31:28 +0900 Subject: firefox-bin: 66.0.3 -> 66.0.4 --- .../browsers/firefox-bin/release_sources.nix | 794 ++++++++++----------- 1 file changed, 397 insertions(+), 397 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e09cf7bb8bf86..41b2ea1dbb83a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0.3"; + version = "66.0.4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ach/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ach/firefox-66.0.4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "4aa9ae4e34aef99424ca5cd01dc3214d0091a0c419d54647a213e78182f0cb1529e2021b3cdb25b35565a52f04f2e9ec4122635dc49aee0e403cf5c0b480c507"; + sha512 = "789ecf57dbca48a149a19d60e1a25ae5c1aff21d7ee4dd8e1cd40674f0ec29f891b7e90981e48dc69dc930212b7345ee0ec09f47e09cc8492112d2454fe4f5ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/af/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/af/firefox-66.0.4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5fe5707286b531e23f31f7f80e8f25b08c0e51072494c88d426f4b088063a07a25d36e13182f08ce0a8f88f8abdade59e6f97b7186c89e0de3de463b5070d698"; + sha512 = "2bc27408660e583abc67b78b05e88c2d8c75a71979bb286609b68d978ccacb2e5edc35494ede290389587b80e6ba3a27cc6bb8f1853fc58e8f138b873b36e2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/an/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/an/firefox-66.0.4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f58e0f1b026cb3225e8316249458777acf3528ca2da0843b7449abbb64e046f1e8b779a93c131fce99339c781e5d83dbdda321e0b8558e554f92518625292b18"; + sha512 = "4d3b215c6517633e130a02fa468f92f93e366b645865699729cb4eb4d93fa638ad3a7dc9b15d927cf871412e9e4aef352e882d3804477c6b0d378b47445f325a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ar/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ar/firefox-66.0.4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "bc72e88090fdedd5ca5ffe1b43df899f83e9eeacd3b9cea8f12cf53e6e3197644553fa3398c11c210178bf91efa3b52c17b9e24226c3dfae2a2096bac17e40ef"; + sha512 = "931322aefdc370f4618d4a595d750840e2d9b573e870531bee97832a878e0ce4787947c09d06ab7d27319ae5e2e56a5a2e1f35a41ab91fe160f843eaa749e22d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/as/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/as/firefox-66.0.4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b408a63cdd34aba329b82980d3980ea449d1ceb4f05fe99cb8f502cee6e0d6e5eb974ab848929bc53323f4b725331df42c2c34426df67bb3bc1725de6cbdc975"; + sha512 = "8b7ca252fb388aa6e29385e78e90f66b377ba1e0bff05f185e7b42aef38eda2bd833a24921cb3d497d68aac3e1b36604d9b9019af3e0a5c8dd6e074c134455f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ast/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ast/firefox-66.0.4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3320205930f8b12bdbc618d6588a044b5670e1bc4370c5bff58fd26540561b6d9365bc79fa7084664019ed5d3e0371f135b1ed0906ae7ff3e61b10383bba1e31"; + sha512 = "42f9447742379e80ec51c9604f002689598b66c6eb6948bd45c276aec6a61390a024aa11256263a4de358d9c219d80d0a784427bf446d63740529cd440d21263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/az/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/az/firefox-66.0.4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6c733a65af52a081dc895bb3603fa1dbd96757da79822bc10378bbab0fda0ce8561b5be58db3282761afad786398186264b7e678efd1c7e7e5d48740cf34cc79"; + sha512 = "1a27ceb32a711ae960c9637a3557a962142ec959590602a09459af46777477d0320283f6aa1c54015a73dacd3928297b5a1864a0237aa5bc6c48a50ccc7c1636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/be/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/be/firefox-66.0.4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "83558f99541aaa238508d7a751594b3ef319a0b7c0e2552856ba31e7bde54646fe70cf31d01433a3f5c605b43c6568d34862f70a49571ad14f68df51f36e3483"; + sha512 = "f7b8ed7aa47d67d5d71e0887f66e89697add0af6a1de04bdc80d07c6c0c6f0adfcfdf2e1e6bc6194bd624ee8e442f0f0901b550b4621d40340e1e6c37b12f777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bg/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bg/firefox-66.0.4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "711c9f038a3838bb1e0a2d7ff1182ff16825e3b4bd8de03da41391774ba3fd5bd88882877961d625f796b2ab2c032cd928da7e06b25c3bbd1e4930805d78573f"; + sha512 = "70066e04e0f1d5a55c09d19668c05123ebcfde74cbba0b1d685c23d48832ba8865576af4cdcaccfa587dd90c7e4cc8477d7397102482933f7fd98bad13260dca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bn-BD/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bn-BD/firefox-66.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "bca2117b3c5155a792d8b5c314bb825b8fca897a6419337ef0dbd64ea32c9c054fe11ecc7510aadbcc9e2242e807857d0c31728a47516c02a6a20009eda917f0"; + sha512 = "2f31746734cab6b027c7f1503629bdfeb25c6ed8f1d597fbef7bccb0ba67ff02705e3bae74b4c9598bea7063b9e2819fadd582145e6eb81381820935ecacef5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bn-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bn-IN/firefox-66.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "139411d16b006279272fea37e8803c93096c7846d2c5be077cf4e0b0e00cbc820496720250c438f7f78b59f47774d77b6c16bf2d713ee2c4703e2ac5a7668ffe"; + sha512 = "e80862cc2f26b76f7d77404ac693acd9086ff1169cebfbe28775c4199f79907503e034142e522f81fad67c2ae273513c969f4c4fe073ef87e8c619b5a55da950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/br/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/br/firefox-66.0.4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "462dbb9305813ef8c528f1b5665b7e27d790c00af40a83e7fc46da9c04dcea17125601cc8763dc3cdadfc4eb523723bb1c5b5b2ee8c3bed4be7d4644a20bdd6d"; + sha512 = "e7602765bbd77f1e525579f4e20bb151d9201d072b323f9d3625aefe53808159faa4bf22b9ed9f57d85df75aff2a0246b6482d5880d5d9b5ba114e5f815fb3ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bs/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/bs/firefox-66.0.4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0a40bba9e04a7970f0c4c1b22032bc530facf90f32d3d8af6117d89b4e7118027d463d58441c4ba4913097959bafc8fb687d07945d74a26a6582b54fcc14f6a6"; + sha512 = "ec5852bcbefaafd13879256e6c6d58ade9a825204f5bbbf01297e0c19de48ee72b47fe1dd26c9f00d4df8605563e8cdb9cfa314c1134bd17d5d4cb80f55b997b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ca/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ca/firefox-66.0.4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "363fb5222734f98bad579fce6042832089737fa76d14072d887582989b0a944b70804b1c5e8cbccde01124d6e4b3cce3d2ce28c9d9d14825a76f3f116887e3e0"; + sha512 = "7f119a513b64a61ba8f23adda7c8f3681fcdd66ce945bf9060ee4b0cfd2ec8550d55e820b177f896f2f5d43b538ffff10ebd1b2bd5840fc6ab026a7b2e93e3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cak/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cak/firefox-66.0.4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "60491e41bf9887b09d72eabd184ee847f6a8c87a13f472a84d7d50aac4a44d3119a5dcbb3635e2ace369fe0e9331de47584bdc09b559a2445e911c094e71bef6"; + sha512 = "52d73516f4e268410fa0bc0ddbde9cd8c1c70721aed1d28a750e98b2bb8ccfa425082ced20691c4f3074cefe2c7427e9b7ca931bdbf9100249b2aa385a5659b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cs/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cs/firefox-66.0.4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "66a39a0d2461b9157925c9eadf3d496ebbb43555e4b91d9f8d232ced6b78a71f623e8a02941ecf2a2c0a128d9cbe106c01c84a94358dcb1f8a5399fe17e77c5d"; + sha512 = "583e6f3682e9126310b11e8ae515dc2a550291b9f6069ac8fbf568d8f0696e896d9b3a410d2ef13a1475e793214674d21e2c357b4acd5908ac6043c259b043d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cy/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/cy/firefox-66.0.4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ae680998cd82fd70de4ee55ecfca4b289d48d943ca193f1ff2a6d156c6142218542228bff5b429f68bfaadfbb0c43273c68eafce333fb1ab68f2cd6c092df235"; + sha512 = "9deea20b92d1e8e48bbd0288959ffe8f9795221b4d57d1f2e92b0f6de65caa180684b5ea2354cc442bdd5941722be160b95a455ed7464a683906310459000d0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/da/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/da/firefox-66.0.4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "72715546481c63dcbb194a305c8ee1cda05d52d7da1c69ce3a755145e0127bb2118ff5cbcb04ccdfc7c8c7bf22e42feddab81e936b92f367a6198b09e7d803a7"; + sha512 = "95b0e4aed159fe34cf925174f3ec20a14b296c27541f1aa2b369243261d305751415805321d02259512a18cc422bf0272f3b92d8918f03ccb65a9ff084315061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/de/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/de/firefox-66.0.4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fe1abb6ec0a550a3c1bbc6fea96c26a4d848771dbe45ae75240017d1fd4397e2c80742f95a03223356b5374969eed83a3a92bc86e433cc1b85443e4e41136e0e"; + sha512 = "dd21fa81e0e85188bcc61519bb4549bbfcb433f88677b79b91da5c3796df985e60b1dc1fec391a70813d61f1a902dd0eb69815c5d81d96a0937373b491d70cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/dsb/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/dsb/firefox-66.0.4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "442fa757fc7f72a9b0b6b2a19dc72a87ec2cd24834378d2aa41788c1bd015f0eaf51acfe7769a4c5cd27d157c777d3b6e183dc134516ca0ebb0870fa667feade"; + sha512 = "c7fcbf4e008f6c2ad9bfb5c37a57f257011a2eef811e5bfc28cdc05812283db5a69aa0167651dfe9df5dfec2aac74ba128d9bfc396ddda1475630b89e46cc6cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/el/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/el/firefox-66.0.4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "84995e7632805e78e2b9b710c8b42881dc071c51f6336c54e30b49640d3bb5284534167392665ed15b88b092cf55db174156ae5f8120324faa842f802790ee77"; + sha512 = "889e9e88105d12523b0394d4ea8ff2dae753f560c624b2feff3a8c48640052e3dd871446b9b0b9832998d909f2c9cb5dbc0e03f3b099b940bf50779a9db44eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-CA/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-CA/firefox-66.0.4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0b687a2271363be6c1458501ba8af8a9ea3f6279f07b89a70b9ed5dcfb0a406215621aa0d001309b823c267932877a2e9634aa14339340f7a259820f5a55c60b"; + sha512 = "30e54bab160ec76f15c7d44b8ba8840204e297fc3cddd74cf35cb86c9a0677a54548feb3a4b6ab899b10abba142635faaa68888a6cc53ba0f6f9ee401338cb3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-GB/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-GB/firefox-66.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5a772190ee12a2d0d400f5aa91780ddfec29e4c2f867288e374880e4602efa747555b97ab40eedea5c812ee6f4fc2986bbd98c5f7c9054bd027490df4e9850bb"; + sha512 = "2c9548a80d26ab338e662c4a2ccd02185afd6bb07812fb4d2118f0acac01dd32f759efcf6921942f6b7db144f293193554ed5678a9762220c9a7e997d9eaca1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-US/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-US/firefox-66.0.4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "bc585bcce2f44354db372c9f96ce5eadb5128c051f4afc95df5a38a68c4c6a8be1f20f7727fd030855d5dd0f36b00e28ce3af0b0b7bd20fb2e380034cd21d381"; + sha512 = "938d9efd9a344ed755f26a2864d813f848f07907ecd795d74edb352ff44fc7cbf85d6d4bfd496a85a3bb6fb2ea1b14847705c627b40f1af53b49301708c3c1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-ZA/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/en-ZA/firefox-66.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ed01d89a7fcfdcccd50712ad631fd9ef65630b23e3e6ab68b04aee28fa092cebd0a008f9f1e90a2a3152b03263db78ff6c6c3b67ed9f81c7ba6ff62656bdfee7"; + sha512 = "2dac84bbed983f8638a9a9e92c217bec73b026eca7d66f585934ce4a89f21bd55b69804df00a61c9613de0c9e5fd331dacc01f3b08f36cf4489b86c85b05d688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/eo/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/eo/firefox-66.0.4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8d38c8d9bce68051eecf89220e5b2c128dd2b5ce48107750139d1fa0bb836f3f583ff6dd8e776321dc0f6c72a8bceb262dd37562545f58a290cc42631f37c988"; + sha512 = "82b4fc79e2fd0aa29e88570ed3b44967ea888a7df70c74fadacd929d7b64e86aac2abb7b92362fc607c858de5c8619c63267e7ceff951617517569df06accfe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-AR/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-AR/firefox-66.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d8824e9a261b662dbde83b4db3fbd1254a6de0721df7da7b77bba6eeff2306eb61198f35fce1fc1e4a8c8939d42f332ad8169cc6a27ee757af483e887599482c"; + sha512 = "78fba3adce26eaaafb72a08a953ee8801c401b650a39c9ae4cac872a86456813976db0c7e98b4255b4b02525c1fca3f3ecb5df8f8d678cb60e29edf5e9d2e103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-CL/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-CL/firefox-66.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0b912fde247c288d718d7f75c1986c4196c787dbe3377101627338aaf45aa12eafff2fe7321a2bfef47bf3b7a16a8a3c6119ce330cbb577816df85885dfa952a"; + sha512 = "3f59b8a28afc1255cece3534e639d4a9bbd48f4bdcdaf836b5c5a459d55599c3cdf84c8af45b30b9496f95afad11afa51364b2b0acf9cd08c561dc2f132347e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-ES/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-ES/firefox-66.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f7d7e0542f80bfdfb75592a938f1ce27b454d994f281a91a3baa922d5db55b9a40ea09c9dd03d9d3a61c62667fdac6e537a567865627277e7db2c855aec89f35"; + sha512 = "7a01d61bfabf1bdbe9e485ce2cde726ccd3e937e8b951ae2b3cbbd1d7976cc010ac82202fda51f07cef5f0895ce5b53db506bf5d949967f2232c999b52b2d713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-MX/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/es-MX/firefox-66.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6f823f7bbb72440429d9c2e16f8e8ccc7a9df5dad199306cf8e5be96a994294b06a67c87bf232a3ede28bfd75bab42b6efa61f3535d6399fadc30c45a4e55af3"; + sha512 = "6e1849aa7c85b099a61c616bea86f3b809c7ea464b85291415f590d7ea4953005db7ae2fa15417cad9ca0a6d66b17fc3447bca31d3579ce6573609580cde3cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/et/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/et/firefox-66.0.4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f03bd296e2cae8e28c44732cd05b34866fe6e6eea1b6072e1297f9a3e5ea62be8d6c9fb1da1cd0019f9e760a2a4fbcdcdf3c2b998e0d4a304d9372b5f2c6aea6"; + sha512 = "2c119e3902073a150d3df9e1d458b155529a2c747f2c96508dd90a0efa73df0fccf7c36ca7e8438dbbc9e463567195d20ba9e4bc1b9a908b13aa4e6a43ef58ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/eu/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/eu/firefox-66.0.4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1563e8e3de7c2c47fb2a3095bf9560c2a5fc79eada4ef89e1a53fcdc5b27f6902607aaca09bcf20d78e784fe2730722466f23ddbacc95687eca047cc25fcd9e7"; + sha512 = "cc82250530f1a869ce578f05d76e835588e01b359a19748d1d418b9a0b16770878518fb492fe79108b1ade4c8b9ed780b61a6e414b89a1b259aed5eb73510b40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fa/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fa/firefox-66.0.4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9eb2c3634d3c188b20cd30c61ea7517b710bc8abc703bfa33285a59c3922104b136f30978660de884089a923b5364226198d170a0c94d8262daa744cccc0576f"; + sha512 = "bf990360a952060ee71f8f761ea893401775f317d3e1409444d26eeb3f7ed8f641b70226db1549ecac4550cabe8c19308fda99f494560c660afef4a886d27d3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ff/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ff/firefox-66.0.4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "05723ea64a84eaf5be466b1087a1a47b1fa86f4f0643bfeebfabf42c59fdf9ffa1613fe754f0c84c027b884e209ad90bc917806bca4da0d6bc8c3c7970de4144"; + sha512 = "22213c96652c3f1dedf400281dfcec1aeda20661e8f9e24cc32d62585b70e3d09a2dd2537f09918a6a9550799162ae196a62158a2e1613f9ec23ea9191f3cd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fi/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fi/firefox-66.0.4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "afd9ba38430f04d15508c45e5ba69d9e1ede7e967f57581457723873408ac4205b5caa2bb5b799144962c2735012fe60c778196a607989c629ffa77e3c8fdb76"; + sha512 = "3b82fd86b0116eb36da8fc2ccebffce4bdb00ce549bd69264a7a837374241bf02f24b2196a4d2e80dd9b82a24674f74ec8035d3f6f252878d28ab9dda028545a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fr/firefox-66.0.4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "11c83c09bbc02032f99cebe5c6df42f58eac90d16593218ea36f7f0a6c5afa7c2286372b5c187fbc66665f00b23a1b9fc10d773237be9324aceedffe8a9c242d"; + sha512 = "db70c00d7c60083ca8880cf324f1f510d5ae66399b76790d6689e668aa6e7380ea263f0f5ab18a0ebdbcdb8ec66e1921b4a56540971cf2c641cc026293aeb885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fy-NL/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/fy-NL/firefox-66.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "fd1cc534781849e1af4159244affbb67b6a153a8de13a1bdd5c91ad0f2d4622e042ba67cc457bc293cd480dff120f084b89eec0bdb443c5dc86af1c05c720969"; + sha512 = "14dea2ad6c8da49716adef7d20efe88933dc69ec7566c07c948c296d145b4b24268c0e08f0123605451699efbd758a3af2229c23d301c8b122cd99596624ff63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ga-IE/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ga-IE/firefox-66.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "36abf4c99f93595e2e39ae5a5bab73407605ac6f8ba22b623558586b866766215bfef257a416183c8cf7ff13a58bb790ed72552707f994acf930e5a00d9ce324"; + sha512 = "70110fa27b8cda7b0ffaf52f2931000d886be4763741ca71eb7ccd6b58ee1a0e1e82735599ed19519b4719dee0ef9d0bdcfb599ebbceb7663013f2d5e26bc848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gd/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gd/firefox-66.0.4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "48c68cdc63c78f37166dcbb144c7363fd27ba98c71c047a245c69a7e76750650f02964119c33d6aefef8114397fd2f2dc7860bb47247a19ffc0a6d850c64e8dd"; + sha512 = "063f8ef3adfa83637fe15f89ad7b7baf0d9ebc7a54fd743f4b88637f4a29db925d459612c480205744136e6f99f84ff2aa755a58ac89877cce0ac0f93bca5d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gl/firefox-66.0.4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "76a82f38f87fcb5c43cf3e7eedf807862f52febf6d354925fc37bbd9f109e6b8f655823c4c0badec050c8ed46c2c7ee5fb1985934473ee9eafafbaed86c22766"; + sha512 = "79161f599ba4a916d8bd61b761067dbc3ae05ac4eb0345c941c87aabb826c5a41ce2f3d60dc91062d4e579826120c585e28e2b4364209852966267abdd3ec767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gn/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gn/firefox-66.0.4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "556b6f2b5e959571fdefb047c0d62ec85ca6160e9752bb579a0fc5c94174d70ca0febbd91429aa10c85c40d3643230531dd7c2594e49723a7eec58cc74e2d464"; + sha512 = "5a9bde18ffc4f15875dccbff737122d199125e32f3805e904bde0e3b1eced173ababe00b3170f97b140e08861d27a63cc2aa9345231ab12e34785e17e390d3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gu-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/gu-IN/firefox-66.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "276f9fd0601f83ae9c5743df43c91cd1fd9cb6ac8d4d67c06b31f002a0c3875bbde567fa2b0522ee863c1f47f4effa15c62461ca11a30f71cf2a709b54ea1288"; + sha512 = "4ab7a824d4da3c1cc5b5eadeb35132a0322c61f86d5c475e0632a0964ea529d3255313501186138848718f33b2ee62bce30952ca5418e7fce784c1e218f80452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/he/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/he/firefox-66.0.4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "72cdbb5359408a36f9b31ad7f03761c76f5a13a54b201a9df8cea712964b5b86b6b09e9ccc38bf2873361c7fabc7c96dae0fdb03e3ccf85b7e8025ed63978f57"; + sha512 = "b552d54f6ae9ba1f565f7ffe86b68eb916a6f53566e8cb05b1a1a7e39ccc8cf38b941c11b25e07fdab9baee8c31f55f1611153609e873b15c36e00ef32ca9871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hi-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hi-IN/firefox-66.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9af2079adabae3d7cf3517cf43969eac917ae50d36b1f7cad64b0ccaac2db06f1636dc96a071af08359f0fb0e51acfd9567e070508b9c3bdd02dfdbb8206f0c2"; + sha512 = "aa39f47e5b56544ba826173048b60fb79723c0af2c93155ee7ec632741795c40cb38b445ca896543b0af2ad0307b2f5c4786b42be1cff992c240298e8786b9d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hr/firefox-66.0.4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "273a5732f53df6c69672e3eadd272d35a2421ef6391e360829c42196db33969de86e90dc95c9fbac65ad8647657bca69500a4876845d064a8f8dfad1c2301242"; + sha512 = "9e4256069c4c094a04df85c899b00d27e5cff171c827c4946973c1f9f58d9fe158dae2f021dcc8e85aeca2ec9baf7ed11d5c8091b7c4705ce3dbeccb089b02c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hsb/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hsb/firefox-66.0.4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "13605134e7a95f04e8faa64c41babfa7f1b84fe1bb0410c17518e847a81b47ed16794f17b4e833175be79756b48868aacfe46bfdd5365c24ad47075c9f99e5bc"; + sha512 = "65285b9abdb550dade0705ae530af879cabf9eb0953bf91c5e7485035eff20b4d97134f2ea280c8e7087aba3a6f9fa0f4b30443eb418aad400fe2ac110c56745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hu/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hu/firefox-66.0.4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "17637c96d5bb0e33c6bc3f8e58435a82a53b648b5d665dfd7a62b913ac3d04030379687e1c65b4a9ece119e92590ba0e141f1903236b623e2b398c2e00417d95"; + sha512 = "ecfec8847285c14238605f12e29ae9e7fa0540162e08678bd35f20ec135c631df06e1c5cdd31349ab338491443a473b88e5f10bf5528299d4c655a787c94c5fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hy-AM/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/hy-AM/firefox-66.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "02067f5fa5d206c1c8d8392dcff21738f615f8bc77b44e038261cb3f6eacec7be102da3a0d52cefc280b0b71340be5b4ddd9b62524859da99b7554b3d52349c8"; + sha512 = "e1b4e51a9bdd5b7a41fcad703ec674bc6b602edd94849be310889286bbc22948fcd6370da99c0481f2f4781077856e9766997431f3fe77f0b3d80194e36d76d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ia/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ia/firefox-66.0.4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "1195b5031dfdaa35507de6aef21446ace0e68279da0b128e5acacd98d42a09b97a9d1c34e7505cf76c116effb105090dfb623b79a9992e518481bac3121beab5"; + sha512 = "084e8b0238b1ddc4c441cc8579f28315fdbd0e997eb7a9ea8413a3140a10366fa16b8a0c3e0c03312196af03b12015d498961a4b7673c82c8163b39d702f1ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/id/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/id/firefox-66.0.4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c6649b3d953f3f416d695a1eaf2aaacde12ce90dbed59f16b312118b1f09ebe98b5a905ff7f55b599166c947a57a8d902852520568dbd31d48f4464acdb3be56"; + sha512 = "50e18367cd9cf31d9d3df3e31cc78c696e5578d7840c71af55935fed645b149b61c8843ae2f4bf25e2a9389b4ad8da9cb16b587c5c9fd912872e8baf4ade4f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/is/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/is/firefox-66.0.4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cd2da470396ba1966ee751aa644a7cfeed284dca10ce723805d7f9330bbf2b8b5e4c3c51e2c798b6654743d62d8d57fd3ebceffc3da55c38f8fac3a7d3732341"; + sha512 = "fd4c9ae4081afafc51285bdce826e92329e8d506a71f649a73bbb2786532cb7929b7577e24f9ca92caee9d6bdb88783a842c55c2c446aae57663fcb6d563815a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/it/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/it/firefox-66.0.4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0fe8149fb6be846a6532ca7b1db8694900b431f3e4f8ab27c2d0785438baf6799df107b346ed2c814ce9b7f21671b22fe6246727ce83320199f72a3909ac541c"; + sha512 = "070ebcbe345b96292d06f10d209144629344cf1b48070465f82ef6d974c648c83fd587a5d629b9fcecfac6c6dfe1e3c5cae4ff25d11518b5536f931bc6675da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ja/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ja/firefox-66.0.4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1e7eb7798a2cab863986d95384021f8116dc949aedb3a121f887532d57f512756d6782614b623337f349ca27afcfb80545a450ee3af2a3872cc46cd657115208"; + sha512 = "58842ab79b1aeff66c40fdb5a27cae809ed4082799301f1f718d695b46b389cf1b6416c26a5b05043778fdb6a7260e85a0080ed3dacc50da74350019643455d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ka/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ka/firefox-66.0.4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e3191ecc3a6fa93515deecce972232cd064602c1f2a5f7c807f62ff691459d8f4cba494b33ece05c4662115616099a1232955091e4e647b3f74d6ee4f1b20ebd"; + sha512 = "dffd3ca8e7530c0f563d7b8309956553b448da98bf6e9fa3ecc8492fa49485287432bb72127285edf6d80c52760dfaed8dc65ed6a48ebc5a4857b80c5e9728c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kab/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kab/firefox-66.0.4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "27130d1f1ebddec899eb91abd57c8adac8dce60dac6c66e8ae44419ea5924e3c9d46960746b96855c11f903e2dd59d483e9cadc0bc22a33f37faedea3f200fe8"; + sha512 = "5e87256a8230356a382a4bea207d370e2d4939ae7f1e88ecd1a0afcd004d498e941be648ff12c4fb5912f009e6b192212a44dcc4b563d935699f82842fc16022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kk/firefox-66.0.4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "84b0e49645f9fb63f3455e43836778fe839dae24e9ccdcd950ff20dbb3d6258337fa489d22c6066bca71c0b827284459a52154ad037c1ba7ee5acb9e4c88b926"; + sha512 = "f3a73bfab3e2f69fe366e73860eda64c94da004877a1ded9aa6c6b89d3d48d4dc3daf918036a811cce4a37c2ee2addebbe61f47c6379316a60980316c8c02c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/km/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/km/firefox-66.0.4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "5f1219f19b112a811cba1585eeb99447d5c6f51c657a7f200a5f5620ed5ad849e16ca11e4bf82255f2045a36e9263ca4928a2d930f053cac4a507a748bd00896"; + sha512 = "cc669ef1e7139ca3561557acbace0455c59c2333d375298d969ab22dd0663425791e3296729e98f514754fba9c119b15f8817835c9d053fb0fdd327baec184e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kn/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/kn/firefox-66.0.4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9375074fbc21d3d29fd01123c498b115195987c71583c431fdec621a59ffbfa2f2c64c2fa2ef0a2c5c78776c04f7f25777a3ebc0c1022c91d4072624793455b8"; + sha512 = "b067a1850687a5194c57f1fe1b1ebc875e39d567162454fff8522c2c1c02d6ac7bdd7c23053e66c19552ac7239e95118eca3e93cbf5e74d9e400d61caa80a337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ko/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ko/firefox-66.0.4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "60e9a077cb23ab7192ea835a9cddc3ee1326b6bc7d2e6b53aad81eb3ad0c230df906628eee531f5fd4fc13b48f77b6c5a0c142cf149314c772bc0f081cc1060b"; + sha512 = "43571dce5bcb5cd9c44cb6974cf7224e9d03bb9dd546d9b494e2e4126e6b91c3ff0fe7118fd2ddd2cdb3d1bfb96c4433c935d7af52c387cf03f33363f995a062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lij/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lij/firefox-66.0.4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "22df2f25d025f90571b4f14c92be175108ffbbfa6c34aef1ea8e906c1537e15838b3bc6ef00e4824df4f78840d092fee859ace906efc3526f4a41e60db8c26f1"; + sha512 = "a8163716dd01731d8914d4f711466277e97107c4d62230319a85d251ac68e04a05554c402d3d29ce5a1d00ad69ecd285c0fe4412ce52e905f3a6c6cc9d8cbc98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lt/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lt/firefox-66.0.4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6fd1a4742ba994bd65fd83c3936795d88a92655e6334837fbcc2efc8b4bb4fe75741f8dbe0c0aadf1b69e8a48577d7ef3c0322abd2c3fec3eddb09a098843c9b"; + sha512 = "ebcc5d3f6eb5c458d27fbf8fefefda113cb6dc78eb6e6b243396aaa85bd7891f5d8aaa8978a81e40653cc73bb6fcdb16839a97f769e437f6c4a9d512ad1cfd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lv/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/lv/firefox-66.0.4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4ce0f5a1cfb19f763567278b644fdb8a004bd7b4d65e85b46f2235c67dcb2b04f630f0988fef6d5d55e04ddbb8190fb187b0d81dcbf60ddb20629580007d9788"; + sha512 = "6573e17058ca50a28751a62ccf87ba0542df55b53c4398a09d0752181cc442e57e967d060d3533af394dee4f122ee784d6ee6168ed2dca08855617121bc4a60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mai/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mai/firefox-66.0.4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "c26bbf25d31eb551bd477b99cdfaa9670205b36562e211418ba110eda6f87e06880695620b840e1a767c98dc7c6311e9ee63f1e52c113bceb53f62ac5289c9a5"; + sha512 = "1e92c29312c635f195a6f52c869f4b4593d9284a8e00c768bfc4490a69c09c69e604d514178e26a1f067a7348088e0022f7c4659c4193ac775261f402e72418a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mk/firefox-66.0.4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "33893eb9cd5638c2d24403144301c6daf8a3fa4e76a30ce5027213e2a78ba906b73ab4c08e19a4b8b62cceb360263c1efddeb4ef848784ed19f846cbf5706478"; + sha512 = "493d4ee0450a1a7c54aea2a2541d681a7b18be6f45fe2e9b97d41761e625cfaff4977ddb464dfb6587eb844c23bfcac04015da69d0f19b05b4afcbd42dbfd26c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ml/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ml/firefox-66.0.4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "397688afaacd32ae434e5e2ee338059d3333ba9e9f73c766960e0b424bbb7b634bbe0a7d1a09d51a3f41b83b4b466bc50dbd4e0658d8e8f21c59e3013c273240"; + sha512 = "d00043f5b87edf4dbee22289c031a30d9b9b5d4b95ad63bb07c3196270da5fb2e14cc1ee853edc0f4d1de976f4da8f84a92f70fb319135bb6d2a5af21ea5d4b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/mr/firefox-66.0.4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "885033de3913e8d6eee8e5fcef49166ebacbed5f344e930a809ba48ecb71a253575d52590def405ae0a48d76317d102559038e54b1164f1674c5910c40ca3e84"; + sha512 = "ed41f4a7e8fed7fe60ee35406a5aea0050e8a3d687a0d4d97fbeb0b34e3593adec6d1b43e6e585e8cd94ee07213341c324289da264503a9c340d26e9cbd6b38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ms/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ms/firefox-66.0.4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "61e217ad17b4d27c68ad4f16ba07d8ebc059d6bbd1ce58489d65d8229589ad9fbb2a6dd378a8da338c419928247c12cc123f2fa70e6f97a67aec019fbc6939ab"; + sha512 = "043d73907bee6e333cdd6d1e905cf61d0ff8f78953027dc09f2a845171e5d25c671d529cf2d16aec7b2aa39961482d13ae7c91e3e9cff664aab69f5e8f291a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/my/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/my/firefox-66.0.4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "4f7ba2e7e59640db6c4d32ccf9c620c3c7895b0763da0e0dcf56b0777b6254a6c33a5d7f80ec3848d5d3f587e0387c9657db4f04ccb84dc08ad4341382feebae"; + sha512 = "6e3d55ac4dcef62548f309df30853f8ee317d2bea1a1d774af4908e1abccf3cb31cc5dd2406829097b043412a40b8b81c8a87fe9433518e0d811b43a878f99cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nb-NO/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nb-NO/firefox-66.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6b43b1f00866ffcf059d4406c2186e18ceb7216ded302df42a5cdc2c5ec8fc154c9f8a3a7f37fa6865128ce2d788c9e4c1e3e43fd9ba8fa759ca414879693199"; + sha512 = "681935d216c8607ea0f84cce21c1c88251eef0ed4e057f16faa6e485e9bbedc62ab05f1c31dbafc356c2923ec5b6b3d4fb3d74454647917c11896ed1a44f4e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ne-NP/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ne-NP/firefox-66.0.4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "47a40aaa4992d953788ec4a2481705653acb8424f8fd11004ff24e9bb6ae8015e27d7610620940f36b5d0bf25a3c426ed3ce53b97e16fb891da3674c66f713c7"; + sha512 = "8790899e58535c921b156b89cfaba61dc2d201d84faae066c0c89ab6b39aa6dd961125398ef139571f3ccfdf8c8ea0d1b8287e95bc0f90686569220909572b6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nl/firefox-66.0.4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "adca9015850c34ac1cc81dd441b2374bd83aef70914de377b3b9892e0be5cbccb52adfdc40c99db3906214adc5b33ae1885efa10ddf5f14ff958fff2b84bef4f"; + sha512 = "cdc216a01b1953a313d8d353ca58150c46905dda9019007f04be93459054e57868e7a325792c9a5e5d0d83a3b6a577d60848739bfa908114e4c2189d1fac9978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nn-NO/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/nn-NO/firefox-66.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "bd47c8a559ad3c005ac3463cb1e3f600d67cce0f7f1b6d07722e37c5bb3a47e99699c8ba75c1173b5da626619fd535572fd58f21f01b57e2c5e54c68ae8a4810"; + sha512 = "79fffbf0c1bfff145461427fb7fd3bd3805e197311b7bbf9915bc5f07ddfb8a66d2348637afbb74d25d70acd536b27464069d0536f0a471476620a76b4e188b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/oc/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/oc/firefox-66.0.4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "b43b79ee7331a0b13e9ac839fbba57a12c9375346ec0f56c0e873f4e14c4d4eada3346179ee6a4aef801039e3e8f890df3c5ef293a11893aed4a6e0aa6251b01"; + sha512 = "39ace895dbbaf995fe48e7120ba2f400ec5c412b21cd4b6857fdf3ac86857db5b875459d6e4772269b24824ca7f7de1f13d2085b9ac5d6ded930d1afaef724e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/or/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/or/firefox-66.0.4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "306980db14e5c728257eafb79a095e1829130b2add9e7798d21f8cb1e0af80688466a809b945617588534de6f8fc0e9de8ad5b1eec3e2d2f1a41cbf580cb307f"; + sha512 = "028650991e5d17e2626532e29470151a81258748a1f59da216dced05b2f9923fcf8b2b008e3385e954fc2b787e4b4db28703817726dffe1ee10f286acf03da86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pa-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pa-IN/firefox-66.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d322060a28bae771316d36d0509e792babfc3d569f5fe9dd5c4e9a1a5da7391395475df6eea8a845932452016b2b8b69f5a745e53111c0cfc939022e73eea24c"; + sha512 = "53c0c9c88a89d6613199da6a9912920a77cbbba87e5a324ccd3d52129cdc76c48cf26842c2b173308ed64d2bfda2b2019ce4ebccf0ff4ee2003db240a020beb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pl/firefox-66.0.4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6a2cfe2969ba9a778ac604cc80b7418f233e6f87c649f48e2c584e21de874f3b5f6a2eb99669d40e8d091b9f559c7aac41ad513eada9a62bacab420569d9281b"; + sha512 = "afbfaa5e03fd9559cbaf5d26427fffaafc51abf3ee7e7161cf1d33150a6729d598acae52990a452a628d6df7ecbb37910e1ce121472f169826ea698ad4a4cb58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pt-BR/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pt-BR/firefox-66.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5f1d94976c9f495f861881d61c65b51ce75509ee92b3c1b23ec7eeb7ca3c4280b1630e05f1b451a252713c988682e900663e98e4bd3656bfbce1574d9ecb0d6c"; + sha512 = "46c152920c7f8cc36d845429a9e4c9213a114a965a79c069bd16214c104e29bdcdc014b8629d428a6cfd735327c89659f12dc4e84eb572c0663579a9b19bb858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pt-PT/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/pt-PT/firefox-66.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2ab8a70d502b1d92842dd579f49e055a9f4c8f5548154579508230219b44f3d0c045331948257ba167aaa2e9e02aa702130289d20c492c508b3bf97eea9eb224"; + sha512 = "f8052357068416fb3ee87547cb7714c3d59a719bba6e943158560e212062708e8a4bda202d3519f0b2f7fe0933d77edc7030694fb9a40d3269164c17ad46836e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/rm/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/rm/firefox-66.0.4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "9dec6e52b55f2a5e7fd511b4efa0a237fddb62545441b9af9f3d3cd50fdb577b8f1c8eba0461258b20074f23d37e5a88f1ae4a2b7e7ad598e2c6624ab509aef6"; + sha512 = "942bec7f8a913fe6f259c1c38af0773268776514453e741e455e0af3c9c2ea0fdca0926557b39e6f65dfe73867fa9de0ecd3c97a1876521651d82b7811e01c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ro/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ro/firefox-66.0.4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0e713fd4fc4c936124fb18c62e198790eaffe4b9e8956724f156f6445505cdc4b29bf463b4192d3868a56f7460f2574f3b9010d60cb2ea1b0bbb6a43c2156f5c"; + sha512 = "16fc97cc0b16eb7bed5d0fa14f4584caf0a082b322cb59260eb5a1e7303d94d42e055db5c9b192d15e4ea3b515c3e38e6b6f7a421f2a97abdc7821264669f342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ru/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ru/firefox-66.0.4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dbb1d1e62bbbb20adca252221c0a01dcf1f7f47eef94918076b57fc61062fbb5f936dbb6727c3c8b109b2d40983b716b389f78e091f1da1097f957f1451e00b3"; + sha512 = "85b0f38dc56ceaca5ef633beb5303eea41b59112a9d96d839f681da46e41deb9c77b05fed578c6fa431eeb71b5af3117e2d6697f2636ba7bb373c17e5690f65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/si/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/si/firefox-66.0.4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "87c2e84635fdb44cf221f84f1fae161c3bb39c06c6c31b1b375f9aa1ee58d835d21fe2958dbd8916fd7dbb96bd8a707bba6fe7f15b83bb77b614d40828af0c5e"; + sha512 = "e0aa9a503f830bc26f85df5ba952405df73e1b53bebe24198b0400d683f4194a4ca7fca26d89789c6ff347b954dc5e4c99ac2eb07f328985a61ba636f93b24c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sk/firefox-66.0.4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7cc106554dbb7bf8d0f9dfabdd29d0c0d443b11e084f9db1b1d78e56fb5ae7c251c9d89bdfe02677d2d366c0c75f43b669cf6852abbec8dfc2d28c24f7f2c904"; + sha512 = "231a8c4751839709a65133e7f643a8150468fe9b0760cce308895da47ea1e032f54848cda6ebac27813be3cdce09392e32c6cb1d08471f5e96db0349da592318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sl/firefox-66.0.4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ba298a83e0c429ff6d8195c0b35c3c4c0dbe434f2dc9d19b47e218a6421261ea08b8a767343f120b2ecd2e061bb52fc9184391d994538304cee91727cff327a2"; + sha512 = "961a2a2cd6b70bfc919859ffeb4153ee5539da05b56ced84c00b7cbc23ddbd8825aaabad2885c325d7a96c16e0a710fd403cf9d4fbf706508cc6d6901bfda3e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/son/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/son/firefox-66.0.4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "620e40c8484fee31620a2dd838c484cf971e2d677a21ead71f2043a2f81bd7e1ed2c70c6778922ad337a2fcc87724f919305b78e31ac9880139a68cd924d3bb3"; + sha512 = "6fba26ac3c298a20ef52a8ecb0ddcc4b6e0d96be10820b0038bc56f5a879642885641939d86de64b516033f3623cb6e6570e9b0b92e0afb5aba08d847c1f4f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sq/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sq/firefox-66.0.4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7b4653a69e11df2a3f0b4e40315fcaccdc8f7de179774a4f1709a85534520d53739b76e34e43da5dc7bff36d8a7db1388a0507242c70a351a14cef081261d15f"; + sha512 = "0344b6ca43dfa9ac3a17da898177a65d46c600518ca26eb1c01643fbda1afdadd378fc642c21f9ba19e512c2ee31391c4b0cb71086d290fa9275f99e6cd87bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sr/firefox-66.0.4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5990ee7d8f68705501f81d48b687b5bff33f9be0912f4cf4c0a3ba23acaa22b3168420b5c4dd8d6dd7968f194b7280c9c34f8f24da9d10a80bc3b2a03e00f436"; + sha512 = "bc75532d2fca3038d8415a6ef5447dd4ef9cc5a189aaaacf2f0bff9802ef79dc42b9083c2b9d0e7c4b019f02e01af5ed6b2ac668a61f66f359312d35a0db3ae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sv-SE/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/sv-SE/firefox-66.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ad9a81e3c384ef559d30ee537e3d8a966d5b1c118c3185de2e5062a29b1f2b88b9394e0a480cdba8bf02ad60984badfc0329f576c152837ebef47ddbc4c1ffb0"; + sha512 = "45a183b62ff7d2ae17bd696212cee5babe71e15531fdde486e19505d0104cc5e96360a5c475b42edcbbbd0c754168ea474904bec7bf493befc7bbd4f280a8b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ta/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ta/firefox-66.0.4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ae78e4ddeeb2853ba83dc41c703f63e22d3bd2d58ad53118603f47ead33d656582ca579dee1b4eb4330bd97d605cb14c10e36889e8bb43ebf17d36a165612d3c"; + sha512 = "e65efaa3d08e3912db2dd164c2cbf1ed686246347da3e5b4fa11de5d7db7f0c6edfed6cc822c64730a309641a5766662a0e1f07e6b3203d139c89eb6de6e197d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/te/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/te/firefox-66.0.4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d57fbe1c4f6c8af40c8f55912ef0e1d2f38118737a2fdbec18dd71c97618342b9100d7f6fd884c72191c587f64b1d08f16959b7eb4b6c48d43f755f43cc35fa3"; + sha512 = "613689c3665c76ab9b05f666b1250f92b5bed37d2cb7d61df2ac6c25ae085853416b2bcc5638f3f4cd2223adb2d585b0d3be84132e9ac038377dcbe08b39b319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/th/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/th/firefox-66.0.4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6eca812c1277cf9859722c38cdd962dd1f9039617cffb48882bad55b4e8cbfc8138ff230ee491d19b042b3c10ee5499720ec494605bd3c266cd2aa29d9b44a70"; + sha512 = "9123aad2b2a8cf5c09007a042571e884fcdf06d04e2fa71207a8e266257d4b83125d6ef30acafce3d8731856a3e81ac54858dbf8fb7e778a91f188b1338754b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/tr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/tr/firefox-66.0.4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1cf21e60a8212503d1511b3372e2f9948a6f8e66db8e53fc0d825a4e581afdac173b8518dced34303aca7eb126b9cbd4e0c23c4a1969ca1e68f63f8aede32275"; + sha512 = "c11a6020364af2924e4970afa09377b34ee6270ec0164afa3e583eab8560b1c3824734556f91c0a77581032fb978a0343cdc86d25e02e186e6e600240346325d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/uk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/uk/firefox-66.0.4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c24711ce6ca420121fe88c90f610a08ec3230a0f323cf5fd80511c65f8188126f31b6e40b1a4b9f9465c7ab72b866879528080018163dcba3769e1f958580257"; + sha512 = "f67e01de24bcd47b653174c9d72321004cba717148e045f6744b89f1a45423225ac533f32f9ba4082b9dbb9f6b594f96dd7ea819a5f9aa2f6342ba4ca7064330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ur/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/ur/firefox-66.0.4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "358f004569d6a61d57af6305e6b02d5e30d699002e524bb5b73d72ec42c427c63a8f0a5b1fcb11136140b4ede6dc2d705553d5dbafad9bada1a9b1172b4e9af4"; + sha512 = "27d6c55ed4b364353318a4585844545affd9cbcccfe119ee2ee925ca2bfa68c9dc14ce8dcc4632e9064ec679b6504800c7821beaaac13079a85fda5914ddbd31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/uz/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/uz/firefox-66.0.4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e0fceb8f52939cbb37df6d5fcbb95d1d50a22f1910c653778381e6c1fec14a3014ec01119e06a958768677a9ad54765d6c4387c9edd9c6ac57d2c37334bf6c2b"; + sha512 = "fb3f8f95efbc230d4f92efec5ba1e99f3945461962b24d20d635e312facc79a2d62a6ca9eda34bdd516b697beb7b78612b73706ba461b8127abc4bac4db261c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/vi/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/vi/firefox-66.0.4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "94c0f9c8df20be53fd6a34388c9be4f3984c437ab270dbc18318e272c234b791911e099dedf9bc6f837ff290e3a2e0a8946078ca830ec24a052044093be2e8b6"; + sha512 = "db2057f6b203144dd032e4f3c53dfdcea8e339ed71894d21f96b24593254beb0779103234242a0541fb26f913d47a7ad8543ed9a871c2f11f341f051c4dbd0ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/xh/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/xh/firefox-66.0.4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "891dd4fb85d28cffe312c6310c9a6cb2a70f3ccc9c07d510553790cca51068bbe07e406ff3a7b33c690e26036a7676ebfef68af2819db3ef6e88ffd0557fc8e0"; + sha512 = "30574f459a2fa6ed4bfceb276ecd48bafc2ca63ff5dfcc6251f4b003c5c7a1039af30682394b0e93eae4ac42177a4e58caa9cadcbc4c36b7eae0052595bd62ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/zh-CN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/zh-CN/firefox-66.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "188339263557e356ba24b4a78f715e36c2b5a43af3a9e229deebf9e84e01e3673ca5aa73a271db130455be1f0047591c54745968dbeeea0ce071cb38ffe73851"; + sha512 = "e7278c50c7db235f244f0e32f1a3a5e438462a7a179a38bbf8cacb8dc07cc63d979491b85036ee9baea1d8481a10517005a164c31507649d643bab995f98a1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/zh-TW/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-x86_64/zh-TW/firefox-66.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "52a39dfc7caa53ce70bda4acb1e2c472981df6e457baa143ea3a1a5f6e77f8de1d64663ac7f7a21c56032cf6e9927d191b30a1c615b19a29ca2142e46d736672"; + sha512 = "4b3024b7b47348261aceb573b905d079eea27b45947069316629a05a8ad9f983bbb835ac46f610bfc2640874403b48b7acd6b4bfd4cfbc602227fcbeca4e9c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ach/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ach/firefox-66.0.4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "134b66544e203956007ee47b649ec61adafaadb0e03b0a62c83f16f4efc984ad9c765ba92a46f53f78589f09e224bba731c3322041e2b6d3f46ae6919e66fbfd"; + sha512 = "721ab206f584a65b0f5ac2e2da9e0b95ef80e66aae01cc65bc736ea672c276dccfac1885c7de5b168432736f00cd8106f85c5a2a5b8a477e2860e9a8dcca8f99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/af/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/af/firefox-66.0.4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "71fc9af0dbccb2eace1de118f528430fb5ef26d6ace6ed0f8bfee065c4a5b3049097847f4785bca543f3a77abc64f8dbcb0311069c6120dadf653ab98848af52"; + sha512 = "e86bc71b580d6cb1c4f52d5f5d248301805a0b3782f822dcc41f590a1be289a6a2b9f42931b56e36df1124ea2de0b2528ed00de54e2de4e915427cc055e461e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/an/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/an/firefox-66.0.4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c7569fc44cb6db5c5f9b2242faadcfad3d7d957d452964ef806547b03cab10776177f05b0a3a308aef09723e7a2c77529fa0ca746a5d72f3a554c8b49ff4e0df"; + sha512 = "bfbc55e1a0002fdc30dd65f396afe05c7090cec1a54cb13dac0fa2079f2427f54960de4bbe7af93bc3d3dda3bdff84f8760463054e0cf315f151d318e9a2b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ar/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ar/firefox-66.0.4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d5e5f0be178bf719e465f8b62650b65f731db4b101075ac69b59b4df75e6eb21a3d4b848dc977aef8adff51e39ecdbb67530f575c9e0311ce583e9c072a0868c"; + sha512 = "e030f962cf81caf576b165c7c76f6bebad317860b788153c5df5f27c8427a0850e3dc2a4877a8de8220f435fb71ca43d3e131253e345b2161ca65bca98b08833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/as/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/as/firefox-66.0.4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e7667f0705766c544909f512d7ca801ec8ab3c0428f0c5be01dee574ebb4b7ddda15b8a0111a35bb75729fb6f12669ef73cb0dc3479faf54685aa8d644fdc9b4"; + sha512 = "afd792df04ac43cab4bd837fb7a5139635bc9a2851bade301bfe677882134e25b7aa37a70da9836ca28496dcb7533f005af6806b97f531a3632cdd2e019279da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ast/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ast/firefox-66.0.4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b64eb2c9194cc9a62c42efc89086ce3e0dcadf2b8728bbedec31f4f258aa9fb5362a555d4379f70f53d4d14ee1f0574739b901fe510ffb47c8a65cc314447dec"; + sha512 = "1589d9b31ce8ce47666ca091358acd423452964ef72a45f89e01d20507ea3c7ce85547d5eeba8a7afbd4569ffbb08fb72faa2be7a45749a6ba57a1a887290842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/az/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/az/firefox-66.0.4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8d7674eca828f2cfe22fc954222c43298ee790b00560735ee571c9edc98a719d9c684539c8f2d1f47ff18371b7860de8a7ba33f9154a534ca7918337bcf3dd11"; + sha512 = "312ecbde1115129d4c5cfd6f5e0ac6e20b13a81ee7cee9e2ee7841e1c4ad81743ab50c3fb0a0d599cdbeb9671fc7410fee7246865db58654982e4c3935dbf266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/be/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/be/firefox-66.0.4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "5951d05b4130403436b8667b5286569d341e3499f1f2bffe959ef4eff384b79ead9b276074836c4fee41ed7fb3f36f17efe1bf552f7507cf19b03505d3893353"; + sha512 = "01f750b21f49806e5cd6227bc4f6eba698c7c1de7cea7bf6998438490ae4fc69641ad9de710f9dd1e7da67b8e43e668f3cca50dd995f9e12c4c5388f743a77ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bg/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bg/firefox-66.0.4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8176952179a38572bed2624819e9bfbe271e94c6b60277e19d301e902c21934d1c787acd3b0003027faa0f3b8907b01e52731c38ae80ffffd0deedff86412125"; + sha512 = "fd950660fe3660f8474c848bdfbf356ea47adba4a25719873cd322ececd3bc8f5f3748dccb0272b1cdfe91778f0c5e18be8bc1253f2192bdb0cda0888da2c49b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bn-BD/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bn-BD/firefox-66.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "98da4add6c85ef6b3f19e7ae1b7b1be340c0d78ce17fd409c919926d75fd06f54607272d0404a4700e482f94cd6ad72937cbe82c7fbc0ef41a862ec885cf9987"; + sha512 = "9d95cea55725327bfc255cee7b9dc5b32710d8575931feca0c5d2611fa9d9a1c9121283248e11715f594e98ec1e0584454ea4836b2853386dba3c04e1ed764f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bn-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bn-IN/firefox-66.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3f182c05b584c2d09fef0981340c71e28ad10c41c031aca0dde1f2d217522b1d3e7a3e785c6fa634952bd8a8ad6b401d502ae07065e838a3d0cc59e13d313364"; + sha512 = "1504f69b631ec7452a6db588190987108c52f805cfe40d50034bb0da9f06bd642cc4e8a78fdf297950156109e1dac33d8a186943b61e89923ee313cfbcacbb84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/br/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/br/firefox-66.0.4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ea9e175c2c06a051e1d01bb2e1d61f1d0f5e75fb8956516f6a4a1ac52c55e5eeed6405771598ae36c69087c7275d5aea3325ae44b477639ea8423a3aaa4ffe2c"; + sha512 = "6ec57a6f0159d6dbdc9ed1edb5f157bf9833fd1ca626011a3f9bc7387ff5e5c227feadaa2ddc87c134774f6b93cc36cf421f46996125cfbda2b265b7aef3a04c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bs/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/bs/firefox-66.0.4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "88344099457ad847be785ccacd930f34ad5e08b0a0594c6719865a0d1ec5a01c5e5f5095dc01ef399aee19494d5108a86e8bcabda642ea966912466863a38715"; + sha512 = "2d71b24c1c24f52d3930e65a37d8354d826e47dea1eb2c4293094726d76c11258e238e2c71121f7de0c323c5e701f5173decd3857525df944d2a349a528dd603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ca/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ca/firefox-66.0.4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e9f0aeb2a3ee8cd118e0afc59909df7ea4f87b737a3786b11841d2e85ee3a61747c525cb2c1a707d480238fc00c128062c2bcbdce6c0249ad1404e06d9d7f1e4"; + sha512 = "241aa2b588fa66caa21c64e3e0511893bbd3e87d8bd24cb73956eb7bd17e6aeb1248712bf2a2a302a9d9d5131807e0daec7eaeb00c752f6fc66607d9ffc52a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cak/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cak/firefox-66.0.4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "21f48505956ac21cb74140f39923364e578c7eedf3fa180a5114c400431476f489bbe14aaebff9003ed7a958e8970fc9c713d52fd3f4388f21152c570ec082b6"; + sha512 = "1273f8d70a02d4d49260ab97df101136062bdbd70f9b76fb9550dc9fd9097961fecae61832238eab017f00cc7e63c6b096c9452c2f426460a2347e66fec4f6c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cs/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cs/firefox-66.0.4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8b89cd378f4705e96547fdaa0693b359c617fcd0d76931d279ac176cace79d12ea4f7644b82e4835575d78b564ec6c00b667f1e98204886e3a2e990756a97de9"; + sha512 = "de0d30e2621b8d25a701ef1350f9cd75989f436880567541e0c34c90b6010d904aa06cfd4839f13670fce4b98e1a759490ac7b1daa396ad570ff1032c3cf308d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cy/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/cy/firefox-66.0.4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "484808fdbaa1ada47b5a05be161c67202c8d82bbd3c8eebff37aed11d5e763679a2236ea74f08286c70602d8a347698f2bbcdc105c3fb9e0cf835600dfd28a26"; + sha512 = "2b980fb5fd2a3b98af34dcf0f57e0f1e039148d95d452c6c297cdb814eca2327f2887933a89bcf829c38dfa0b1742f166f133f58754af564bebb0416ac2cf396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/da/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/da/firefox-66.0.4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "207e10cafb402f2b1de2f2141822e68951f06a30e8ef4fbbc337fc103d826f0af15f5b8790c618dd423e52436c6a07bd9db4759c10297b51e1cd1a3ba3045e96"; + sha512 = "a2c364a2a77025f7fb2646b110ff765d98f44ad84d0f1a56984048c56e062a7e498a0f8cf6cb1fa4f3e34ba386b20a8b00ef3df3691abb49aaab9e86b869a2d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/de/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/de/firefox-66.0.4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "09550ad63b619376708e51b967fcdf0c0a9b0921ee2444cf10b08e8b30264ce45130502fb29e8a70c887f3465aed3d737d9a45b134f16a181f3ae094afd5c717"; + sha512 = "aa053f108d1b9775529023f7003a5bf72fe0e503ca5fa61f5f966b6034818483912e09df3a5aa72ab0df75fbf3f78407c9410b609dbff8e0be3869ad8995ce9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/dsb/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/dsb/firefox-66.0.4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6ab4b87adb70b3c5f015e4f96b5e932ceca421f552f30acfd9e00d171b428529e8280937eb5b89086eb8389a9ded86b61f45dd2362767b49fb25a11d9b9513ff"; + sha512 = "670fce6387b3e867873adb71cf37a28016da2bd9826ee718a0196280e8cbd1f7406bdbf91009f9faa8d4c94a55ff5102b73b8fb319407261a3cf8caa5b69e726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/el/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/el/firefox-66.0.4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e80dc8fdc61f1b19260c1eaa0717375402dfeba3b00d6a8e60b4074d260239405958b34902e954063d2877dd026e9b19d74a6e6cacb60e42ee5940ebd1077e60"; + sha512 = "cce6185101eb4d4044fc6216d1af35ec25e2ad7f4203f671cbce1b1f2968b71d2eded6da45dcfaefe92471046edfb6e9551ac3c0fa2a109966210fdb8c7297e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-CA/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-CA/firefox-66.0.4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "e832f717ee292430ff5335e1be7cfd4081fba289be7e62a153282bb5fa5f4d37673f994160e436297f542ae40845ff09843632b66b37af2ad392d05c0104088e"; + sha512 = "24666b9a5c26be2b23c80744bfc3b08f83f02b8f3d6ee392d02d2db6ae16cb555e0e6a65fe08d7942551520798f2b2d0bfab4f607c9ec29f82acbed5b3a8c7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-GB/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-GB/firefox-66.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "aae266e5e46a33da09d8b656ea7d0112ae4c612216bbf4bdb5db0d0e0b231c7e83ffdc085e34ca996958c0d56c2c03f42988efa783644c1ba249c867cf1aa48b"; + sha512 = "2e66d24d2ddbbc03b284488c062f5c8b561c647f184b370c621bea67610713ad41ed83ca04e4ee7092e2d4d9916b94b13736c02e7e9eab519a30fe5531120d39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-US/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-US/firefox-66.0.4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "55ec374310abaed9cff7ff17cb4b4848a2ba8b7803846f6a1aefebc14ad8e3c62ffc066bd6c44d9bb208e82d833738df9d5d0a0e19d90a64f4ba1889994637c4"; + sha512 = "2b0bc9c83c9f8e9b570a5d1936ec3418fcf738ffcfb2dabfb6a8cd153ddfbf47472c6f95a081ef49ae2a6c7153b0f50b4346385470b7e28a90e5586b71e8507e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-ZA/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/en-ZA/firefox-66.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1ca7a97219fc9aeb790046adf4545e20a3aa3a382a74ad4621e0df89584984ecec212492016d680b512dae0341130cc4618f61cfaba86337ba3e0d3deebdff88"; + sha512 = "c24f3d5ee00fac6285b6551c59c9532a84769cfffc61ae760b19347cac5c98eb35ea9803f89c6aabbf8077a9a844b7bef8528b309f26658891e711ef2a08c6ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/eo/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/eo/firefox-66.0.4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1ae8bf9caf03ffaea1a6f6a071b1d26818e39b0b4e33e75ad4ebca7a2f0b20b8c0450a1f24466edd59b211a1d7f2667c447fb19297e42f4d32e6d676b634696d"; + sha512 = "060a951a4d997aab308b9bc61daf09c133dea250499d9e1699fc0056c382956918f8700bd5a4f8c2955b0c812a84fd6775569f7d16424d5299a541b0d0152e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-AR/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-AR/firefox-66.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "0c48e15544335e4d061db1b12e82ef7eaecdd542391c0e5fed91fb74755cfaf6766bdad02b4f70c1c7522eb1cebf684b400db92bc632aae2012a9f9627e04552"; + sha512 = "1dc63ee6473ee4659e7df21d73e552458075f2e0885f3bfe79264b3f202a6a2ddcd90f81b7a1b8b877467819228db0f5f7245bdb434600e05bdb7d6af8043c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-CL/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-CL/firefox-66.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c38c5dd28313333849cd00a8f35a91fb261e3cabc8edc71bb74b3b0152b9375ae915a6c26a7ac2334db9805a6630a394ae14f53e3de048f9808ce07cbb14816e"; + sha512 = "9d999af584485900e53910c462ae5271cb08dc24c39b89f765a7e393f940e6daa317202e3ebf46d4a03ed5adeeebcaa9390465a954e0bf6816c48ea4a55d05ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-ES/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-ES/firefox-66.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b7019e49956fb4038f445e7425e99cd19ee23d12ea32b53d664898acc3c9f23e03168e1d35fd731cf88d3ed98ba0a487c288f457a79721df0c49f0a66f5d32cb"; + sha512 = "37bd3dfa6a2bf3b2988f889270123a19ea03300e51b85fb1772230d3764c95e17382c996b40124c3df439d40f7fc72f69de006bcf024604ac844444a45179f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-MX/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/es-MX/firefox-66.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ee4abe8b333f3de4b70d0ecc9d76c040d4b268b0c797eca6eb0eee89cb3950310b73bc0d07117aadbb386c7e3957d0aad97089cd6d352c385a5849f426bacfd5"; + sha512 = "3ff7427884ed23efda07d5448e3236456a44edaec2584d2c693cc9ab8e9ea27f715e7c6a0b7ff84d79376ee36e81d63ca80fb467f481595cd64f919cabada830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/et/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/et/firefox-66.0.4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "238c68efd328ec4fbd679a573da18cd48ac3db6553e31ad49f3d0a08392b6fbfe907d9b4b996764d1f346fee66c9ce660af4fc8c2dd8fb87f8734c688b9aeb74"; + sha512 = "624f2d1095f92c1e6fb88355801f5b95820f3c43dcad5243247aff49e6a83193a704c377ff44a9ee94edd7c9d1ee7c735da3b6250868433aabc0c3274f320e3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/eu/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/eu/firefox-66.0.4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "30e5ba2be30b4db009bb88461b7425efe3a7c1f8b292c3a47ddcd6d82f85e69a2b283c54c50905be4b5d4941f788b4a2ff1878430d7f6918a13080c6e8d2116f"; + sha512 = "432fbcffe82a8122aba1298fac1f9e1f93902cc7f8c8b9782074cbf57026d34013a5b77a3b110397a97281adfd7e07fd2e6b99a10114017af2813c7b4ce8c653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fa/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fa/firefox-66.0.4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a00b712dd49e0ee6bac17f67619c92ccc6774de7e9e078f5d95a38ad0bc6b8a16405cced536d111043fc0cffdaab420d5d12694f452a8839fc750b8a06b38622"; + sha512 = "ec7856b3d8c3f16db39d6e4c0378815f10a0eea4d566cb2351bc6a5dd38493e6d965c32da6431a9ecdb30cf31acf86d877ff3d694f43fc46ebae14dd36c2e40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ff/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ff/firefox-66.0.4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "008a099bf92ee2e1911717e470de41b563d1db63ab165df70140a287e4accba7ecbfed08e9f155696eca24d82b5e3710a51deae00b9cb3ebe2c154cec52b55bf"; + sha512 = "9f811b0ebcf1a25ebdd2d44b0b8cc185a5a6a01df79f788689410353f76c55144b5ba74a2efb896c7ebcdceddd24c1aff109580fe4360d6ac011597ab5955cae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fi/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fi/firefox-66.0.4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7107756f54bb5f388ddb88f3bfaf0f24302f66e47864a68f66596960f7d2d344aa10a8af674a681ec1cec7af4d554365cfab18a9bb7c341cc953d4bb7f0385c6"; + sha512 = "7a26244a21b13bdc54fc4c14fcf547f8302d38f73f8385c424fe79480acab1ee43720544a7137bcb2a0b6cdbb1ba8335ec5b723773128eb6825e9e3bbf0b30ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fr/firefox-66.0.4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b5124721aef078386a4c9dac9dda7fc7cbbb7aa35f4797e6689c74db39d18b23eb92d87b29a2e5ba718944c7bcb80cd26f33248091a0f99be854566f68377b7d"; + sha512 = "b97ada588c37af74b3fe6a11190e4408fadc1a63b1760986ea258c493460840cafc30d46660c85e11f74946f1a5cb87149535926d286e2e537a21b7d7cdfa229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fy-NL/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/fy-NL/firefox-66.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9cd219aaffda54d2b6807b7825557d91651861a3fb2d99c33623f04450d799d029311a7cbeca3062b372e59c50f0b0ba169a38a0a87c676b57ebb3b6b70c11fe"; + sha512 = "3fb3465d10169182e9e34b2216b8f7cfeef421f9c45fe72b965b92220b828dff68acf88e755cab0f2c831acb1c0bd207345b7646c83895d4e448ffce0bb7fad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ga-IE/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ga-IE/firefox-66.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6044ace615e3133677cdf53c6fbc1b4b9f02d57363fd6f9b802a4501da92a604a539689dec774339b4590f17f3e05a28dcd1ae1c306d76fe75b4ebf18a0310f7"; + sha512 = "be5f150e10bb4205b8fde5a78fd4860cf45b1367334020f90c5e1e2c2b65bbb8911b19b0b63310f1152bdc1857bd465d2a168147e16673fce3105e87182422fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gd/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gd/firefox-66.0.4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "eb8bec22155e74d2e8da88741ffe596174000ab92859d7f06ae00c6280a0f564c1cc03d06312ef1960d182b61543c88ad5fefac977cac2456a2002bd22a13eab"; + sha512 = "95a6522ef83ea8da6a36c23bcf49e1d6f2b4a5be0c0aaba3e9cbeae0e716d6f5a78c4d3461a1fb799a21a96c04510fcf25fcfa5203e8101536e7d4c365ee8bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gl/firefox-66.0.4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e98597c41cc48fce17c0698afcd694bcb772d62671de6bba4db8afff8c02ae2c11627a4b6a17f719bf86f5425783e3c7ef94124c49732447e356b67f35b97b37"; + sha512 = "e1e3506d962c06bad43fcd295434035d6312a4d686663a33a043740123b28ec4040d6d1bc7581eac742c6193974ba3aeafd0867307f2c28d321363e6a907b97a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gn/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gn/firefox-66.0.4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "7f89a5cceafca50806a61ef748319fb2897ba71993b99a8e0fa951a6e1d0f04af4c75d4cd18a2061f6a56fb66fde391382fb4b11e3509f9ab227c48ddcc53fd9"; + sha512 = "56063c52c71cc117ff1984da22c03bc8c2f1b53b1a063f62864a05dbd3e5bab79c156307b8be5c7d7cdf9254048e1a27fec8112656c4677b0ab068d2dd658559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gu-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/gu-IN/firefox-66.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4a50e5397349d68a1d3c9d1595873b16d4bfb8c28bc588bccba4d9f7a804374fb2094cac8584ee62cc415d4cfb22e1af42820ce0d3a8642d985910785888900c"; + sha512 = "4400ebe78e80b8c776f7af169c9e99c83624db188e2de98626371052999b7d52b265b0a09152f3acdda85040abc029cb9ae790ff8d4d6562b111c6fef8387aa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/he/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/he/firefox-66.0.4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "98cdc96eed8b3d56a4b23ea7b5ef044d385b01635c4da76a36284e69f1feb2426c370af907e81121a4ad9baeb7899f98ac76ad477a6e74f1fcb6333a35fc635d"; + sha512 = "16453b5aae26b4bb7153a915810fd66549c8e8c6d880686d90c5340822e757a01479978de0ce63b48e66979456ad20c508da5c70c7d2411daefb556e29321ffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hi-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hi-IN/firefox-66.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "96d4388edb544b9dfaae47ffc87d426f9a3e13a9eddcbf6d83e60f8d0bd7b9bc0565c2ff8c610881c4853a7739d3aff9d64ccad8dddc27d2ea6588a077441d6d"; + sha512 = "acc1843b76699c68a1f6328829a339f303bac8f1eb3a66eb9355422bff6782928de6e4693ebf51b6e3d8337dee6c6ac34d7935b7ae7cde6fef8b297130115e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hr/firefox-66.0.4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4f1e2112d4771ac198a6739ebbd4738e8977a84b740e8737569afec5570d36aaebcdfde4da54e818c2782c6f31d785c84114be9e33a6d17db480ef5c9955c62c"; + sha512 = "4606e21fe491959585254135cecd629ee39adedb2c576fcc597a385a103b7c774f84a141e060c84cfb3c3560359c63a014bee7ed76cfe17b18bbd86458fde8f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hsb/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hsb/firefox-66.0.4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "27e284f211b9f3f76fb7bca2db5ae92ba336df2df838b4566ad7b7a538229911717f8a7d3321264d5034a7cbb57df4283b13742a2aa45b7357efce8365551640"; + sha512 = "20ce433e45c16af0ca6d4fb9bcc85c2072b95a7058f4b4f9aba486259278ad9077c02fe9daccc0ab43772a716728a026e6c7224ff243aa095a35a62a8f848ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hu/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hu/firefox-66.0.4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "08dced3a7979fa7692e9bf4d5070925fe06ec7af1b261d56f36e55a068bbc994e881540eb7830abd418c44895edde460fb43beea84753e5d96ee35f224ba60ec"; + sha512 = "9984c6a996e1aec493cac5722166c20f7bf91812ef805c065bb32dd6e01b0e4950074f50698174341d2fd98bf583d2fefb033918f9243da32cacbceb6c2be66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hy-AM/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/hy-AM/firefox-66.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6ad25162a877f821ea0a4aa37ff92e89c45b1dcca03324d79950aac451afe8d3acdd86f0eba20f9bbd058ab260b4d64e6ceb6e5d1698893d05611c6759274e14"; + sha512 = "6e295f3c4d2dd1d8ccb20a6a95aaa90f6b56f2aca0f56e88ddf2b5d944e83f7950883e6a78e8585a35ecf938e6ad3c2a9861bb90b7f243f9d9a95ae0a3611797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ia/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ia/firefox-66.0.4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "fbaf8495d07d270bb1c80afbe47820193e3aaa52f396b281fc0a3a468e987d1d24abfcf9ba02aff58d9719cb97d96f5a4b0ad016acd79aa8097e88b737bb3179"; + sha512 = "a6ea1f8c4ed980696afde549df4f2e8811f33c3a26990ee594328fe8ff2b85da690ff2562c4589adfc6c96a8df2826b4ecb45a1f66abe37fe63befc7c1ac83f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/id/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/id/firefox-66.0.4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "8cbda23ddfb9a62c3e19f24ff036c0f569c0de3c9598932ee8c63f89252f1c0f71d61fecbd270164952236a6a9a86724d1ab86eff644a31e6c0c46fe94f4b11e"; + sha512 = "525778a18d1a10658f68acd5765ec256c94a0b380cebb9f71ab5bfbf860985dce1d075abca8a230bd10f45536d10e1274718bf475d6b371befaeffdc3f66c12c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/is/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/is/firefox-66.0.4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "302951a92d245bb25600cf7a791087398aca5e053ed50ed3008c5da9f24cc049c34be0bde5cc4d8d54a272fe5c85b8c29d067563c33c7a03b2466bebf805233c"; + sha512 = "d6495199e2c2327c5b0347b9b4d41e7e83522c0e67202080b71bbb804eff012cee9949e0376dae274b090e64308a26ec73d040ac13bfa8e694cac4419c312b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/it/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/it/firefox-66.0.4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4eb888408e72385ea976b2b6f6fec3304cac26780724d570e715625a5a1c04c38c34349256ee8011a643301c3f1075a9cac407c3e3f44a18de30b555a34c8ed1"; + sha512 = "06a82828e9df605cfde798e15e68179adcf6d7fd8483668bbad5d6671a587a1c44e1adfbb737ef333d86a47afe251fe83ff3cc79286c3a92ab9cb28f9346ca7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ja/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ja/firefox-66.0.4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "87d0c8b7d8ec1cdc085d911b8af9a29ecafd4dbc0717e333ecc59af1bfd245cde5f76a42686d58ab7b688bad33e76e1771c47746a1cff5fc8351cda7bfc1819d"; + sha512 = "7419ac401b72896e66e92230fe54da3b88dccb900fa208e1d4786284fb64284c3979592d3c0815bb4ea7a6c50850920b27d6bf08b134ce7adc60096556f94a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ka/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ka/firefox-66.0.4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "63f1e3b1160d7baad2522a833dc817343fe208c347941c73eb67764a337894edb67c81eb1e9751475e0e36d4654f3cc2f17e15f1d2a1fe0d2a0a166fb7db354b"; + sha512 = "1664333a9c32f312d2f4e781b277549921f30efef1012de640fc62368c9806dfed3bf37fc6e25315e4dfb571e8fe1cd5032ddf5b6a54904277c59cd52aa40efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kab/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kab/firefox-66.0.4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "bda5d6e27e1e4346b0fefeca8242d1d5300116242c2387fcd1c0a38bdd413e3b8fdb9bee91778be58988eacd1dcb7273a152e8ab43b624cccf5f0c92115f4c4f"; + sha512 = "7bbad72a2a2da61446a45de9333f97749ac07019959889cb4e2c78f3a014d478db8e3f1f054e934d32604b8ff1aab6fc5e59a6dfb7ac30456cd5c5bb0b9637d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kk/firefox-66.0.4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ccdc808818e5f9e27260125c8d8015730593b64afab1905c1e17e047263215b3163049186e21f511752aa5adcae085311d7d4bcda657b92d3ccf640f2b210975"; + sha512 = "714e6d78307b2bc33ed90414943dc3e8090b3a0a63d0a6f1266dad2bd9b155848cf747b2685d376af8c4d34a1d520ac3ecb8da7b7e72de70f80c726aee555de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/km/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/km/firefox-66.0.4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8d384412ae5af3b73f175c27606e44e5c030f9438aea914b6ff2509fd42bdfe54469a5d5a6e0bb6363b74664bb185e24e2187fdf4013f6d5f7c49ac2a75236dd"; + sha512 = "eac3ba4d9ea03506bae726a2ced74b1e37bb58c29a03529ffcd6cf595a6c2ce7feef29cd289aa1b650e399e046065bf7b93e5506f92b2b332ef6ab5d5ae89591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kn/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/kn/firefox-66.0.4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9d20cdb789ff63e6f25862d7d4342d170c47979353b605bf7fff1d58dc0244f7f9d13fcd1020a9f0934d72aea2b5571a08b2781cc0efd8bdbc923b75e1c30600"; + sha512 = "9741d335f170871bba7f731caf01604341800b706144ba050a0f352e15602dbfe7b2db42930f92828615aec8afd2b432f6857474f757ba940d0292487673a0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ko/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ko/firefox-66.0.4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a1bd8b36e95342539b0ec4d8c624ba3a38a9b39b683f74d474a1c5420e3693aed3660122d1593dae95efd9fc1d938281728920b64b06d353d029926eda901d3e"; + sha512 = "3c4fa714cf1de96927af3578a2da83898ff86b5ca9f4499a266e1300c24b0a75b88e718630e269e94302ad7ffa62f8dba1a5c13d5aa807129857451d8d8a04df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lij/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lij/firefox-66.0.4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "5e1a9ccc0e2265e5f79dc2f5f315567deab1840051ed16b5d78009bc4c0c8a7a70841828c816877a50ea73baa51bef00bfa987107218a7ca137cd2fe6ec57a66"; + sha512 = "31f708c82116d359100bdcd3d5750311dd387160808d64718b102a9e6b35125ceb971c7c5c530a584d206e312ca85db5a1626314ab8d573ff0d48e2e2ccc65e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lt/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lt/firefox-66.0.4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1b5b1bdf7c360622f2e1727674349f142bb2912aa4d94de24722c3c3ea2e304a0c6a9ace091e455939441fc03f6b84cb77064eb0e86aabc083f0f4b090e0117e"; + sha512 = "9413359590c85b26b2fbf141a9ac5d4e1ec27c4b64c8bed3ea9cee40567ba1a84c9757f16499c53d96643f50ee53fc9194d06688f1e3deaf6866b77f0651e45b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lv/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/lv/firefox-66.0.4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "aeb4de3b3eecf08a627512d6c73755150d8cdcd00ef9f9d834b9de72e6e21e0df6b0fe2f248919e7c6219a4eb3e6b63dddd60da08742af0297264f3da655a580"; + sha512 = "0746866b601275a4b937175a7176de6f13dec8fa88dcdad40bbb5c5aa6bbebebc61162baeefed0269ff6af75854095a704e3df62779eb2c8e581e82cb2038e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mai/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mai/firefox-66.0.4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "27c2e1581a08fcd530acc8728543304f5ffddbadde8855dc241dcf3c4374dacf5092ce32f90a0147540d832d4c3221416d9c9d8741bf3df75918fbae5c1bafdf"; + sha512 = "103c1b5c978a8c2f5295e24c346eb95c4ecc3187cfe6e2d0ab74654683dca13751fe1aa58456732130249a1edd921fea2e0843aee6de82b62524b5ed03a34512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mk/firefox-66.0.4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "968bc246c79685aec397dea83aba70be43db5198849a868366fbbb201b032cf48cdbfab1dcf8472dc34d43269f9f89969e0142391a1404eb514a4c002afc41b3"; + sha512 = "b408418432f7c2ea8aea58e1138dba61c00f0a8d6564df0cd14ae03050bfd8ba17e9654adb6cd835dcb798f26db1884fc89920ed43974c1fb92c79b39c3001ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ml/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ml/firefox-66.0.4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "06915e32d05ba2c2e51afa0b93da0347c4e9a2d1e13fe07f63b3e923332e693155046d27c3cbf653c1f4e2c0803e9d44a92c2c7d6c51e57d68aaf0928829f1a1"; + sha512 = "5c58a55345930e9a136bace10466a534f5b9c2365edf6bafcc47c9797461c7b98f836a8b8d2390a5a9239b6d4e96b7213a600fe64099f80e9874ff1dcb1ebcad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/mr/firefox-66.0.4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "db3d3a4f508596fdd52337101521b4adc4ad9ef65f076afac0eb35060e8def5dfdeb8cb2294e80ad6bde8c8d38b8e7302985fec191d5aaa78889c0a4058d9a9f"; + sha512 = "d6ed0fe10c705a06ec1a361634fad2498107b8c9ff47f2360c6acc11ac745ccde738a014af22bf171022198ce8dd32eea53062642a49587764e99975f4147425"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ms/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ms/firefox-66.0.4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f0dec83a8e4df4702c48519d00588b8fcc437c6c4f2314e4e2479045b0b610193e06744fb2ef53239840f73efc641c5ed4c542c572e5c1a2efd3906f91109da5"; + sha512 = "0112e5cc8b176c32e10ac2725f47bed95e49176cb81ded0e6f2b324eb9f6dc487ce073a92a5fd5c25b66a5401389c1959366905846ee7bccc8280dd6b0e94e31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/my/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/my/firefox-66.0.4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "82091b20acb72e105384cf203c26752667535cb9741484599904a3fcf995730cde7e4fae644671a5a43a75cf1c426fe0b4a4e4a8cb47e5649414dbf340f04a28"; + sha512 = "32837f4f0f733b133171cd730b4d5f67ce8abe4cfdf7d5763ef431f605ec7d2032437c2d41be16c7133ab8e6ffbb5e3050be769a1c90ea88faba32e32fa8cec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nb-NO/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nb-NO/firefox-66.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5ea64b98cf0941a00c884ae02727858a3a4d1bb81f1b926f39f4cab30340d889b6a7250bfa615b806964baab46a97ab379fcc32eb27ccfe120c474d38da1e00b"; + sha512 = "2a4bf96f5f55da8fd6ef7393f99c52b6b99fb75944813189ccf7d30524686b3d6beb14bd6d7854fcc323acad3b17629e5b9b4e9c05dd0f1bf29001c0c9db8274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ne-NP/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ne-NP/firefox-66.0.4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ec88e2fcb98afae35bc9fba6bd9c835e0eb47c9ee65c5147c49ecd1a5c7e3a4303a31f24cd1cfcdd0483282ac5a277dc31a1c31f1a6af16ea87d98f72b1c683e"; + sha512 = "db675367e97d4ca0c46f066cc53bdc9265763a0c3492a06db8fdee0f27d2166374c703445b5d286ae5ad1edff2939ac27705af5f484f9dcc82e75b154d2a4905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nl/firefox-66.0.4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3c63b8d51d900fcf1d84dc2df5ff60d80180aa57ab6b51748c3e6c493aa5eb76dba394f57c6563272346a728a6a432d63b660ed252faadc520732fcec2279c04"; + sha512 = "2be6093f8a5303cf31a7bd3788c0b87f6525b0fd39f8d867646c5667a0bdbcac54c7bcebc6b0f91531291aff4e9041f6af21a20cd28b9191a1e778a6b3dedc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nn-NO/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/nn-NO/firefox-66.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "996587a51fea3c960133862dbefa9f6639f3512edf81cbe3740b88a76651753faf7e49fec1b657d039e2f1970137933ed3b3ad3a09f4c9476377282af22b1a6c"; + sha512 = "f1a50d57284e5e989e96598635fb9a876b1f72049ab2c3b5d4155a23c103bcc814f9551ca8da24e4c4565ba45ed2206e786b2070a51da248c654711911b62fcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/oc/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/oc/firefox-66.0.4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1e156c39ebd5d74c6327fa09e04046cc2efa013747b574916a203862e5fa19c921f223ab537a91ec613282821c4916a73ae8e61170c709752cf3f12ffede6dfb"; + sha512 = "2d8c7b92014717126098ccf93cff317c7e119cf05c971bc43890d84adc12201977a64fa8f67c6db6de94a1f446ea00c815164031f72862ff8bfe5188c3c192d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/or/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/or/firefox-66.0.4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3113556bd37eafeecf562afc068fd8608e387fbbafc7e7d6ece475678c1cb0a025d4ca92de569ea6a78e1f83755bf0aacea6031d36ef67ba43de48d124e8e766"; + sha512 = "43337f05cd9a3f37ab1c65a0a6d8375d8029dd805d70d9b638fa80941d53abdd1cb8befe0203219f69585300ec4175e0abaaef38d41703ca828600289b102a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pa-IN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pa-IN/firefox-66.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c74d08d019b0257ade3e6c9bcd9a30d102523cac3740bab5d11a7543181de8623e6b12930e0c57fc3a261a496db886ca1c8225bbb46ea0fcca3ac6ccaa2c34cb"; + sha512 = "de4794e5ee7b82475d9f1ee03654a606cfdb93e658c289c8e51ed12d5c4f8f5d9506a6693dd9c55dbe80c9a050b8d5ff9e4d587857ef65885a683a669d827269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pl/firefox-66.0.4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "54a0666be5524e49e4f3cf11ff19c2cfa66c65524bfbd70ee3cb21428c75f84afc8625a2bc35ffc8a4d8b79074c7b1d0f81770a0bc392ccfd7bf1dfe8805c569"; + sha512 = "4836a9c7ca7eede61aef652e5a97339aa3c9949a78a7b2de48affaa335777522396555ae23abe11c95b02a1c59fc38ceb932fb9db74b50eb9b852bd3738f62b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pt-BR/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pt-BR/firefox-66.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "122b4dda0fbe80776b50a6dafda9fe9b5c08a0bf48ceff3bf3ba4c759ced6a09e76dd1b7faabc937233e8efe5a4f37d9ec54c4370531e2ede255463cdc20d4ad"; + sha512 = "85173013452964e7621ba41588c3376f29bc73eef6dbedb9ef4f0a3ca5ddce831a2c03fd0855df32e1f72f16e544073e1749546e82ce02aae0a057eddd64dfd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pt-PT/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/pt-PT/firefox-66.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2fb9253e60407d5deeeaafc61919d7cd7caa7b183d8ca000b4070da7c3f7352bc1fbd295fa10a77365afd2c0566257b60ea4d6718f25ed39f282682a0a4c6ae1"; + sha512 = "f1a4b2d14811e8b6f9617126b03d931665275ea5a59cfa9c9b93fad395d09a6ba309f41ca472b2f0253eb4bd3a12914d1bdd25341d4166b71fc601206a6931ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/rm/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/rm/firefox-66.0.4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c44d99c714ebeb4303c3344ff5a58041a4c93f8a241271c8fce72c6fe3048cd966709a412d7b589bc540754db16a622a12c81c885cb0fa8c072277b2b32b6c12"; + sha512 = "4ac10aad3370d83f56ad59a6c971de1e53548782493979ab5f214c7499d0fe0fd86b59fd8a1e717d5e3d27553667e12eadbdefa2e474a5815e74e46af4485727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ro/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ro/firefox-66.0.4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "53e1343c751a0dbd53fe7a6a53afc54807e7d745f811ce9032d2edd60721e9e01a59a547aadfc9c62aaea9c825da9e02794520a03183318dab7cf08a4969eed0"; + sha512 = "c85cd47c77c0e1ee4487cc0d0909ae02c20052b9a0784b426f0e7164136ca6eb6be7d87c13dede37fa6b0d4df63ea5198b9313da7af5c28e0adee0a7b7404943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ru/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ru/firefox-66.0.4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cfe85e79f0cabac2ef0939cd6001939a0dfd1525b1612bd991101e22078f9e94965ea52ee8fab38a6744cda0ab410d9cc638c706c61717f51f989d5efec241fb"; + sha512 = "e690662ea7c9fdfc5d721a41241b5f70bf1ab12f4db4bb444b51f25c5f0650977848fb2631b3f0106e5e54cf739a0288fb6e36736560a3170a5d893f6a6e6864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/si/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/si/firefox-66.0.4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0736e18ef2f6c3112cd8a5142f31b45a05cd6f6a6028b5011e35c72b770787bcc69d86e507c1ac292e194f80e041590bf23c981295b7193b4dbc3f576c8d55ab"; + sha512 = "d1a4f021ed8ef7d55cde9ef2bb1c5e28fb41a0220cd169071a070cd6be11ae2fba7d0f9a6c7d036317c4e7c13b07a041f46bb3e750261c382805bce39e9daab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sk/firefox-66.0.4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "525a589b137ff53ed8aac506ae11a62a94e02cd3fb6322a2078523d630fa86fdbfd1e1ebcabd627a2d34a1232666cdb7fb4b265f17199c063eb73cd2499decf1"; + sha512 = "fe0bd4ac5da78502baa39554aafd0d96f8c214197af0c62e28cd4a2a62940d6a6fe2774668ede43cb1d3ddc9f629d418ad467d1c7723020ec0c22bbed49963f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sl/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sl/firefox-66.0.4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "805b5cf866b80032467b3a0d825c9a31243de48a0588b966788ae31495bebdb1038ff5c1f342dff86d471786d680c67f1469af70f0058dbb0daabf11633c89ae"; + sha512 = "e5d46fa3ca8e934a7a3e0ecc1c096f478b7c3e594f12a8991c7181b18e321077768912963de1a48df7aa1a07440cbf23401baf1a84a12149750de3560834d2f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/son/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/son/firefox-66.0.4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c03faa7bfe24157e053694d80a521bde6aa8e79e8c832ebb026b01a95ef84c5e3a87e674b4fb1cd8292f1a9fd7ac9686157909b0e71a81495c98c77692934703"; + sha512 = "cc79dbc2e5cd5ff682bcc61f6148170688d542fb3d07ac2fad518841ed6d93a722bff9a7ed1ce77a68e7f5f09fc4e1a13f1c7fc9d6458b2ef0a15cecdb15f7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sq/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sq/firefox-66.0.4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "27a3d25c9ee414c933a01db42a1c8fc288324b1fd280462e5acb38707b142ff140f0e77d3a1f6bd234cfd12a8b945a36557b2d7b09cde92c77aee591d1c5a4d4"; + sha512 = "8dd55f612140e10681102d6d4414ac34d12733b4f8c5f253d6a278f5ac3cbdfdec1c14e4384e875e9881fc720ea1c54564de8ac3ac06f2ec5ad2941f7738e72e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sr/firefox-66.0.4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e053f3e8c0cdffca1fa2ba875186402906afdbe7196cb2ec926fb1ff749e391d21beef1f4721cec48edf2a230317a1adaf9b3314586f5a2e8cb840e08f52cdc8"; + sha512 = "fc29bb36ffd38ea5c71d66cc3fa498d2b6fda41a710c45ded72456c236c892855ba7ac8e07ed69c73f12ea2cd82bf7fa6e82a6fad49960feb4f5c36c78154fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sv-SE/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/sv-SE/firefox-66.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1027ee7d4454466a7c4b378e8b0410de2059fa166797efedd16f9c71f38f536f2a70a1a32296f0dc2bf71c1710f59379d967e841eae9bf7a6eff5a66e0616f15"; + sha512 = "1f544109c73fb4c34b964c4df5d9f6da8201689d1038043efd6150bb8a323106a911e4a6f9b7a648497747a1b0df16c2122fce55bbd6eefa72d1e64458e90337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ta/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ta/firefox-66.0.4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "000303c245dadd0f7d36477d645215d7f8623e693217182e378ecad059ceabf7f5b9d0f8aaf303417c90fb75d4c0c61de0c75e616c90d68ce74d4564aeba0eda"; + sha512 = "fe9d51b667c8a37caac25a5e236c40e87c3cc3620b630ba0f6169b8ec6b6580e6c5c53d36018fa236919120924ade33a3478f3526b7275f523d7f098e9c309cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/te/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/te/firefox-66.0.4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d720d75fe3f5fee87cb65dc3df64960699bd6b879ec79e94de06a3426481487f44b3b7cc2a727d1110c8de104e3b52efaeda44a942b986add3a9cee293092d01"; + sha512 = "fffacb5ff18d3c6b78dda7d33d0b05a2e6f55bfa24908a4ac5f970f5e8e44f9f4fe066ee73ea8656907c69390dfe3710b35606c9e8e1e4a7097fd8c004e98699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/th/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/th/firefox-66.0.4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "27cfa6611d57bb57d5e1529853c02623ecc6636ef800b7b9854b22495e15e2501a7b4ac6ff0bba0312eea64b1a2cdf7ebcbb2061617253f0f9c012c7ae8f336e"; + sha512 = "98092b4981db5460d2457e38ce1cb7dcf99abbc455d7c9b5b490e2ba1d91db7a553beaa404b78b02e66d5e4dcb71cc9e521a3f953d84ca495f9c4405e6262d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/tr/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/tr/firefox-66.0.4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b562ea3e73aeb0d12d14ece571d44a3f86bbe36b7cff9d731918c851c666c1469228c6912d1bf3a740baabd51199cce3ff9a5c246394ed5866c63e90c4984b2b"; + sha512 = "8d75be55b4baffc17fcb6a15a776c3a9f85c06ac1aade5fa2d859951f3231d36f47c3b32093a0fc70c9a4593b4f6ddeabbe7388e0e648d3b772010ecf10c1f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/uk/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/uk/firefox-66.0.4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "b0183271adf9c4fdb94a5c936d995ef749125e7031de80fad8d92048e8e260068ebc2dc5fa70ad05940bdccfa78b7ea64f067cd5c367232fe8b43c78f1dfe556"; + sha512 = "009350e490504e907a1667055a1816ee77f87ab9d6e2460a166c3b6ff8a95d71f24c7369b97a3723307dadea82ad6fe345b071d4783769b1abf0ce76c67f6f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ur/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/ur/firefox-66.0.4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "497e3c0eab42a1fe8b09182f27f7b17b0dd4e776a60d176bb332eab2b38ef5ea697fbad688e34c182e07a8965a8f8be13dfd212609776a30e7aa4419a755eb30"; + sha512 = "790596c72c1eb9862d3fdd476ebd859c1d2f9ef756d9c069cdd4004c2df66a8c9b255b054cf50bf5b4c387fc5f6d96e366b60540fd79f5827b23dd0a2304fa7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/uz/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/uz/firefox-66.0.4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b0ca42a5af823f144292bb46191f37dc7abf485c4e5207fc50d6bd1277caf1ef3ac39f15430ee060ad7114d3d9f8d56ca2157729aee5384ab82a2352b97d4769"; + sha512 = "c3d447f331dc36347f454aab0dbe5ceb4628b5b6cf63ecce009002fc87c2e63bbb55e7310c3c7a070767f38f792ac309a442c3abe4e1a041bd12638852b5e7dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/vi/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/vi/firefox-66.0.4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b6cf7e2d0064b9828e4e030213ee7288749f0ebdc3abb5f480f36e4b13d5d2dbbba3470cc4e6add622fb7198ad99a802081b01dc916247584e728fb8845d20dc"; + sha512 = "370b456cb442a68e62dca86fb44b5cedc8a9328da5a8b35cd0fecbccc6afa5a82032454961a156e246c87df77799207fb6d53f32ad5a0f3c0ec0c21be5345548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xh/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/xh/firefox-66.0.4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "97c5596455e0ca0cdf24c14c5232da07196b20c52ee860bd2a9cccbbfe2a3a68a781c1efb8ba1a7ed6a840c60493c1a3e0cbacd68e03d2f914445e1dccbed9d7"; + sha512 = "f126678434aecd25449bbbf4da96eca70a7b9d65000a2073b9b033e4e01aaa68aa4019793180c0400658ebd55fcdf93b58f391c7fe7c588c064dea1c1d2c13df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/zh-CN/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/zh-CN/firefox-66.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "298d2c45324c9bae65a1859683120e7b13253e289f8471cde434d3927ad33f0a7cf6ec8c54a3e8254eeb02203551f73db0a331407306f2e8baa889971fe10268"; + sha512 = "aae684f94b9e567e8b075efea5f910261a752c29904ef658bbf9377884f39a467c359ab703b36867c2090f012b591502612918160ef7a2b2f98958af58f4e8ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/zh-TW/firefox-66.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.4/linux-i686/zh-TW/firefox-66.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "debd419335edd694ad7fa7f3faf6a2b75e5470ba2ba2777cc6a54d8213d8a4914af113b7670267b9a7de6267c475c3ef9bcaaa2feb596aab728aa6ac68559d2d"; + sha512 = "8f6329fc2a37ffd296a8e5ad7878f8f2bd7a172b53ea0629147c795aa920d1157001c819de479f62eeae6cc59d2d50e378cc9b9e5f401a1fa31f613af4fc145c"; } ]; } -- cgit 1.4.1 From 07458c2f38de5b6d730072bea8d1e595544e4cf9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 6 May 2019 13:35:25 +0900 Subject: firefox-esr: 60.6.1esr -> 60.6.2esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 83181aae87080..bde6924a65e89 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -72,10 +72,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.6.1esr"; + ffversion = "60.6.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3nl3cisn1sw3y6dxnv0bm143dpp091h1s9j7g73qfx5s6sfxl832lan177ikm00ay7fsly251vi1xz17wwicch1himsmhjisnd3ws51"; + sha512 = "2gk11kffwmyq3m8dsjc86f7zfagl15msb8byrb4db4w4ssn335wax2p8m221xi4qnzf20fl0p1b30g5z8ivrxx2n19yknnwalazcjzd"; }; patches = [ -- cgit 1.4.1 From 181e97175556db5692a19ea6d7be3705568757d2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 6 May 2019 00:39:22 -0500 Subject: linux: add 5.1 release Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.1.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix new file mode 100644 index 0000000000000..648be21f4cd50 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.1"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0hghjkxgf1p8mfm04a9ckjvyrnp71jp3pbbp0qsx35rzwzk7nsnh"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 676858dc5110c..701342281feac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15070,6 +15070,13 @@ in ]; }; + linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15262,7 +15269,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_0; + linuxPackages_latest = linuxPackages_5_1; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15273,6 +15280,8 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); + linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); + # When adding to this list: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. -- cgit 1.4.1 From 0a4cd28f84ed85eec38b0fc53f2b2079a13da2f2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 6 May 2019 01:12:02 -0500 Subject: linuxPackages.bcc: 0.8.0 -> 0.9.0 Requires a minor tweak to the deadlock detector patch (the file was renamed in the upstream repo). bcc now also wants a copy of libbpf, which it doesn't have in the source release tarball. Clone a copy from GiHub that's synchronized with the release, and put it in place. Tested on Linux 5.1 (with bpftrace as well). Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/bcc/default.nix | 46 +++++++++++++++------- .../linux/bcc/fix-deadlock-detector-import.patch | 4 +- 2 files changed, 33 insertions(+), 17 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 885de8163be3e..013c847112bb7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,20 +4,33 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.8.0"; + version = "0.9.0"; name = "bcc-${version}"; - src = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "v${version}"; - sha256 = "15vvybllmh9hdj801v3psd671c0qq2a1xdv73kabb9r4fzgaknxk"; - }; + srcs = [ + (fetchFromGitHub { + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "0gi12bsjaw1d77rx11wkdg4szcydwy55z6mkx558nfvdym0qj7yw"; + name = "bcc"; + }) + # note: keep this in sync with the version that was used at the time of the + # tagged release! + (fetchFromGitHub { + owner = "libbpf"; + repo = "libbpf"; + rev = "5beb8a2ebffd1045e3edb9b522d6ff5bb477c541"; + sha256 = "19n6baqj0mbaphzxkpn09m5a7cbij7fxap8ckk488nxqdz7nbsal"; + name = "libbpf"; + }) + ]; + sourceRoot = "bcc"; format = "other"; - buildInputs = [ - llvmPackages.llvm llvmPackages.clang-unwrapped kernel + buildInputs = with llvmPackages; [ + llvm clang-unwrapped kernel elfutils luajit netperf iperf systemtap.stapBuild flex ]; @@ -28,6 +41,7 @@ python.pkgs.buildPythonApplication rec { ./fix-deadlock-detector-import.patch ]; + propagatedBuildInputs = [ python.pkgs.netaddr ]; nativeBuildInputs = [ makeWrapper cmake flex bison ] # libelf is incompatible with elfutils-libelf ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; @@ -44,9 +58,11 @@ python.pkgs.buildPythonApplication rec { patch -p1 < libbcc-path.patch ''; - propagatedBuildInputs = [ - python.pkgs.netaddr - ]; + preConfigure = '' + chmod -R u+w ../libbpf/ + rmdir src/cc/libbpf + (cd src/cc && ln -svf ../../../libbpf/ libbpf) + ''; postInstall = '' mkdir -p $out/bin $out/share @@ -71,8 +87,8 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Dynamic Tracing Tools for Linux"; - homepage = https://iovisor.github.io/bcc/; - license = licenses.asl20; - maintainers = with maintainers; [ ragge mic92 ]; + homepage = https://iovisor.github.io/bcc/; + license = licenses.asl20; + maintainers = with maintainers; [ ragge mic92 thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch index 87ce618a0dd9d..1c422635f4fef 100644 --- a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch +++ b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch @@ -1,5 +1,5 @@ ---- source.org/tools/deadlock_detector.py 1980-01-02 00:00:00.000000000 +0000 -+++ source/tools/deadlock_detector.py 2018-05-29 13:57:11.807126673 +0100 +--- source.org/tools/deadlock.py 1980-01-02 00:00:00.000000000 +0000 ++++ source/tools/deadlock.py 2018-05-29 13:57:11.807126673 +0100 @@ -44,9 +44,8 @@ # # 01-Feb-2017 Kenny Yu Created this. -- cgit 1.4.1 From 150bad7cbd81965f4befe694fd96db60694d3ed3 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 6 May 2019 18:04:44 +0800 Subject: cargo-bloat: 0.6.2 -> 0.6.3 --- .../tools/rust/cargo-bloat/cargo-lock.patch | 19 +++++++++++++++++++ pkgs/development/tools/rust/cargo-bloat/default.nix | 7 ++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch (limited to 'pkgs') diff --git a/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch b/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch new file mode 100644 index 0000000000000..006f996f43c22 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch @@ -0,0 +1,19 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 01d38a8..e74e735 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,3 +1,5 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. + [[package]] + name = "adler32" + version = "1.0.3" +@@ -41,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "cargo-bloat" +-version = "0.6.2" ++version = "0.6.3" + dependencies = [ + "goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index d3ded6e9f589b..541c87a3ca834 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0wf86r1s9skv0m4gp66g388847309nw9z1h8gadfg2c5w5idh3fb"; + sha256 = "0jpwaw8ryfvfw5ypjvli18wwv6l1r6dyz1msipdpy7nvw1qdw54h"; }; - cargoSha256 = "1mmfcvpwwi6fjb47fz1azrpdkg1x5p3qn5bx4p6dyjcs1fmpdbbq"; + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "1275jfzkpkzbwv927hdkv4zplmynwrm7sbirq18dwfss55cm7r7z"; meta = with stdenv.lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; -- cgit 1.4.1 From 80d58e2bf5c947e8117e4b61cef658ecec64f0d0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 3 May 2019 18:20:10 -0500 Subject: swift: move most inputs to nativeBuildInputs --- pkgs/development/compilers/swift/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 31e2e806fbc4d..09ec1ccfe2606 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -135,23 +135,25 @@ in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; - buildInputs = devInputs ++ [ + nativeBuildInputs = [ autoconf automake bash - clang cmake coreutils + findutils + gnumake libtool + makeWrapper ninja perl pkgconfig python rsync which - findutils - makeWrapper - gnumake + ]; + buildInputs = devInputs ++ [ + clang ]; # TODO: Revisit what's propagated and how -- cgit 1.4.1 From 8cba1c77278bfb906b95979987e38a7a1b9b4be4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 3 May 2019 18:21:01 -0500 Subject: swift: install "editor-integration" component as well --- pkgs/development/compilers/swift/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 09ec1ccfe2606..33f4d2a33fce6 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -231,7 +231,9 @@ stdenv.mkDerivation rec { -e 's/^validation-test$/# \0/' \ -e 's/^long-test$/# \0/' \ -e 's/^stress-test$/# \0/' \ - -e 's/^test-optimized$/# \0/' + -e 's/^test-optimized$/# \0/' \ + \ + -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' # https://bugs.swift.org/browse/SR-10559 patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch} -- cgit 1.4.1 From 4f80ddcef5ce6b7e9e6979b51801cb8f2e8dff70 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 6 May 2019 10:48:50 +0000 Subject: pipenv: fix missing dependency issue (#61027) --- pkgs/development/tools/pipenv/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index f51ce6fcfaba1..681e0685f803f 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,6 +18,7 @@ buildPythonApplication rec { pip requests virtualenv + virtualenv-clone ]; doCheck = false; -- cgit 1.4.1 From 12ee718d1909cc5a6ec5299077a6d9b7fa41ee3b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 6 May 2019 06:00:00 -0500 Subject: postgresqlPackages: enable on platforms where PostgreSQL is supported --- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_similarity.nix | 2 +- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 2 +- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index a6e2c590f3857..54fc891acecd8 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Columnar storage for PostgreSQL"; homepage = https://www.citusdata.com/; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index f91a8b1bf2529..16104e66b7343 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "HyperLogLog for PostgreSQL"; homepage = https://www.citusdata.com/; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 32945c9fa62b3..ee50bee033b34 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). ''; - platforms = stdenv.lib.platforms.linux; + platforms = postgresql.meta.platforms; license = stdenv.lib.licenses.gpl2; maintainers = with lib.maintainers; [ danbst ]; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 8ec2d6719a4eb..1c1f3dcb87ed5 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = https://github.com/citusdata/postgresql-topn; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.agpl3; }; } diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index dbffab79a13eb..4b321bbbc4fbd 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = https://github.com/tds-fdw/tds_fdw; maintainers = [ maintainers.steve-chavez ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.postgresql; }; } -- cgit 1.4.1 From 361e9185c83166b44419e05e75fc8473875df6ea Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Sat, 4 May 2019 19:09:31 +0200 Subject: linkchecker: fix bad interaction with python3 Previously, `nix-shell -p linkchecker python3` would lead to a broken `python3` command. That's because Python 2 packages would pollute the environment and confuse the interpreter. `linkchecker` has propagated build inputs. So the solution is to use `pythonPath` instead, to avoid the pollution. --- pkgs/tools/networking/linkchecker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6e13d7fb94cbb..acc6893d0cd56 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { version = "9.3.1"; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = (with python2Packages; [ + pythonPath = (with python2Packages; [ requests ]) ++ [ gettext ]; -- cgit 1.4.1 From 47c78acd8e3a0530bffb990b88ea4808cf6c0c7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 May 2019 05:30:33 -0700 Subject: utf8proc: 2.2.0 -> 2.3.0 (#59724) * utf8proc: 2.2.0 -> 2.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/utf8proc/versions * utf8proc: use fetchFromGitHub --- pkgs/development/libraries/utf8proc/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 5b05f9ffef4a2..72f6f57553fb4 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "utf8proc-${version}"; - version = "2.2.0"; + pname = "utf8proc"; + version = "2.3.0"; - src = fetchurl { - url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "1gsxxp7vk36z1g5mg19kq10j35dks5f9slsab2xfazh5vgdx33rz"; + src = fetchFromGitHub { + owner = "JuliaStrings"; + repo = pname; + rev = "v${version}"; + sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; }; makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; - homepage = https://julialang.org/utf8proc; + homepage = "https://juliastrings.github.io/utf8proc/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.ftrvxmtrx ]; -- cgit 1.4.1 From 40c69a36cf97fd9086984b98f9db6af95c331102 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 May 2019 13:35:17 +0200 Subject: hackage2nix: update list of broken builds --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5952cbd16c2bb..559f1d43496a4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7172,6 +7172,8 @@ broken-packages: - NestedFunctor - nestedmap - net-spider + - net-spider-pangraph + - net-spider-rpl - netclock - netcore - netease-fm @@ -7219,6 +7221,7 @@ broken-packages: - neural-network-hmatrix - newhope - newports + - newsletter-mailgun - newt - newtype-deriving - newtype-th -- cgit 1.4.1 From 92d522154c1143d2aeeba33d984fb008112980ea Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 5 May 2019 00:48:50 +0200 Subject: hackage2nix: Unmark hnix as broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 559f1d43496a4..c8610fcae61c9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5614,7 +5614,6 @@ broken-packages: - Hmpf - hmt-diagrams - hmumps - - hnix - HNM - hnormalise - ho-rewriting -- cgit 1.4.1 From 06026f28f34bad64eb24f856ee6c04064db6f5e7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 May 2019 20:14:01 +0200 Subject: classy-prelude-yesod: fix build by skipping haddock --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4aa21ca04d55a..3b0827a71140c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -142,6 +142,7 @@ self: super: { feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; + classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979 # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c8610fcae61c9..6fe34177345f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3495,7 +3495,6 @@ broken-packages: - ClassLaws - classy-miso - classy-parallel - - classy-prelude-yesod - ClassyPrelude - clay - clckwrks diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 97ac7757e8a4d..72f43ab1833dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50385,7 +50385,6 @@ self: { description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "classyplate" = callPackage -- cgit 1.4.1 From 7ddf8995824244e077f8c3ebbe369ca03e4805ef Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 May 2019 20:14:15 +0200 Subject: esqueleto: fix build by skipping tests and haddock --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3b0827a71140c..db7aa06d6de4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1263,4 +1263,8 @@ self: super: { lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; }); lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; }); + # Some tests depend on a postgresql instance + # Haddock failure: https://github.com/haskell/haddock/issues/979 + esqueleto = dontHaddock (dontCheck super.esqueleto); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6fe34177345f8..a9d1d2f91838e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4322,7 +4322,6 @@ broken-packages: - esotericbot - EsounD - espial - - esqueleto - ess - estimators - EstProgress -- cgit 1.4.1 From 2c86fc4dafd5dfa63aac00bf11c8c1deeaff0c65 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 May 2019 22:16:45 +0200 Subject: yesod-markdown: unbreak as it builds fine --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9d1d2f91838e..ee67a5f1d2481 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9940,7 +9940,6 @@ broken-packages: - yesod-links - yesod-lucid - yesod-mangopay - - yesod-markdown - yesod-paginate - yesod-pagination - yesod-paginator -- cgit 1.4.1 From fd26fa9c1e60085a3c4220588186ad8e0a1be4c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 02:31:16 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.2-10-gb2ea1c2 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4d015cbe2f0b48157c22568cb3ad5bb8c21432c8. --- .../haskell-modules/hackage-packages.nix | 1560 ++++++++++++++++---- 1 file changed, 1279 insertions(+), 281 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 72f43ab1833dc..8a418be8b7695 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -942,15 +942,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Allure_0_9_4_1" = callPackage + "Allure_0_9_5_0" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers }: mkDerivation { pname = "Allure"; - version = "0.9.4.1"; - sha256 = "05zmidzwl24aqzgvnbv3hmsav7a6wq90qjhiirrbqpck3c33xqb9"; + version = "0.9.5.0"; + sha256 = "0cl1r3rcbkj8q290l3q5xva7lkh444s49xz8bm8sbgrk0q3zx041"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11812,7 +11812,7 @@ self: { broken = true; }) {}; - "LambdaHack_0_9_4_1" = callPackage + "LambdaHack_0_9_5_0" = callPackage ({ mkDerivation, assert-failure, async, base, base-compat, binary , bytestring, containers, deepseq, directory, enummapset, filepath , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter @@ -11822,8 +11822,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.9.4.1"; - sha256 = "05p80yrfa5v5fq7zyhwpd8ndbw2kgc7a6i2hnikb222lna99b6gk"; + version = "0.9.5.0"; + sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -12222,6 +12222,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6.2"; + sha256 = "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -23633,6 +23655,32 @@ self: { pname = "aeson-typescript"; version = "0.1.1.0"; sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp"; + revision = "1"; + editedCabalFile = "1y5baadwfpyszd78dfbcln93ypg7ai6qvbdz7r95ili8p0vwikbk"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process template-haskell temporary text + th-abstraction unordered-containers + ]; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "aeson-typescript_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, template-haskell + , temporary, text, th-abstraction, unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.2.0"; + sha256 = "16bbl91fxd7xmr4qam2dbzksh9sci7c4rhxyyxbiwq387x028hrc"; libraryHaskellDepends = [ aeson base containers interpolate mtl template-haskell text th-abstraction unordered-containers @@ -28400,6 +28448,8 @@ self: { pname = "antagonist"; version = "0.1.0.30"; sha256 = "1bgsal1030ydg05pn5xd8gdnpm68pmd135n52dqh5cwhjmhzc0g6"; + revision = "1"; + editedCabalFile = "0hm0flgi9h1y84pspr2921skwybrs490yazbs8pz8wi0bhvfg1bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28449,6 +28499,8 @@ self: { pname = "anticiv"; version = "0.1.0.5"; sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh"; + revision = "1"; + editedCabalFile = "0r2dllym065wi443g2i20sarqmr12dm0z6q515djzq33kdkjddyc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28519,14 +28571,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_0" = callPackage + "antiope-athena_7_0_1" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.0"; - sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an"; + version = "7.0.1"; + sha256 = "1dmpsxkgk7wbzl5bhnz5fnx911pvwmrcplnbqqsf90x2fpaaxcgx"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28544,8 +28596,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.0"; - sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb"; + version = "7.0.1"; + sha256 = "1s00kvwhxhcismzd2vcnhg2nqc4p4nhwh4brz5xfbm7bhgy8dnms"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28577,7 +28629,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_0" = callPackage + "antiope-core_7_0_1" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28585,8 +28637,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.0"; - sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr"; + version = "7.0.1"; + sha256 = "08pcrafsf4kkr8hr0l478yv2nxdlcqar19zmkm6j4d8gyayygsmx"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28623,15 +28675,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_0" = callPackage + "antiope-dynamodb_7_0_1" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.0"; - sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m"; + version = "7.0.1"; + sha256 = "1za5x7ap2af85zv3gcg2pwqyhry2899n6zj0s43i9y540bkn3iqf"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28669,7 +28721,7 @@ self: { broken = true; }) {}; - "antiope-messages_7_0_0" = callPackage + "antiope-messages_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28677,8 +28729,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.0"; - sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma"; + version = "7.0.1"; + sha256 = "0n6p54cd2cvr3ycr6a99qf2ib41jggkdh4b9hrid6132xvysfbp2"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28694,6 +28746,25 @@ self: { broken = true; }) {}; + "antiope-optparse-applicative" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base + , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text + }: + mkDerivation { + pname = "antiope-optparse-applicative"; + version = "7.0.1"; + sha256 = "018jnswibppmr3qzk6bn64r3xg55msp4bzmcg99vkr6nzgjl1zad"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base optparse-applicative text + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec + hw-hspec-hedgehog + ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + }) {}; + "antiope-s3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core , attoparsec, base, bytestring, conduit, conduit-extra, exceptions @@ -28721,7 +28792,7 @@ self: { broken = true; }) {}; - "antiope-s3_7_0_0" = callPackage + "antiope-s3_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28730,8 +28801,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.0"; - sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic"; + version = "7.0.1"; + sha256 = "04c6fdi45g9pqbinzfjqzjda94h65q3ch3fxmbp8iy33wmhhgldv"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28769,15 +28840,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_0" = callPackage + "antiope-sns_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.0"; - sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh"; + version = "7.0.1"; + sha256 = "0a2knafiq48xp8lxsfzvh1kkf0k3dschvhhxw3avs4s8ycfap7kk"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28816,7 +28887,7 @@ self: { broken = true; }) {}; - "antiope-sqs_7_0_0" = callPackage + "antiope-sqs_7_0_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -28824,8 +28895,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.0"; - sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07"; + version = "7.0.1"; + sha256 = "0w4fy5dlsf650i672iwa5ixi9pi4n9g3iyn42hf5zbnbdxc0m6yf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri text @@ -31294,7 +31365,7 @@ self: { broken = true; }) {}; - "asif_6_0_0" = callPackage + "asif_6_0_1" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -31304,8 +31375,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "6.0.0"; - sha256 = "1kiafpfr1xgbsp2j0fdyiavp6b8lbnrfcfvczbhbwm6vy0w0l4bq"; + version = "6.0.1"; + sha256 = "1lbz2i0ijr23vsc3b064khz3kzj1jwikwxcmjlnzkqvgnbr70grw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32230,6 +32301,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_3" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.3"; + sha256 = "03n5dmyplrqgbyf8dr91izkxci7gkl3i3fnp82i5ld869zrgjfh0"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -36841,6 +36924,8 @@ self: { pname = "bifunctors"; version = "5.5.4"; sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9"; + revision = "1"; + editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -39242,6 +39327,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bits_0_5_2" = callPackage + ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl + , transformers + }: + mkDerivation { + pname = "bits"; + version = "0.5.2"; + sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base bytes mtl transformers ]; + testHaskellDepends = [ base doctest ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39761,8 +39862,8 @@ self: { pname = "blank-canvas"; version = "0.6.2"; sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "4"; - editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw"; + revision = "5"; + editedCabalFile = "1csa2lsr4jv9x3867l1nbd1brnvw10q9qla027r19csscx5pg726"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -39781,20 +39882,18 @@ self: { "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers - , data-default-class, directory, http-types, kansas-comet + , data-default-class, directory, fail, http-types, kansas-comet , mime-types, process, scotty, semigroups, shake, stm, text , text-show, time, transformers, unix, vector, wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.6.3"; - sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; - revision = "2"; - editedCabalFile = "0sybv2swx9gwpkjh704xfmilm9jhdb66jqc296agpzp85s2s75zz"; + version = "0.7"; + sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring - colour containers data-default-class http-types kansas-comet + colour containers data-default-class fail http-types kansas-comet mime-types scotty semigroups stm text text-show transformers vector wai wai-extra warp ]; @@ -42073,6 +42172,8 @@ self: { pname = "bronyradiogermany-common"; version = "1.0.0.1"; sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy"; + revision = "1"; + editedCabalFile = "158y92fki5kk8pk7z5whc70qbw0w17v0j0zn486hym3bq6qif74k"; libraryHaskellDepends = [ aeson base bytestring network-uri text time tz uuid-types ]; @@ -42089,6 +42190,8 @@ self: { pname = "bronyradiogermany-streaming"; version = "1.0.0.1"; sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09"; + revision = "1"; + editedCabalFile = "0zhgpm0yxr9ablrc4b99wpwpj1qv2a8bq8mpz525ni17jix3iqc8"; libraryHaskellDepends = [ aeson base bronyradiogermany-common bytestring case-insensitive http-types mtl streaming streaming-bytestring streaming-utils text @@ -44065,31 +44168,33 @@ self: { "cabal-cache" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , antiope-core, antiope-s3, base, bytestring, conduit-extra - , containers, cryptonite, deepseq, directory, exceptions, filepath - , generic-lens, hedgehog, hspec, hspec-discover, http-types - , hw-hedgehog, hw-hspec-hedgehog, lens, mtl, optparse-applicative - , process, raw-strings-qq, resourcet, selective, stringsearch, tar + , antiope-core, antiope-optparse-applicative, antiope-s3, base + , bytestring, conduit-extra, containers, cryptonite, deepseq + , directory, exceptions, filepath, generic-lens, hedgehog, hspec + , hspec-discover, http-client, http-types, hw-hedgehog + , hw-hspec-hedgehog, lens, mtl, optparse-applicative, process + , raw-strings-qq, resourcet, selective, stm, stringsearch, tar , temporary, text, time, unliftio, zlib }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.1"; - sha256 = "030hnkbs3cpcab7yczh12f6zmngwnbl4jgy73hkaipwkzc1qw0sc"; + version = "1.0.0.2"; + sha256 = "15m83x0bnk47cmcpni5qlln9caj742ggb36fhw1pp1fjfkard00m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 - base bytestring conduit-extra containers cryptonite deepseq - directory exceptions filepath generic-lens http-types lens mtl - optparse-applicative process resourcet selective stringsearch tar - temporary text time unliftio zlib + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-optparse-applicative antiope-s3 base bytestring + conduit-extra containers cryptonite deepseq directory exceptions + filepath generic-lens http-client http-types lens mtl + optparse-applicative process resourcet selective stm stringsearch + tar temporary text time unliftio zlib ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - aeson antiope-core antiope-s3 base bytestring filepath generic-lens - hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens raw-strings-qq - text + aeson antiope-core antiope-s3 base bytestring containers filepath + generic-lens hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens + raw-strings-qq text ]; testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; @@ -46509,6 +46614,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "case-insensitive_1_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.1.0"; + sha256 = "01p40hfjyldfds5jg6vlvvn3ihs4ki63xn6fh8yzngaz1izc2v99"; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "case-insensitive-match" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl , QuickCheck, random-strings, tagsoup, text @@ -46995,20 +47118,20 @@ self: { }) {}; "caster" = callPackage - ({ mkDerivation, base, bytestring, directory, fast-builder + ({ mkDerivation, base, bytestring, directory, fast-builder, mtl , QuickCheck, quickcheck-instances, stm, tasty, tasty-discover , tasty-hunit, tasty-quickcheck, text, unix-time }: mkDerivation { pname = "caster"; - version = "0.0.1.0"; - sha256 = "0yybmrlqfki2v2952gf5xhfh5nr4dj0ldq780landjwh2ywrdcvq"; + version = "0.0.3.0"; + sha256 = "0wmczsiv7cf1yx82yd8da90fab5y8p3mgazfhssv6jd19iaxrakj"; libraryHaskellDepends = [ base bytestring fast-builder stm text unix-time ]; testHaskellDepends = [ - base bytestring directory fast-builder QuickCheck - quickcheck-instances tasty tasty-discover tasty-hunit + base bytestring directory fast-builder mtl QuickCheck + quickcheck-instances stm tasty tasty-discover tasty-hunit tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; @@ -48408,6 +48531,8 @@ self: { pname = "chatty"; version = "0.7.0.1"; sha256 = "0d7cfp3vvrmn7b6lc83j5pi7a90sk1rc1y48zb78f8plipp7ngb6"; + revision = "1"; + editedCabalFile = "1vh058qw0wphwn0l1lchhxms96p9bhsjna4j7lyvczmc9ba2mgdp"; libraryHaskellDepends = [ ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix @@ -48422,6 +48547,8 @@ self: { pname = "chatty-text"; version = "0.6.2.1"; sha256 = "00f3h0vw0mxrcqjfwas9ddx9hhcvfzvy0p43xqq29ibwdcgms3w2"; + revision = "1"; + editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v"; libraryHaskellDepends = [ base chatty transformers ]; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; @@ -48435,6 +48562,8 @@ self: { pname = "chatty-utils"; version = "0.7.3.4"; sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys"; + revision = "1"; + editedCabalFile = "0b1bvxkp1yhw3ws12mkdys5dnml03phzj03sqkrk1289jm5nlfn9"; libraryHaskellDepends = [ base mtl text transformers ]; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; @@ -50384,7 +50513,6 @@ self: { ]; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classyplate" = callPackage @@ -51959,6 +52087,8 @@ self: { pname = "co-log"; version = "0.2.0"; sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr"; + revision = "1"; + editedCabalFile = "0np7g6sqm6iyjyrypwlgrz67n0vhasvgp1k6cwrcj2lnmvjcrmvl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51971,6 +52101,35 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, chronos + , co-log-core, containers, contravariant, directory, filepath + , hedgehog, markdown-unlit, mtl, stm, text, transformers + , typerep-map + }: + mkDerivation { + pname = "co-log"; + version = "0.3.0.0"; + sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; + revision = "1"; + editedCabalFile = "0qf4icy6mrvkwc8kd4w3x47ckhqsx5d5zqpc6cd9qcv1r6pw2vhj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring chronos co-log-core containers + contravariant directory filepath mtl stm text transformers + typerep-map + ]; + executableHaskellDepends = [ + base co-log-core mtl text typerep-map + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base co-log-core hedgehog ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "co-log-core" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -51983,6 +52142,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-core_0_2_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.2.0.0"; + sha256 = "0q0vhk100qm6dfdfnbgg1mr07d1lzwbfkpkm0ivinfhaz2vnsr2j"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "co-log-polysemy" = callPackage + ({ mkDerivation, base, co-log-core, polysemy }: + mkDerivation { + pname = "co-log-polysemy"; + version = "0.0.0.0"; + sha256 = "02kv0r3ijv410lv9wz40mw4vgv4fmhgrxwppz4l0p50wyra5vq04"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base co-log-core polysemy ]; + executableHaskellDepends = [ base co-log-core polysemy ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "co-log-sys" = callPackage ({ mkDerivation, aeson, base, co-log-core, fmt, microlens , monad-control, mtl, network, universum, unix @@ -52786,6 +52972,8 @@ self: { pname = "colour"; version = "2.3.3"; sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; + revision = "1"; + editedCabalFile = "0r0pgrsbk4a3fp9pig7q1d8wrc6cd411gb58qiq3wd5dqw0lbmjk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ]; description = "A model for human colour/color perception"; @@ -52810,6 +52998,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour_2_3_5" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.5"; + sha256 = "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -53333,6 +53539,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_5" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , distributive, doctest, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.5"; + sha256 = "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers distributive tagged transformers + transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -56146,8 +56371,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.1.1"; - sha256 = "08dggdvl4qgx376vh037ss2blha4x7qmf0xh0fjx4m4ljabg3k4f"; + version = "1.0.2.0"; + sha256 = "0czsxil1mzswm9l88df4lnrgsgp634n06k14vs6f4zh2s9xxb59g"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56608,6 +56833,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5_1" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5.1"; + sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant, semigroups , template-haskell, tuple-th @@ -58769,6 +59006,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_5_5_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, bytestring, cassava, code-page + , containers, criterion-measurement, deepseq, directory, exceptions + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.5.0"; + sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary bytestring + cassava code-page containers criterion-measurement deepseq + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec statistics text time + transformers transformers-compat vector vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-measurement" = callPackage ({ mkDerivation, aeson, base, base-compat, binary, containers , deepseq, vector @@ -60152,6 +60425,8 @@ self: { pname = "ctpl"; version = "0.1.0.4"; sha256 = "03vcy5qb4wg1wpqcpnr33nwfmyfq3fk01ga3vawh6alppingbvi9"; + revision = "1"; + editedCabalFile = "02wisimqzgjbpaw95fvmwqq97bh3zix710k672gcdbkqsx9x06kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base chatty-text chatty-utils ]; @@ -63327,31 +63602,31 @@ self: { "datadog-tracing" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , ffunctor, generic-random, hspec-golden-aeson, http-media, msgpack - , mtl, prettyprinter, QuickCheck, quickcheck-text, refined - , scientific, servant, servant-client, servant-server, tasty - , tasty-discover, tasty-hspec, text, time, unordered-containers - , vector, wai-extra, warp + , ffunctor, generic-random, hspec-golden-aeson, http-media + , jaeger-flamegraph, msgpack, mtl, prettyprinter, QuickCheck + , quickcheck-text, refined, scientific, servant, servant-client + , servant-server, tasty, tasty-discover, tasty-hspec, text, time + , unordered-containers, vector, wai-extra, warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.4.2"; - sha256 = "1yrig10a38sy6zkj18snqiv4r7b1gd16xk3ni9jm8vn7ls7niwcc"; + version = "1.5.0"; + sha256 = "0iagsvaw5fhb0p13mvgg1w60zyzqhb75mkhvw1lxb667xjjwan7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers ffunctor generic-random http-media - msgpack mtl prettyprinter QuickCheck quickcheck-text refined - scientific servant servant-client text time unordered-containers - vector + jaeger-flamegraph msgpack mtl prettyprinter QuickCheck + quickcheck-text refined scientific servant servant-client text time + unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring containers data-default mtl servant - servant-server text wai-extra warp + aeson base bytestring containers data-default jaeger-flamegraph mtl + servant servant-server text wai-extra warp ]; testHaskellDepends = [ - aeson base bytestring containers hspec-golden-aeson mtl servant - tasty tasty-hspec text + aeson base bytestring containers hspec-golden-aeson + jaeger-flamegraph mtl servant tasty tasty-hspec text ]; testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; @@ -65880,6 +66155,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.6"; + sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -73336,6 +73635,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "either_5_0_1_1" = callPackage + ({ mkDerivation, base, bifunctors, mtl, profunctors, QuickCheck + , semigroupoids, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "either"; + version = "5.0.1.1"; + sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2"; + libraryHaskellDepends = [ + base bifunctors mtl profunctors semigroupoids + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Combinators for working with sums"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "either-both" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -73392,8 +73710,8 @@ self: { pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; - revision = "5"; - editedCabalFile = "0jwzwqr4giinq6wvl46399454nm9vc5g6mc2k2mx4wjdcl07qbgm"; + revision = "6"; + editedCabalFile = "012y235n8k7hhx651l01xf88vgr2wskapbsn83w18ls1h1njqnzk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -73628,8 +73946,8 @@ self: { pname = "ekg-statsd"; version = "0.2.4.0"; sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y"; - revision = "2"; - editedCabalFile = "1l0lh77qy4kbybkys1d4gg563fc593w27wpf4k1cg9j6ix6y604x"; + revision = "3"; + editedCabalFile = "0va7fliya7g546f5qbc42bl7dyh74al38sspd2smjyl7a9d5mmlk"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -74467,6 +74785,17 @@ self: { broken = true; }) {}; + "embla" = callPackage + ({ mkDerivation, base, chronos }: + mkDerivation { + pname = "embla"; + version = "0.1"; + sha256 = "1nk689j21ghaiymqnddlf4j8pgb9z61xflfrcgxw3zrxiv5jslk6"; + libraryHaskellDepends = [ base chronos ]; + description = "execute actions periodically while avoiding drift"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "embroidery" = callPackage ({ mkDerivation, base, bytestring, dlist, gloss, haskell98, HCodecs , mtl @@ -75836,6 +76165,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_5" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.5"; + sha256 = "14hk7fvwxhh080flwc3l4wqv4r3c8bf6vcbvfnnvnzj4k3s9ssia"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -76063,8 +76420,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "esqueleto_3_0_0" = callPackage @@ -76094,7 +76449,6 @@ self: { description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ess" = callPackage @@ -77288,6 +77642,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_2" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.2"; + sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -78647,10 +79023,10 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1.1"; - sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; + version = "0.1.1.2"; + sha256 = "0jwndfsyc5p7da97658j14x5gynbifkx7ikg8k09ym9gizkrmdd2"; revision = "1"; - editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5"; + editedCabalFile = "0gpqpb6vmskw7l6k3q18cfb670azxldiirj9sapz043sqd5wc3di"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -82418,36 +82794,34 @@ self: { }) {}; "floskell" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , criterion, data-default, deepseq, directory, exceptions, filepath - , ghc-prim, haskell-src-exts, hspec, monad-dijkstra, monad-loops - , mtl, optparse-applicative, text, transformers + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, criterion, data-default, deepseq, directory + , exceptions, filepath, ghc-prim, haskell-src-exts, hspec + , monad-dijkstra, mtl, optparse-applicative, text, transformers , unordered-containers, utf8-string }: mkDerivation { pname = "floskell"; - version = "0.9.0"; - sha256 = "0zx61l6gggblb74ydsamjdvsdm8s8gzb8bmcl8sdhrq7bdbdmbav"; - revision = "2"; - editedCabalFile = "01ayyhmcj6jm4afwdgypd3p8xcrhrvc4g4rgpgi1vdbvwrw3jnb0"; + version = "0.10.0"; + sha256 = "169b69rjqyf3rmgm0hycphcarm4cwx46gg5zgshqg170lwchxf6l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers data-default haskell-src-exts - monad-dijkstra monad-loops mtl text transformers + aeson attoparsec base bytestring containers data-default directory + filepath haskell-src-exts monad-dijkstra mtl text transformers unordered-containers utf8-string ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath ghc-prim - haskell-src-exts optparse-applicative text unordered-containers + aeson-pretty base bytestring directory ghc-prim haskell-src-exts + optparse-applicative text ]; testHaskellDepends = [ - base bytestring deepseq directory exceptions haskell-src-exts hspec - monad-loops mtl text utf8-string + base bytestring deepseq exceptions haskell-src-exts hspec text + utf8-string ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq directory exceptions ghc-prim + base bytestring criterion deepseq exceptions ghc-prim haskell-src-exts text utf8-string ]; description = "A flexible Haskell source code pretty printer"; @@ -84395,6 +84769,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_1" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.1"; + sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, constraints, containers, data-fix, dlist , free, groups, hedgehog, kan-extensions, mtl, natural-numbers @@ -86907,6 +87299,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gc_0_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gc"; + version = "0.0.3"; + sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph"; + libraryHaskellDepends = [ base ]; + description = "Poor Richard's Memory Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gc-monitoring-wai" = callPackage ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types , text, transformers, unordered-containers, wai @@ -87587,15 +87991,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_6_0_1" = callPackage + "generic-data_0_7_0_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, generic-lens, one-liner, show-combinators, tasty , tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.6.0.1"; - sha256 = "0qahlf5vsnpy306xr9mpjif5hq21xzyw067051sfxv5k27gx4f1k"; + version = "0.7.0.0"; + sha256 = "156d8zx425bpghp903260x1fdgnvwkyd7483mdjdg5l54ff9via8"; libraryHaskellDepends = [ base base-orphans contravariant show-combinators ]; @@ -87657,6 +88061,8 @@ self: { pname = "generic-deriving"; version = "1.12.4"; sha256 = "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4"; + revision = "1"; + editedCabalFile = "16z0748pw4j28ib6vg5yzjm8wrarqkclr7l597q5zjxabjdn1ygj"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -91858,8 +92264,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190322"; - sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx"; + version = "7.20190503"; + sha256 = "127zhk8hfmhac1m31mkazcml5c4hxnbw8c5bn059njycvgw5was4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -97805,8 +98211,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.2"; - sha256 = "0kd73yxack1allp27l4pp4xsdw3rs3g44kbk6qadhdvrws7d105z"; + version = "0.3.1.3"; + sha256 = "1v63hp99q3idyq5hmrcax45yp22cswvfs0jj4s7vs94s918a0xg4"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -102236,6 +102642,22 @@ self: { broken = true; }) {}; + "hakyll-shortcut-links" = callPackage + ({ mkDerivation, base, hakyll, hspec, megaparsec, mtl, pandoc + , pandoc-types, shortcut-links, text + }: + mkDerivation { + pname = "hakyll-shortcut-links"; + version = "0.0.0.0"; + sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; + libraryHaskellDepends = [ + base hakyll megaparsec mtl pandoc-types shortcut-links text + ]; + testHaskellDepends = [ base hspec mtl pandoc text ]; + description = "Use shortcut-links in markdown file for Hakyll"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hal" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, envy , exceptions, http-conduit, http-types, mtl, text, time @@ -105159,8 +105581,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.30.0"; - sha256 = "0vr5bc3qkd0h6rb3s4bihg4m9g9z0vzjz6w4m4m2gkw7c1pnirvs"; + version = "0.0.31.0"; + sha256 = "1qxbpllkcf9ybp94f3bhy2w5l6164na0j72c2d4r1va0bzmni4lp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105584,33 +106006,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_11_0_0" = callPackage + "haskell-lsp_0_12_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, filepath, hashable, haskell-lsp-types , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec - , QuickCheck, quickcheck-instances, sorted-list, stm, text, time - , transformers, unordered-containers, vector, yi-rope + , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list + , stm, text, time, transformers, unordered-containers, vector }: mkDerivation { pname = "haskell-lsp"; - version = "0.11.0.0"; - sha256 = "09zpslvlqw68ywwlfmygyf5qsgfwxbiqijlxmjfc3j8annb8zcwz"; + version = "0.12.0.0"; + sha256 = "1l328s0r3ya00pp33g6v8nwj23n009ki8gikrgja0wgj4hn35d2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring containers data-default directory filepath hashable haskell-lsp-types hslogger lens mtl network-uri - parsec sorted-list stm text time unordered-containers yi-rope + parsec rope-utf16-splay sorted-list stm text time + unordered-containers ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope + hslogger lens mtl network-uri parsec rope-utf16-splay stm text time + transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers data-default directory filepath hashable hspec lens network-uri QuickCheck quickcheck-instances - sorted-list stm text yi-rope + rope-utf16-splay sorted-list stm text ]; testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; @@ -105657,17 +106080,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_11_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, scientific, text + "haskell-lsp-types_0_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.11.0.0"; - sha256 = "019kaw306hjnb98d1g9dq2q9r169qrqaxrxbkbjq083plxxjg6cx"; + version = "0.12.0.0"; + sha256 = "10f79vjknklp935lvd300gvvwbky8issgq5s68z4cg6v1xva5np0"; libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens + aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; @@ -107745,8 +108168,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.1"; - sha256 = "0n5c51if17gm6ldsbpapqwc4bdshbnkxd403ssfgy3b923cmqm1r"; + version = "0.14.3"; + sha256 = "1jjnymwaqd22dpciz2gnxynxz02gch13cvpgh66sny8vjwndcy07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110935,6 +111358,8 @@ self: { pname = "hedis"; version = "0.10.10"; sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs"; + revision = "1"; + editedCabalFile = "0fcpf0jqga8wh0ikbpkma8sw7f5376wbc9w9rsiqp51q8f23x04h"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -110949,7 +111374,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_2" = callPackage + "hedis_0_12_4" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -110957,8 +111382,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.2"; - sha256 = "13kvi01v2bbz8xn44s4plmzka8khz3a4hc6pinw1walpfi8kygsx"; + version = "0.12.4"; + sha256 = "1d1r0ghf1fpiiarpywx7j48bhc86q86lass3b837dcyfni8z2sxw"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -114882,8 +115307,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.11.2.0"; - sha256 = "17v9iqh9dhild0m67j2141yxv4hx5p59fjn51yl5q0jbib63gq14"; + version = "0.12.0.0"; + sha256 = "0d57q99p1ph70mmwanlyps7vfj6iph9wmx0nza2jlg6falr7wrbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115299,8 +115724,8 @@ self: { }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.3.0"; - sha256 = "1rjvhgy1bv5kzf8xkmpjndzclq16gc1ihalzn3swg8iyh91pqh89"; + version = "0.1.4.0"; + sha256 = "1sn23347mm9r4j45ba2jz4vw7swh6jgn5fds9xnwgr8rch9b0ljc"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -116094,8 +116519,6 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-core" = callPackage @@ -121268,6 +121691,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.0.3"; + sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions fail mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -121295,8 +121742,8 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "0.2.0"; - sha256 = "1yjkq6af7x1vyqxszdlb6fysv8q97q3424gycvqhdqjd8wf545b5"; + version = "0.2.1"; + sha256 = "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh"; libraryHaskellDepends = [ base containers directory exceptions hslua temporary ]; @@ -121318,6 +121765,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-text_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "0.2.1"; + sha256 = "1ikdwvvxhbd5wmfr85dzs2ccamh9rbbpgy899z7s1vlv5q1dj0hk"; + libraryHaskellDepends = [ base bytestring hslua text ]; + testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + description = "Lua module for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsluv-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, containers }: mkDerivation { @@ -127263,6 +127724,8 @@ self: { pname = "hxt-regex-xmlschema"; version = "9.2.0.3"; sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; + revision = "1"; + editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -130489,6 +130952,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, scientific, tagged + , template-haskell, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.7.0"; + sha256 = "1a9la9gm5brsh9rs9ai1a50kcdk75kw8jmrh1rd6xs4xiwdca819"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -130499,6 +130986,8 @@ self: { pname = "informative"; version = "0.1.0.27"; sha256 = "05h69883lmj9d80h847yig0ryl1a49y7pckdhq8gl9ahx3hzsgyh"; + revision = "1"; + editedCabalFile = "1bcdaykax075cal066v7j3f1jmbhkqpql0wkj3dny6ww9jdvq1ws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131582,15 +132071,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "interpolator_0_1_2" = callPackage + "interpolator_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, either, hspec , mono-traversable, mtl, product-profunctors, profunctors , QuickCheck, template-haskell, text }: mkDerivation { pname = "interpolator"; - version = "0.1.2"; - sha256 = "1kzqlwgpbzrq0flr90f9q359j8qjxll5adl9w5r9gp1yj3j7hrrz"; + version = "1.0.0"; + sha256 = "0kkasycgba525mag4362w8kirnxjydrmh7gjqk5xs6zgcp1ralb7"; libraryHaskellDepends = [ aeson base containers either mono-traversable mtl product-profunctors profunctors QuickCheck template-haskell text @@ -131859,6 +132348,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "invariant_0_5_3" = callPackage + ({ mkDerivation, array, base, bifunctors, comonad, containers + , contravariant, ghc-prim, hspec, hspec-discover, profunctors + , QuickCheck, StateVar, stm, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.5.3"; + sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp"; + libraryHaskellDepends = [ + array base bifunctors comonad containers contravariant ghc-prim + profunctors StateVar stm tagged template-haskell th-abstraction + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell98 invariant functors"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -132896,6 +133408,8 @@ self: { pname = "ironforge"; version = "0.1.0.36"; sha256 = "11fsph447c3cml0805zdf8454skd7v12ip0cflma6llp3cnfbbl6"; + revision = "1"; + editedCabalFile = "09xmdl9d92jg3l9b2j7crf2kkyhf7zw9vysvr8qfbrhwkkq8d56z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133963,19 +134477,20 @@ self: { }: mkDerivation { pname = "jaeger-flamegraph"; - version = "1.2.0"; - sha256 = "1ha7zngxr9nin3gyqwwv6bplvrrc2n3j9sl8fp2dmxpjfwpi9r7f"; + version = "1.3.0"; + sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka"; revision = "1"; - editedCabalFile = "0xv7828z08rfd1m29ib8vlvigbavx5ksc67vj57293qiq590a3xf"; - isLibrary = false; + editedCabalFile = "1q6hmjbj60h86zghzh18nyay705l1960fm7cl4j2fxizz9fll3mg"; + isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base QuickCheck ]; + libraryHaskellDepends = [ aeson base containers QuickCheck text ]; executableHaskellDepends = [ aeson base bytestring containers extra optparse-applicative text ]; - testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; + testHaskellDepends = [ + aeson base containers tasty tasty-hspec tasty-quickcheck text + ]; testToolDepends = [ tasty-discover ]; - doHaddock = false; description = "Generate flamegraphs from Jaeger .json dumps."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -136662,8 +137177,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "16"; - editedCabalFile = "1fnncjd9wjwrnl0247gizlvwklihjbfk21pad6a4mqnaa3li5672"; + revision = "17"; + editedCabalFile = "1qnjg28rkwxwn2f8xisbx4f8pqxw2d70mczrjbrbyvx6gkdqzvri"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -137785,8 +138300,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "3"; - editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0"; + revision = "4"; + editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -137840,6 +138355,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12_2" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12.2"; + sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -140334,6 +140868,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_6_0_12" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.12"; + sha256 = "0yqwalb3qxvmwx1gdss3sv7d8v4vzrnkvahq2b35y3lzi3fykpa7"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-js" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -143321,6 +143877,8 @@ self: { pname = "libmpd"; version = "0.9.0.9"; sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv"; + revision = "1"; + editedCabalFile = "16pzbmhyzlpxy2djmxrs0wrv8mad3ahb040lx5kmf57say3qxgdl"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -143948,8 +144506,8 @@ self: { pname = "lift-generics"; version = "0.1.2"; sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; - revision = "2"; - editedCabalFile = "171f8cpn0kw9psikx3n7cdwyqfwg8rr8gf1hja6g7pnm0683l5l8"; + revision = "3"; + editedCabalFile = "0ackkmjfqxyxhy9w03zlqvmi68la9yv4jf0sc8qdhyr5y30ac68s"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -143992,6 +144550,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_4" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.4"; + sha256 = "0cwl1d0wjpdk0v1l1qxiqiksmak950c8gx169c1q77cg0z18ijf9"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -144447,6 +145027,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_20_9" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.20.9"; + sha256 = "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -147925,22 +148534,22 @@ self: { broken = true; }) {}; - "lsp-test_0_5_2_0" = callPackage + "lsp-test_0_5_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix - , unordered-containers, yi-rope + , parser-combinators, process, rope-utf16-splay, text, transformers + , unix, unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.5.2.0"; - sha256 = "1yy9d2jljxiq869qq588b7pmdrv4z0fpb8aq3i5anwzk6bgw4lx2"; + version = "0.5.2.1"; + sha256 = "1yrcs6wln4sf8rns46q84rxhdd8la3mjpmmazp6yyhm0i288bifq"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers yi-rope + haskell-lsp lens mtl parser-combinators process rope-utf16-splay + text transformers unix unordered-containers ]; testHaskellDepends = [ aeson base data-default haskell-lsp hspec lens text @@ -148251,8 +148860,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.7.0.0"; - sha256 = "0sqzgmadm7a0lydsc9p7632sd37152f8xf8x4abdfnakqpdvni3m"; + version = "0.7.1"; + sha256 = "1crfq5z0acv8ci7cj62dg1sy9hmsgpzhjwrjky9rkfnjs2brbf0n"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -149332,24 +149941,22 @@ self: { }) {}; "mailgun" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, failure - , http-client, http-client-multipart, http-conduit, monad-control - , network, text, transformers + ({ mkDerivation, aeson, aeson-filthy, ascii, base, bytestring + , containers, exceptions, filepath, ini, lens, lens-aeson, machines + , mime-mail, mime-types, mtl, text, these, time, transformers + , unordered-containers, wreq }: mkDerivation { pname = "mailgun"; - version = "0.1.0.4"; - sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq"; - isLibrary = true; - isExecutable = true; + version = "0.2"; + sha256 = "10gmic7hks35wanzy16ivrnc9zqx586yjxiqmcmhvmkiwrpha3yi"; libraryHaskellDepends = [ - base bytestring conduit exceptions failure http-client - http-client-multipart http-conduit monad-control network text - transformers + aeson aeson-filthy ascii base bytestring containers exceptions + filepath ini lens lens-aeson machines mime-mail mime-types mtl text + these time transformers unordered-containers wreq ]; - executableHaskellDepends = [ base http-conduit text transformers ]; - description = "Connector to Rackspace's Mailgun Service"; - license = stdenv.lib.licenses.mit; + description = "API binding for Mailgun"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -150061,8 +150668,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.0"; - sha256 = "19p2yh8yrav6dljmw8mz3xnghxf2h9a5z5wqxnb6zsrl11mds95g"; + version = "0.5.0.2"; + sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -150074,7 +150681,7 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, array, base, call-stack, comonad + ({ mkDerivation, array, base, binary, call-stack, comonad , constrained-categories, containers, deepseq, free , free-vector-spaces, ieee754, lens, linear, linearmap-category , manifolds-core, MemoTrie, number-show, placeholders @@ -150084,11 +150691,11 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.1"; - sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07"; + version = "0.5.0.2"; + sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb"; libraryHaskellDepends = [ - array base call-stack comonad constrained-categories containers - deepseq free free-vector-spaces ieee754 lens linear + array base binary call-stack comonad constrained-categories + containers deepseq free free-vector-spaces ieee754 lens linear linearmap-category manifolds-core MemoTrie number-show placeholders pragmatic-show QuickCheck semigroups spatial-rotations tagged transformers vector vector-space void @@ -150108,8 +150715,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.1"; - sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3"; + version = "0.5.0.2"; + sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -150822,6 +151429,8 @@ self: { pname = "matchable-th"; version = "0.1.0.0"; sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3"; + revision = "1"; + editedCabalFile = "0az3cwf4gy0vhv0zqdvqpvk3j6ckhf1h2946kklvmij7z46x17ql"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -150898,6 +151507,28 @@ self: { broken = true; }) {}; + "math-interpolate" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "math-interpolate"; + version = "0.1.0.1"; + sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq"; + libraryHaskellDepends = [ base ]; + description = "Class for interpolation of values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "math-metric" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "math-metric"; + version = "0.1.0.1"; + sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx"; + libraryHaskellDepends = [ base ]; + description = "Typeclass for metric spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -153107,6 +153738,8 @@ self: { pname = "micro-recursion-schemes"; version = "5.0.2.2"; sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v"; + revision = "1"; + editedCabalFile = "0zdyg5w4fhdps5cirp21wpd6056v09381lmdf9mizfxilhx4wziy"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; libraryToolDepends = [ cpphs ]; testHaskellDepends = [ base HUnit template-haskell ]; @@ -154006,29 +154639,30 @@ self: { }) {}; "minilight" = callPackage - ({ mkDerivation, aeson, base, containers, exceptions, FontyFruity - , hashable, linear, microlens, microlens-mtl, mtl, mwc-random - , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty - , tasty-discover, tasty-hspec, template-haskell, text, trifecta + ({ mkDerivation, aeson, aeson-diff, base, caster, containers + , exceptions, FontyFruity, fsnotify, hashable, hashtables, lens + , linear, microlens, mtl, mwc-random, scientific, sdl2, sdl2-gfx + , sdl2-image, sdl2-ttf, tasty, tasty-discover, tasty-hspec + , template-haskell, text, transformers, trifecta , unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "minilight"; - version = "0.2.0"; - sha256 = "18kjzmqpm967z0560z09n7s61s21f13mkr6iwb5dp7a5vnwq8lxm"; + version = "0.3.0"; + sha256 = "0x251755hjrzkbbsvsb0ihrrmqw82dvcsp9f9xmvff0v0s1gfi24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers exceptions FontyFruity hashable linear - microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx - sdl2-image sdl2-ttf template-haskell text trifecta - unordered-containers uuid vector yaml + aeson aeson-diff base caster containers exceptions FontyFruity + fsnotify hashable hashtables lens linear mtl mwc-random scientific + sdl2 sdl2-gfx sdl2-image sdl2-ttf template-haskell text + transformers trifecta unordered-containers uuid vector yaml ]; executableHaskellDepends = [ base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector ]; testHaskellDepends = [ - aeson base tasty tasty-hspec trifecta yaml + aeson base tasty tasty-hspec trifecta vector yaml ]; testToolDepends = [ tasty-discover ]; description = "A SDL2-based graphics library, batteries-included"; @@ -154237,8 +154871,8 @@ self: { }: mkDerivation { pname = "minitypeset-opengl"; - version = "0.2.0.1"; - sha256 = "0vf2npnm4zpslwqr051v4im82h5al5nl9mq5f68pk03limgrf8ik"; + version = "0.3.0.0"; + sha256 = "10q5071gm98vc16k5mdck1gcdf6p8aa6612wlsqwawnq3f2hj7d0"; libraryHaskellDepends = [ base containers filepath OpenGL stb-truetype ]; @@ -161790,8 +162424,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.2.0.0"; - sha256 = "0xka2fa5zxznm2fg5xmc2c2ppamwybdlmh5jqy00ivxjmliy20s0"; + version = "0.3.0.0"; + sha256 = "1wz37rrjpk4v8h1mh6pbld84f9kp5h3qcjxxh6fgbkij5l4g7m77"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger safe-exceptions text time @@ -161806,6 +162440,45 @@ self: { broken = true; }) {}; + "net-spider-pangraph" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-discover + , greskell, hspec, net-spider, pangraph, text, time + }: + mkDerivation { + pname = "net-spider-pangraph"; + version = "0.1.0.0"; + sha256 = "1aiacaccml8477vmcnv9mqcrn87nyx7pbgwp7rppz7h5w0dsj8lx"; + libraryHaskellDepends = [ + base bytestring greskell net-spider pangraph text time + ]; + testHaskellDepends = [ + base doctest doctest-discover hspec net-spider pangraph text + ]; + description = "Conversion between net-spider and pangraph"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "net-spider-rpl" = callPackage + ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip + , net-spider, net-spider-pangraph, text, time + }: + mkDerivation { + pname = "net-spider-rpl"; + version = "0.1.0.0"; + sha256 = "0basbgcdkjksg9p2s5s0whnbas3w3wnrkkdsr907m8gppkdk6i69"; + libraryHaskellDepends = [ + aeson base greskell hashable ip net-spider net-spider-pangraph text + time + ]; + testHaskellDepends = [ base hspec net-spider text ]; + description = "NetSpider data model and utility for RPL networks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "netclock" = callPackage ({ mkDerivation, base, bytestring, hosc, network }: mkDerivation { @@ -163507,6 +164180,51 @@ self: { broken = true; }) {}; + "newsletter" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, clientsession + , email-validate, http-api-data, lens, machines, mime-mail, mtl + , network-uri, psqueues, random, servant, servant-blaze + , servant-server, stm, text, time, unordered-containers, warp + }: + mkDerivation { + pname = "newsletter"; + version = "0"; + sha256 = "1cpc0g8bzx7dzvvs3pn76q8y7fkcz2jbh26jfss8bpfy5rwnfmd1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring clientsession email-validate + http-api-data lens machines mime-mail mtl network-uri psqueues + random servant servant-blaze servant-server stm text time + unordered-containers + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring clientsession email-validate + http-api-data lens machines mime-mail mtl network-uri psqueues + random servant servant-blaze servant-server stm text time + unordered-containers warp + ]; + description = "A basic newsletter implimentation, using various backends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "newsletter-mailgun" = callPackage + ({ mkDerivation, base, exceptions, lens, machines, mailgun + , mime-mail, mtl, newsletter, text + }: + mkDerivation { + pname = "newsletter-mailgun"; + version = "0"; + sha256 = "1xzi6kb1mvvj0541l3dvyxwhlhwhw7iyrxqw585lhhinqzkp6zy0"; + libraryHaskellDepends = [ + base exceptions lens machines mailgun mime-mail mtl newsletter text + ]; + description = "A mailgun backend for the newsletter package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "newsynth" = callPackage ({ mkDerivation, base, Cabal, containers, fixedprec, random , superdoc, time @@ -166526,23 +167244,25 @@ self: { }) {}; "oidc-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , hspec, http-client, http-client-tls, http-types, jose-jwt - , network, network-uri, text, time, tls + ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptonite + , exceptions, hspec, http-client, http-client-tls, http-types + , jose-jwt, network, network-uri, scientific, text, time, tls }: mkDerivation { pname = "oidc-client"; - version = "0.3.0.1"; - sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk"; + version = "0.4.0.0"; + sha256 = "15lnxxmnpmkvz9zqgz8sq5lzjxvgc5x8a6hrizj3m0mzg9cvml0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring exceptions http-client - http-client-tls jose-jwt network network-uri text time tls + aeson attoparsec base bytestring cryptonite exceptions http-client + http-client-tls jose-jwt network network-uri scientific text time + tls ]; testHaskellDepends = [ - aeson base bytestring exceptions hspec http-client http-client-tls - http-types jose-jwt network-uri text time + aeson base bytestring cryptonite exceptions hspec http-client + http-client-tls http-types jose-jwt network-uri scientific text + time ]; description = "OpenID Connect 1.0 library for RP"; license = stdenv.lib.licenses.mit; @@ -169525,30 +170245,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_2" = callPackage - ({ mkDerivation, arithmoi, base, bytestring, criterion, cryptonite - , memory, protolude, QuickCheck, quickcheck-instances, random - , tasty, tasty-discover, tasty-hunit, tasty-quickcheck - , wl-pprint-text + "pairing_0_3_0" = callPackage + ({ mkDerivation, arithmoi, base, binary, bytestring, criterion + , cryptonite, errors, integer-logarithms, memory, protolude + , QuickCheck, quickcheck-instances, random, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck, wl-pprint-text }: mkDerivation { pname = "pairing"; - version = "0.2"; - sha256 = "06w1vp9cqzxpqlg3hs68qxn8mjm46bkh7b5428ac6wh7f1zzxw88"; + version = "0.3.0"; + sha256 = "1l8kkyb18qm3mv5jzqyj1wgxlnla0kcah42c2837siqlxwajjbsg"; libraryHaskellDepends = [ - arithmoi base bytestring cryptonite memory protolude QuickCheck - random wl-pprint-text + arithmoi base binary bytestring cryptonite errors + integer-logarithms memory protolude QuickCheck random + wl-pprint-text ]; testHaskellDepends = [ - arithmoi base bytestring cryptonite memory protolude QuickCheck - quickcheck-instances random tasty tasty-discover tasty-hunit - tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring cryptonite errors + integer-logarithms memory protolude QuickCheck quickcheck-instances + random tasty tasty-discover tasty-hunit tasty-quickcheck + wl-pprint-text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - arithmoi base bytestring criterion cryptonite memory protolude - QuickCheck quickcheck-instances random tasty tasty-hunit - tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring criterion cryptonite errors + integer-logarithms memory protolude QuickCheck quickcheck-instances + random tasty tasty-hunit tasty-quickcheck wl-pprint-text ]; description = "Optimal ate pairing over Barreto-Naehrig curves"; license = stdenv.lib.licenses.mit; @@ -171495,6 +172217,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsers_0_12_10" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, binary, bytestring + , charset, containers, mtl, parsec, QuickCheck + , quickcheck-instances, scientific, semigroups, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "parsers"; + version = "0.12.10"; + sha256 = "0v0smxbzk1qpdfkfqqmrzd2dngv3vxba10mkjn9nfm6a309izf8p"; + libraryHaskellDepends = [ + attoparsec base base-orphans binary charset containers mtl parsec + scientific semigroups text transformers unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring parsec QuickCheck quickcheck-instances + ]; + description = "Parsing combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parsers-megaparsec" = callPackage ({ mkDerivation, base, fail, megaparsec, mtl, parsers, semigroups , text, transformers @@ -173345,6 +174089,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "perfect-vector-shuffle" = callPackage + ({ mkDerivation, base, MonadRandom, primitive, QuickCheck + , quickcheck-instances, random, tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "perfect-vector-shuffle"; + version = "0.1.0"; + sha256 = "1nvwbmfqv9bq6423hxafjrvza6ynj3pry4m5ms1g2yf5vsx47w38"; + libraryHaskellDepends = [ + base MonadRandom primitive random vector + ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances random tasty tasty-quickcheck + vector + ]; + description = "Library for performing vector shuffles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "perfecthash" = callPackage ({ mkDerivation, array, base, bytestring, cmph, containers , criterion, deepseq, hspec, QuickCheck, random, time @@ -177074,20 +177837,20 @@ self: { "planb-token-introspection" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , exceptions, http-client, http-client-tls, http-types, lens, mtl - , random, safe-exceptions, tasty, tasty-hunit, text, th-format - , transformers, unliftio-core + , random, safe-exceptions, tasty, tasty-hunit, text, transformers + , unliftio-core }: mkDerivation { pname = "planb-token-introspection"; - version = "0.1.3.0"; - sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk"; + version = "0.1.4.0"; + sha256 = "0rgjvxs1bb6qz02g2y8b4cldmgn05kfzjbb81ny57724yv60xyp7"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-tls http-types mtl safe-exceptions text transformers ]; testHaskellDepends = [ aeson base bytestring containers exceptions http-client http-types - lens mtl random safe-exceptions tasty tasty-hunit text th-format + lens mtl random safe-exceptions tasty tasty-hunit text unliftio-core ]; description = "Token Introspection for PlanB"; @@ -178251,6 +179014,8 @@ self: { pname = "polynomial"; version = "0.7.3"; sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr"; + revision = "1"; + editedCabalFile = "1cn1fj9hlzwvk65rpn60n74bdzk2bdicwp2rqb34ps5sccvbm1ij"; libraryHaskellDepends = [ base deepseq pretty vector vector-space vector-th-unbox ]; @@ -178324,6 +179089,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy-zoo" = callPackage + ({ mkDerivation, base, containers, hspec, polysemy, polysemy-plugin + }: + mkDerivation { + pname = "polysemy-zoo"; + version = "0.1.0.0"; + sha256 = "0hiwv4fnila9ql3wxyni84z1209w7cd088gllw9n903qa41ncsqj"; + libraryHaskellDepends = [ + base containers polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base containers hspec polysemy polysemy-plugin + ]; + description = "Experimental, user-contributed effects and interpreters for polysemy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -181709,6 +182491,8 @@ self: { pname = "proc-net"; version = "1.0.0.2"; sha256 = "04zx462sj8kh21a8n7kk3jpcvdh6s64pvgdb0la0sxq0jycfybzz"; + revision = "1"; + editedCabalFile = "1ng8xnvzylj2f635kfwmdwhgjshbsmcm1x5c7bscz2m9x10brmhn"; libraryHaskellDepends = [ attoparsec base bytestring network unix ]; @@ -186098,6 +186882,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple_0_1_1_0" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.1.1.0"; + sha256 = "0rclb8ghakcrcw3sz9q8lvb2zh1a4lafb711mqpfl0csd3yvlia4"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-special" = callPackage ({ mkDerivation, base, QuickCheck, special-values }: mkDerivation { @@ -188496,6 +189292,34 @@ self: { broken = true; }) {}; + "rcu_0_2_4" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , containers, criterion, deepseq, doctest, fail, ghc-prim + , optparse-applicative, parallel, primitive, rdtsc, time + , transformers + }: + mkDerivation { + pname = "rcu"; + version = "0.2.4"; + sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base fail ghc-prim parallel primitive transformers + ]; + executableHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest parallel ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers + ]; + description = "Read-Copy-Update for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rdf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers @@ -189587,6 +190411,8 @@ self: { pname = "recursion-schemes"; version = "5.1.3"; sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj"; + revision = "1"; + editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -191355,6 +192181,35 @@ self: { broken = true; }) {}; + "registry_0_1_3_6" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.3.6"; + sha256 = "19wch1vd41r3hvgr9a1yjvbiz7fmib1qlhviqivsdd5apncgn2jk"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + hedgehog-corpus io-memoize MonadRandom mtl multimap protolude + random resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -198698,6 +199553,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_11_4" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, exceptions, fail + , hspec, hspec-discover, hspec-wai, http-types, lifted-base + , monad-control, mtl, nats, network, regex-compat, text + , transformers, transformers-base, transformers-compat, wai + , wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.11.4"; + sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring data-default-class directory hspec hspec-wai + http-types lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -200257,14 +201140,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_4" = callPackage + "semirings_0_4_1" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.4"; - sha256 = "0p5crw2n47nx76y9zsx3bpjb619wsi8p91wjq4pcw29jw6idvid0"; + version = "0.4.1"; + sha256 = "1zzq4x1x7fxj3zrzys1zbqidwmm7wh7ykxgr5f8bxysxbs98qjdp"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers ]; @@ -201576,6 +202459,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, free, http-client, http-types + , kan-extensions, optparse-applicative, profunctors, random + , recursion-schemes, servant, servant-client, servant-client-core + , servant-docs, servant-server, text, vinyl, warp + }: + mkDerivation { + pname = "servant-cli"; + version = "0.1.0.0"; + sha256 = "1jvdygdbz6rd4cnzp063a44m56b7dzskicbihjgkrpk73b9mvx7w"; + revision = "1"; + editedCabalFile = "06yzqhvzb9zmwidik05vndi4rphdbmciqij6azp3ng3ph8wmvd38"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers filepath free + http-types kan-extensions optparse-applicative profunctors + recursion-schemes servant servant-client-core servant-docs text + vinyl + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-client optparse-applicative + random servant servant-client servant-server text vinyl warp + ]; + description = "Command line interface for Servant API clients"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover @@ -217445,6 +218357,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "structs_0_1_2" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory + , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "structs"; + version = "0.1.2"; + sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4"; + revision = "1"; + editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell + ]; + testHaskellDepends = [ + base directory doctest filepath parallel primitive QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -218124,6 +219060,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; + revision = "1"; + editedCabalFile = "0cw9vzvmmg13iyqh9g12c6yblv4ibxzcn61n4y7s59zmy4rqxg65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218150,6 +219088,8 @@ self: { pname = "summoner-tui"; version = "0.1.0"; sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9"; + revision = "1"; + editedCabalFile = "0rjnrhh62m2jy74dqdiywkk2gqs1dds97h55qxc50qysdiiwmmal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223294,8 +224234,8 @@ self: { }: mkDerivation { pname = "tensor-safe"; - version = "0.1.0.0"; - sha256 = "077jy3k47aw182nsdi3352lq9h6zssc9dpm7vwv999ksysaymhpw"; + version = "0.1.0.1"; + sha256 = "1b69k6mbhd0qbxjij44fgaw8xdnripr27x7xy106192cj7x3q9xf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225239,7 +226179,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show_3_8_1" = callPackage + "text-show_3_8_2" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers , contravariant, criterion, deepseq, deriving-compat @@ -225250,8 +226190,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.8.1"; - sha256 = "18qaa89pfxqkwk7zpcr7r07b733dvl5ggnmcrl2cf9v9rza1gxiw"; + version = "3.8.2"; + sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -225277,30 +226217,28 @@ self: { , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time , pretty, QuickCheck, quickcheck-instances, random, semigroups - , tagged, template-haskell, terminfo, text, text-show, th-orphans - , time, transformers, transformers-compat, unix + , tagged, template-haskell, terminfo, text, text-short, text-show + , th-orphans, time, transformers, transformers-compat, unix , unordered-containers, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.7"; - sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; - revision = "1"; - editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z"; + version = "3.8"; + sha256 = "0n1bsvjnza6iyngsjavr7kh28hy78p7qf79plkjkb7xjskik6s0k"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml + semigroups tagged template-haskell terminfo text text-short + text-show time transformers transformers-compat unix + unordered-containers vector xhtml ]; testHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec old-locale old-time pretty QuickCheck quickcheck-instances random - tagged template-haskell terminfo text-show th-orphans time - transformers transformers-compat unix unordered-containers vector - xhtml + tagged template-haskell terminfo text-short text-show th-orphans + time transformers transformers-compat unix unordered-containers + vector xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -226055,6 +226993,8 @@ self: { pname = "th-orphans"; version = "0.13.7"; sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; + revision = "1"; + editedCabalFile = "1gf2rmphwgnqbbk4qcwfiprmsqp2d30xqlcxgs9h9ymazkwlh203"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -226224,6 +227164,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-utilities_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.3.0"; + sha256 = "0bl4j81k7szn0lza8rnn1db6glc57dsn63ni0hwbwr3kxa3pb4x4"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-orphans vector + ]; + description = "Collection of useful functions for use with Template Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, hackage-db, hspec, req, split, text @@ -226971,15 +227932,15 @@ self: { }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition-prelude, either, hspec - , hspec-megaparsec, megaparsec, text, text-show + ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec + , megaparsec, text }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.9"; - sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8"; + version = "0.1.1.10"; + sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia"; libraryHaskellDepends = [ - base composition-prelude either megaparsec text text-show + base composition-prelude megaparsec text ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec text @@ -228221,6 +229182,24 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tinylog_0_15_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , double-conversion, fast-logger, text, transformers, unix-time + }: + mkDerivation { + pname = "tinylog"; + version = "0.15.0"; + sha256 = "0pwdymx4kx3im9pzah0lmh64x7agdklf6dwqpjx93ybswi61cwfb"; + libraryHaskellDepends = [ + base bytestring containers double-conversion fast-logger text + transformers unix-time + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simplistic logging using fast-logger"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tinytemplate" = callPackage ({ mkDerivation, base, QuickCheck, text }: mkDerivation { @@ -231259,10 +232238,8 @@ self: { }: mkDerivation { pname = "ttl-hashtables"; - version = "1.3.0.0"; - sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; - revision = "1"; - editedCabalFile = "0nbf825s51pls4y0nc9jzik8z6szfvqd66dfjp6ybbywrrdzckf3"; + version = "1.3.1.0"; + sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h"; libraryHaskellDepends = [ base clock containers data-default failable hashable hashtables mtl transformers @@ -233479,8 +234456,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.3.1"; - sha256 = "15wgcf0q3xj3npb1ivfj8b0w78dwcz90fyxqp75wcnxyv2ksvd3m"; + version = "0.7.4.1"; + sha256 = "1nm74fj819kws9rrksk80gyrl3m5dxsm17bm2a18mp8dca76iix2"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -236051,14 +237028,14 @@ self: { }: mkDerivation { pname = "up"; - version = "1.0.0.4"; - sha256 = "03rlzqaj148mmxlr0h783z4cm2p7qsdzhx7s861mkfnra8pp84il"; + version = "1.0.0.5"; + sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath lambda-options mtl split ]; - description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; + description = "Command-line tool to generate paths for moving upward in a file system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -239879,23 +240856,23 @@ self: { "vt-utils" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, directory, http-client, http-types, HUnit - , parsec, process, text, time, transformers, unordered-containers - , vector, wai, warp + , case-insensitive, directory, either, hashable, http-client + , http-types, HUnit, parsec, process, text, time, transformers + , unordered-containers, vector, wai, warp }: mkDerivation { pname = "vt-utils"; - version = "1.2.0.0"; - sha256 = "1mbc4a8s6h3f5w3da2ln95050c1ssnh7pyj4i34nvmm5gqrb3jb9"; + version = "1.3.0.0"; + sha256 = "07xn1izv59h8b6nk294gyxcfn489n2f6fcpi5g9nkscr59hmkj2v"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory - http-client http-types HUnit parsec process text time transformers - unordered-containers vector wai + either hashable http-client http-types HUnit parsec process text + time transformers unordered-containers vector wai ]; testHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory - http-client http-types HUnit parsec process text time transformers - unordered-containers vector wai warp + either hashable http-client http-types HUnit parsec process text + time transformers unordered-containers vector wai warp ]; description = "Vector and Text utilities"; license = stdenv.lib.licenses.mit; @@ -241402,8 +242379,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.2"; sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; - revision = "1"; - editedCabalFile = "0n7i81jrjsrav8bpg31avrd18vh95l5z6bfj4fqkrdj4h1v6armi"; + revision = "2"; + editedCabalFile = "17vq38dh7x1kqzfwla1s0rldd5hzm5mcrx49sjlzy8b66gd2n3ac"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -242095,6 +243072,8 @@ self: { pname = "warp"; version = "3.2.27"; sha256 = "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76"; + revision = "1"; + editedCabalFile = "19ggrgki5rdmphpg0sh5n286yfzdz6pi31gksdbbpfzxk29wx4ab"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -243545,6 +244524,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-snap_0_10_3_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, io-streams + , mtl, snap-core, snap-server, websockets + }: + mkDerivation { + pname = "websockets-snap"; + version = "0.10.3.1"; + sha256 = "1hpszqb61xhbgfvxd6g56kdfxsyi14q7xh12jbdnyycbfijb9bqk"; + libraryHaskellDepends = [ + base bytestring bytestring-builder io-streams mtl snap-core + snap-server websockets + ]; + description = "Snap integration for the websockets library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webwire" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html , bytestring, case-insensitive, containers, cookie, cprng-aes @@ -244380,8 +245376,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "wizard"; - version = "0.1.0.0"; - sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l"; + version = "0.1.1"; + sha256 = "0bldcvd7zjask8myh1nwj59ml4q6wlinp2h7q6hdfjg8djf2mnca"; libraryHaskellDepends = [ base transformers ]; description = "the fantastical wizard monoid"; license = stdenv.lib.licenses.bsd3; @@ -246235,8 +247231,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.7.0"; - sha256 = "1b9qp3z0j3qpxwh8kczkarbqa0hb6x8wxm6by6j49qhd7fn6dkin"; + version = "0.8.0"; + sha256 = "1779i674hppv6samc73mq56pcyr2w69iw0p8qbqdmf3ixsaqhanf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246657,6 +247653,8 @@ self: { pname = "xkcd"; version = "0.1.1"; sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29"; + revision = "1"; + editedCabalFile = "0sy66hmwgk5mb9nxlqh7k1nzb2r6cw617sn31aaf54hwk0gkx32m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -249008,6 +250006,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; + revision = "1"; + editedCabalFile = "0i1nni9skh2xdp3z8gd137v0l7z8zxcmwhpaq1i4qbgx1llyi96b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -250778,8 +251778,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-media-simple" = callPackage -- cgit 1.4.1 From 3362111abfab25a60ac3d22f267ad5115bd32e7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2019 18:13:23 +0000 Subject: ghc-8.8.x: patch colour and dlist to fix their builds --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 2b58e5ce5e237..46da0f5f7920a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,5 +54,13 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; + colour = appendPatch super.colour (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/colour-2.3.4.patch"; + sha256 = "1h318dczml9qrmfvlz1d12iji86klaxvz63k9g9awibwz8lw2i79"; + }); + dlist = appendPatch super.dlist (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; + sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; + }); } -- cgit 1.4.1 From c83c1896967ce127ae44cb2052145d4a90d0cb03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2019 18:16:59 +0000 Subject: ghc-8.8.x: patch QuickCheck to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 46da0f5f7920a..3fa7f9ae2fa54 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -62,5 +62,9 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch"; sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc"; }); + QuickCheck = appendPatch super.QuickCheck (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; + sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; + }); } -- cgit 1.4.1 From fa5ebccbdff45039a3aa8cf6fb177ece2ccb32cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2019 18:27:48 +0000 Subject: ghc-8.8.x: patch regex-base to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 3fa7f9ae2fa54..bcc165fb5c3d0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -66,5 +66,11 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/QuickCheck-2.13.1.patch"; sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcvbl"; }); + regex-base = appendPatch super.regex-base (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; + sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcv1l"; + }); + + } -- cgit 1.4.1 From 5c100aad2abbfff42d384b0e03d35b377f8e6109 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2019 18:28:22 +0000 Subject: ghc-8.8.x: use latest git version of resolv to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index bcc165fb5c3d0..c05430d9d3f0a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,6 +54,18 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; + resolv = overrideCabal (overrideSrc super.resolv { + version = "20180411-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-hvr"; + repo = "resolv"; + rev = "a22f9dd900cb276b3dd70f4781fb436d617e2186"; + sha256 = "1j2jyywmxjhyk46kxff625yvg5y37knv7q6y0qkwiqdwdsppccdk"; + }; + }) (drv: { + buildTools = with pkgs; [autoconf]; + preConfigure = "autoreconf --install"; + }); colour = appendPatch super.colour (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/colour-2.3.4.patch"; sha256 = "1h318dczml9qrmfvlz1d12iji86klaxvz63k9g9awibwz8lw2i79"; -- cgit 1.4.1 From 470faf83f6e83c52d27be0fc3fe562e61c5d968c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 12:05:56 +0000 Subject: ghc-8.8.x: build cabal-install with the native Cabal library --- .../haskell-modules/configuration-ghc-8.8.x.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c05430d9d3f0a..c37870fc050ce 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,8 +41,13 @@ self: super: { unix = null; xhtml = null; + # Use our native version of the Cabal library. + cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); + # Ignore overly restrictive upper version bounds. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; doctest = doJailbreak super.doctest; + split = doJailbreak super.split; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -54,6 +59,17 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; + tar = overrideCabal (appendPatch super.tar (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.patch"; + sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0"; + })) (drv: { + configureFlags = ["-f-old-time"]; + preConfigure = '' + sha256sum tar.cabal + cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal + sha256sum tar.cabal + ''; + }); resolv = overrideCabal (overrideSrc super.resolv { version = "20180411-git"; src = pkgs.fetchFromGitHub { -- cgit 1.4.1 From de0fadd2c25a904c7a5fcbbceb175d5305d9e738 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 13:36:41 +0000 Subject: ghc-8.8.x: patch regex-base, regex-posix, and exceptions to fix the build --- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c37870fc050ce..6d0c10c2486df 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -48,6 +48,7 @@ self: super: { cryptohash-sha256 = doJailbreak super.cryptohash-sha256; doctest = doJailbreak super.doctest; split = doJailbreak super.split; + test-framework = doJailbreak super.test-framework; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -96,9 +97,15 @@ self: super: { }); regex-base = appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; - sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcv1l"; + sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; + }); + regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; + sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; + }); + exceptions = appendPatch (doJailbreak super.exceptions) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/exceptions-0.10.1.patch"; + sha256 = "0427jg027dcckiy21zk29c49fzx4q866rqbabmh4wvqwwkz8yk37"; }); - - } -- cgit 1.4.1 From d8bbb81d48144f051cdafef931bec4db38cc3caf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 19:17:20 +0000 Subject: ghc-8.8.x: patch logict and th-abstraction to fix their builds --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 6d0c10c2486df..fca0896546f2d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -107,5 +107,13 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/exceptions-0.10.1.patch"; sha256 = "0427jg027dcckiy21zk29c49fzx4q866rqbabmh4wvqwwkz8yk37"; }); + th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch"; + sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3"; + }); + logict = appendPatch (doJailbreak super.logict) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/logict-0.6.0.2.patch"; + sha256 = "0my2n0r9pb35994q0xka96fv5jdpjdfwqppi5lily3rgzkajsixn"; + }); } -- cgit 1.4.1 From 9a0bd49c2730f78dbed669ff2440646b08b4f270 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 19:38:27 +0000 Subject: ghc-8.8.x: patch zlib, optparse-applicative, HTTP, and hackage-security to fix their builds --- .../haskell-modules/configuration-ghc-8.8.x.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index fca0896546f2d..8693b235211d8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -49,6 +49,8 @@ self: super: { doctest = doJailbreak super.doctest; split = doJailbreak super.split; test-framework = doJailbreak super.test-framework; + hashable = doJailbreak super.hashable; + async = doJailbreak super.async; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -65,10 +67,10 @@ self: super: { sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0"; })) (drv: { configureFlags = ["-f-old-time"]; + editedCabalFile = null; preConfigure = '' - sha256sum tar.cabal cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal - sha256sum tar.cabal + sed -i -e 's/time < 1.9/time < 2/' tar.cabal ''; }); resolv = overrideCabal (overrideSrc super.resolv { @@ -115,5 +117,21 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/logict-0.6.0.2.patch"; sha256 = "0my2n0r9pb35994q0xka96fv5jdpjdfwqppi5lily3rgzkajsixn"; }); + zlib = appendPatch super.zlib (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch"; + sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif"; + }); + optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; + sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; + }); + HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch"; + sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4"; + }); + hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; + sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; + }); } -- cgit 1.4.1 From fcbb4aa5671f892ccaa049447f6b523d99c0581b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 May 2019 13:33:54 +0200 Subject: wasilibc: fix evaluation error introduced in 9abff4af4f07c16aecd89bf82051afbc3228d6fd --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fc0676e5bb50..53fa72ff14a38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10374,7 +10374,7 @@ in libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; - wasilibc = callPackages ../development/libraries/wasilibc { + wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; }; -- cgit 1.4.1 From e3bee64f78ceb721938e7d16ce87ad66c5a3f441 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 May 2019 08:45:18 -0400 Subject: oh-my-zsh: 2019-05-03 -> 2019-05-05 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f4e723934f867..adbc0e7e0ba68 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-03"; + version = "2019-05-05"; name = "oh-my-zsh-${version}"; - rev = "8113ed065d5bead01430e393bd33d6e32a597471"; + rev = "d4a3e0645bef49bfd1808aa263ecf916f79f9040"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1i1z1zbi4va0r47091bjmjyjx62flya6yzp0fsi1dklgq67lki3w"; + sha256 = "06i5b7akcdq16ifiv2mvvm2vjnnk1hvb7hhdim4admv4h9068mn6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit 1.4.1 From c2c4cc683f6446ebd503db9ef25b20be97ba49b2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 May 2019 08:47:41 -0400 Subject: common-updater: Fix syntax Missing space before closing ] in if statement caused syntax errors --- pkgs/common-updater/scripts/update-source-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 2d0c16aa2f459..bc2c68feaeaa6 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -161,7 +161,7 @@ if [ -z "$newHash" ]; then die "Couldn't figure out new hash of '$attr.src'!" fi -if [ -z "${ignoreSameHash}"] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then +if [ -z "${ignoreSameHash}" ] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -- cgit 1.4.1 From 7b77c27caa8617c82df5c5af6b9ce6ae010d7f9a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 2 May 2019 08:03:27 +0100 Subject: linux_5_0: restore __kernel_fpu_{begin,restore} In 5.0er these function were removed from the public interface also zfs needs them for AVX/AES-NI support. Without this patch for example throughput on a encrypted zfs dataset drops to 200 MB/s from 1.2 GB/s. These functions were removed as their was no user within the linux kernel tree itself. --- .../linux/kernel/export_kernel_fpu_functions.patch | 60 ++++++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 ++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 66 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch new file mode 100644 index 0000000000000..205497aee2da8 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch @@ -0,0 +1,60 @@ +From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 2 May 2019 05:28:08 +0100 +Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}() + +This partially undo commit: + +12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}() + +We need this symbol in zfs for AES-NI/AVX support. +--- + arch/x86/include/asm/fpu/api.h | 2 ++ + arch/x86/kernel/fpu/core.c | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h +index b56d504af6545..7d53388d266ea 100644 +--- a/arch/x86/include/asm/fpu/api.h ++++ b/arch/x86/include/asm/fpu/api.h +@@ -18,6 +18,8 @@ + * If you intend to use the FPU in softirq you need to check first with + * irq_fpu_usable() if it is possible. + */ ++extern void __kernel_fpu_begin(void); ++extern void __kernel_fpu_end(void); + extern void kernel_fpu_begin(void); + extern void kernel_fpu_end(void); + extern bool irq_fpu_usable(void); +diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c +index 2e5003fef51a9..2ea85b32421a0 100644 +--- a/arch/x86/kernel/fpu/core.c ++++ b/arch/x86/kernel/fpu/core.c +@@ -93,7 +93,7 @@ bool irq_fpu_usable(void) + } + EXPORT_SYMBOL(irq_fpu_usable); + +-static void __kernel_fpu_begin(void) ++void __kernel_fpu_begin(void) + { + struct fpu *fpu = ¤t->thread.fpu; + +@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void) + __cpu_invalidate_fpregs_state(); + } + } ++EXPORT_SYMBOL(__kernel_fpu_begin); + +-static void __kernel_fpu_end(void) ++void __kernel_fpu_end(void) + { + struct fpu *fpu = ¤t->thread.fpu; + +@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void) + + kernel_fpu_enable(); + } ++EXPORT_SYMBOL(__kernel_fpu_end); + + void kernel_fpu_begin(void) + { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c338b37deca9..e941cd4ea413b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,9 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; + + export_kernel_fpu_functions = rec { + name = "export_kernel_fpu_functions"; + patch = ./export_kernel_fpu_functions.patch; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b86fa5c3d0877..579c4bc96e0b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15061,6 +15061,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; -- cgit 1.4.1 From f30f120b9b5ee43c6cf262b6baac6cda08328305 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 6 May 2019 15:32:21 +0200 Subject: unifiLTS: 5.6.39 -> 5.6.42 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 1e9ce4a232b01..61a2d854eaa71 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -44,8 +44,8 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.39"; - sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; + version = "5.6.42"; + sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; unifiStable = generic { -- cgit 1.4.1 From 6b24a1aca5bdf00126fb512117b2f6bbca868c49 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 6 May 2019 15:32:48 +0200 Subject: unifiStable: 5.10.19 -> 5.10.23 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 61a2d854eaa71..e68f5b9d40865 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,8 +49,8 @@ in rec { }; unifiStable = generic { - version = "5.10.19"; - sha256 = "01ylf11z4f86qrw9x0fn1mnxkb8iw0p2kslp7vgxgjp0i3mg3f2q"; + version = "5.10.23"; + sha256 = "0ak8crx3anxsx4r3b9k0rihgafkgsxj7f64z48nrk1l8m7f0wwxg"; }; unifiTesting = unifiStable; -- cgit 1.4.1 From 0d00b0b646b7a3c909631354adc16ae07be44bc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 6 May 2019 15:23:33 +0200 Subject: unifiTesting: 5.10.19 -> 5.11.18 --- pkgs/servers/unifi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e68f5b9d40865..bad068245f3df 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -53,5 +53,9 @@ in rec { sha256 = "0ak8crx3anxsx4r3b9k0rihgafkgsxj7f64z48nrk1l8m7f0wwxg"; }; - unifiTesting = unifiStable; + unifiTesting = generic { + version = "5.11.18"; + suffix = "-996baf2ca5"; + sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc"; + }; } -- cgit 1.4.1 From ffe0bb84353998458efc048087b0666ff14f4776 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Mon, 6 May 2019 16:40:53 +0200 Subject: jump: init at 0.23.0 (#60631) --- pkgs/tools/system/jump/default.nix | 40 ++++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/system/jump/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix new file mode 100644 index 0000000000000..697fc77d090ab --- /dev/null +++ b/pkgs/tools/system/jump/default.nix @@ -0,0 +1,40 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "jump"; + version = "0.23.0"; + + src = fetchFromGitHub { + owner = "gsamokovarov"; + repo = pname; + rev = "v${version}"; + sha256 = "1acpvg3adcjnxnz9vx7q99cvnkkvkxfdjkbh2rb6iwakx7ksaakv"; + }; + + modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + + outputs = [ "out" "man"]; + postInstall = '' + install -D --mode=444 man/j.1 man/jump.1 -t $man/man/man1/ + + # generate completion scripts for jump + export HOME="$NIX_BUILD_TOP" + mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/jump shell bash > "$out/share/bash-completion/completions/jump" + $out/bin/jump shell fish > $out/share/fish/vendor_completions.d/jump.fish + $out/bin/jump shell zsh > $out/share/zsh/site-functions/_jump + ''; + + meta = with lib; { + description = "Jump helps you navigate faster by learning your habits."; + longDescription = '' + Jump integrates with the shell and learns about your + navigational habits by keeping track of the directories you visit. It + strives to give you the best directory for the shortest search term. + ''; + homepage = https://github.com/gsamokovarov/jump; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ sondr3 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53fa72ff14a38..9f84e3336e29b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4133,6 +4133,8 @@ in jumanpp = callPackage ../tools/text/jumanpp {}; + jump = callPackage ../tools/system/jump {}; + kindlegen = callPackage ../tools/typesetting/kindlegen { }; latex2html = callPackage ../tools/misc/latex2html { }; -- cgit 1.4.1 From 051320062e5d1288bc989c7f3e39ef903c618104 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 2 May 2019 01:14:19 +0900 Subject: libusb1: optionally enable static library --- pkgs/development/libraries/libusb1/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index ac5c38a34f113..0620163bb320a 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: +{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, withStatic ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libusb-1.0.22"; src = fetchurl { @@ -32,4 +32,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = [ ]; }; -} +} // stdenv.lib.optionalAttrs withStatic { + # Carefully added here to avoid a mass rebuild. + # Inline this the next time this package changes. + dontDisableStatic = withStatic; +}) -- cgit 1.4.1 From ce5a09007555e5c36643a7a74a7483db62a4e97b Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 2 May 2019 01:15:33 +0900 Subject: stlink: fix Darwin build Upstream supports various Unixes, so optimistically set platforms to `unix` even though we're only going to build it on Linux and Darwin. --- pkgs/development/tools/misc/stlink/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index de13f6709b2b5..90f901e51125c 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor maintainers.rongcuid ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f84e3336e29b..821ea264dfaf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13097,7 +13097,10 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { }; + stlink = callPackage ../development/tools/misc/stlink { + # The Darwin build of stlink explicitly refers to static libusb. + libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + }; steghide = callPackage ../tools/security/steghide {}; -- cgit 1.4.1 From 2ec5786a4d856500b93f218aaab051d148f3cad7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 6 May 2019 19:11:11 +0200 Subject: gitaly: fix build --- pkgs/applications/version-management/gitlab/gitaly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 476ceee30d03f..0ea3ce0f779bd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -27,12 +27,12 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby + cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby # gitlab-shell will try to read its config relative to the source # code by default which doesn't work in nixos because it's a # read-only filesystem - substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \ + substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \ "File.join(ROOT_PATH, 'config.yml')" \ "'/run/gitlab/shell-config.yml'" ''; -- cgit 1.4.1 From fed813491d51552e28890905057fe13eb279d19e Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 6 May 2019 19:52:33 +0200 Subject: radarr: 0.2.0.1293 -> 0.2.0.1344 --- pkgs/servers/radarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index cd032ce85343a..49621e8b9b6b6 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.1293"; + version = "0.2.0.1344"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0wzwbgfvi48lq4zadzq3rlsbm6irwz534liw8k7hn69yv0wi3wfd"; + sha256 = "0zh1p92i61s6mx26s3fvzg1ihsx433b398wsl5p8zafwqq3zfrla"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 4a72ca113584502cc92e33470e70797945e342b9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 5 May 2019 16:14:24 +0100 Subject: pythonPackages.worldengine: fix tests by moving nose to checkInputs also only perform nosetests in py<3.5 --- pkgs/development/python-modules/worldengine/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index cdb60946079de..103e2fc8defdb 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , nose , noise @@ -33,7 +34,6 @@ buildPythonPackage rec { ln -s ${src-data} worldengine-data ''; - buildInputs = [ nose ]; propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; prePatch = '' @@ -46,9 +46,10 @@ buildPythonPackage rec { --replace 'PyPlatec==1.4.0' 'PyPlatec' \ ''; - doCheck = true; - - postCheck = '' + # with python<3.5, unittest fails to discover tests because of their filenames + # so nose is used instead. + checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ]; + postCheck = stdenv.lib.optionalString (pythonOlder "3.5") '' nosetests tests ''; -- cgit 1.4.1 From 12e6d2838987cce5cb0809a6dc53c8e190d2196b Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 6 May 2019 22:32:03 +0300 Subject: i3status-rust: 0.9.0.2019-03-21 -> 0.9.0.2019-04-27 --- pkgs/applications/window-managers/i3/status-rust.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index d9095d3911b66..2fd78cbb0e12e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,17 +1,17 @@ { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: rustPlatform.buildRustPackage rec { - name = "i3status-rust-${version}"; - version = "0.9.0.2019-03-21"; + pname = "i3status-rust"; + version = "0.9.0.2019-04-27"; src = fetchFromGitHub { owner = "greshake"; - repo = "i3status-rust"; - rev = "18300e6b9259053b80c37aef56c958fe5f50062b"; - sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh"; + repo = pname; + rev = "d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281"; + sha256 = "0x23qv7kwsqy1yx25fn1z56fx8w865qarr5xdx8s22x42ym4zyha"; }; - cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i"; + cargoSha256 = "0vl2zn9n7ijmjxi2lyglnghvaw4qi2bah5i6km15schlsm8c641g"; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 88f84c08d7ade406e0c49a73edab19f3501b4083 Mon Sep 17 00:00:00 2001 From: Stefano Mazzucco Date: Thu, 2 May 2019 22:27:52 +0100 Subject: awesome: use makeWrapper rather than wrapProgram Using wrapProgram makes so that the generated "awesome" wrapper duplicates its command line options at every restart. As @psychon puts it: > AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used > to generate a wrapper around the real binary. wrapProgram calls makeWrapper > with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again > on restart. Without this --argv0 awesomeWM would directly restart itself > instead of the wrapper, I think. --- pkgs/applications/window-managers/awesome/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index fa86257a1a959..bbe514144a1a8 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -48,7 +48,10 @@ with luaPackages; stdenv.mkDerivation rec { LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; postInstall = '' - wrapProgram $out/bin/awesome \ + # Don't use wrapProgram or or the wrapper will duplicate the --search + # arguments every restart + mv "$out/bin/awesome" "$out/bin/.awesome-wrapped" + makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ -- cgit 1.4.1 From dfac1543d01778af2fdebc9cd130783a56b16608 Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 6 May 2019 22:42:31 +0200 Subject: pythonPackages.fonttools: 3.40.0 -> 3.41.0 and specify license --- pkgs/development/python-modules/fonttools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index fa1b66b4a5ead..7efe996ddf8da 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , numpy , pytest @@ -8,11 +9,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.40.0"; + version = "3.41.0"; src = fetchPypi { inherit pname version; - sha256 = "11x7kjkwk7in84wjvqlbbp4rshj6m8c4259j5z39x16l9smg5idi"; + sha256 = "1f3q9sadwy6krsjicrgjsl1w2dfd97j4l645lnl1f5y3y1jkj4fh"; extension = "zip"; }; @@ -33,5 +34,6 @@ buildPythonPackage rec { meta = { homepage = https://github.com/fonttools/fonttools; description = "A library to manipulate font files from Python"; + license = lib.licenses.mit; }; } -- cgit 1.4.1 From 118487b694a700ec9e3802a2ca2cfe68699a5ff8 Mon Sep 17 00:00:00 2001 From: Marcus Stojcevich Date: Mon, 6 May 2019 19:38:37 -0400 Subject: influxdb: 1.7.5 -> 1.7.6 --- pkgs/servers/nosql/influxdb/default.nix | 4 +-- pkgs/servers/nosql/influxdb/deps.nix | 60 +++++++-------------------------- 2 files changed, 14 insertions(+), 50 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 1bbdc6789529a..3669df47ee2a3 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "influxdb"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "0gwivazjvxw6fflf2637qn0crq564fjzhncsl3agph5ciqyv48gx"; + sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/pkgs/servers/nosql/influxdb/deps.nix index e00a985fd8d38..5492ad9d8eaac 100644 --- a/pkgs/servers/nosql/influxdb/deps.nix +++ b/pkgs/servers/nosql/influxdb/deps.nix @@ -27,15 +27,6 @@ sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; }; } - { - goPackagePath = "github.com/RoaringBitmap/roaring"; - fetch = { - type = "git"; - url = "https://github.com/RoaringBitmap/roaring"; - rev = "3d677d3262197ee558b85029301eb69b8239f91a"; - sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9"; - }; - } { goPackagePath = "github.com/alecthomas/kingpin"; fetch = { @@ -221,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/go-sql-driver/mysql"; - rev = "d523deb1b23d913de5bdada721a6071e71283618"; - sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; }; } { @@ -311,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/flux"; - rev = "8c9d0ad49204d3bbb171e96d872cf663ee7f1b4d"; - sha256 = "0yamrzqjs6giwqq0ljf2dscarqw6851cw3iya8cya0x5plyd810c"; + rev = "bcfc535fb7443776501797df4ba596483c50c7fe"; + sha256 = "0w87dqphaca49hb9wdrs35plvhcpgfmfwd5k00vbkwwmyil7majf"; }; } { @@ -320,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/influxql"; - rev = "c661ab7db8ad858626cc7a2114e786f4e7463564"; - sha256 = "1j73aj312laqmi20fbinx0aal82ncpqbj5dgs41br0j7fkvi6873"; + rev = "1cbfca8e56b6eaa120f5b5161e4f0d5edcc9e513"; + sha256 = "0hfjr5yg6cbvlv96l4riw6bv5gdv7y1sfymm7awix1ab6xdmv3lm"; }; } { @@ -329,17 +320,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/line-protocol"; - rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57"; - sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349"; - }; - } - { - goPackagePath = "github.com/influxdata/platform"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/platform"; - rev = "0f79e4ea3248354c789cba274542e0a8e55971db"; - sha256 = "16d9g7vgy30zahhj066kz7akahvpknq3ljk2fzvczjsm59ih8rjk"; + rev = "a3afd890113fb9f0337e05808bb06fb0ca4c685a"; + sha256 = "1nspgpm8na2agkmzd4fhn7g8sqyn77mj6hzx1l27zbwf8ask266h"; }; } { @@ -356,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/tdigest"; - rev = "a7d76c6f093a59b94a01c6c2b8429122d444a8cc"; - sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni"; + rev = "bf2b5ad3c0a925c44a0d2842c5d8182113cd248e"; + sha256 = "0cf0hcm4g052qzq4n67vxl5qh7lvp13x23hndzwmazxzdaar8gh1"; }; } { @@ -396,15 +378,6 @@ sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg"; }; } - { - goPackagePath = "github.com/kevinburke/go-bindata"; - fetch = { - type = "git"; - url = "https://github.com/kevinburke/go-bindata"; - rev = "06af60a4461b70d84a2b173d92f9f425d78baf55"; - sha256 = "0k9bpx6vqsr53bzj7k78rjalybpwbs86zdks6v7jqkwsrx4j7a07"; - }; - } { goPackagePath = "github.com/kisielk/gotool"; fetch = { @@ -522,15 +495,6 @@ sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; }; } - { - goPackagePath = "github.com/mna/pigeon"; - fetch = { - type = "git"; - url = "https://github.com/mna/pigeon"; - rev = "9df264905d4734c0133161d8c67828ff522b154a"; - sha256 = "120m90lig5984wd2k7x2fclx5vb64lxmx4j3065pp0q1fqjif87z"; - }; - } { goPackagePath = "github.com/mschoch/smat"; fetch = { @@ -653,8 +617,8 @@ fetch = { type = "git"; url = "https://github.com/segmentio/kafka-go"; - rev = "c6db9435477f3cb658e2dd0fa93e02118c870251"; - sha256 = "17zdj0i429a0wmwj8rm4j0hmxsv8kbql67s5iv78hac6rcys7bj2"; + rev = "0b3aacc527812d4040e51211146a43545e82d670"; + sha256 = "05qz309l8chs9p2f1vqapgc4k459wflhhlc7p18ij5kz7qhx2mjl"; }; } { -- cgit 1.4.1 From 3a0fbc17e2ffa3612f1a6014f44d3683e15a8a04 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 7 May 2019 01:32:25 +0200 Subject: libbass: update --- pkgs/development/libraries/audio/libbass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 390ca6bb04b73..0e1445ca9ee1f 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -11,7 +11,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass${version}-linux.zip"; - sha256 = "0alxx7knkvzwwifqrmzavafwq53flja7s1ckaabk6p2ir2f0j5cp"; + sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz"; }; bass_fx = { @@ -21,7 +21,7 @@ let x86_64-linux = "x64/libbass_fx.so"; }; urlpath = "z/0/bass_fx${version}-linux.zip"; - sha256 = "0j1cbq88j3vnqf2bibcqnfhciz904w48ldgycyh9d8954hwyg22m"; + sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; }; }; -- cgit 1.4.1 From 59aef0aa9c8568fe943349f9bba6bb1653b0ec87 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 7 May 2019 01:32:50 +0200 Subject: ultrastar-creator: 2017-04-12 -> 2019-04-23 --- pkgs/tools/misc/ultrastar-creator/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 435a5850920ac..195a31b63e5be 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchFromGitHub , qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: +# TODO: get rid of (unfree) libbass +# issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3 +# there’s a WIP branch here: +# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed + stdenv.mkDerivation rec { name = "ultrastar-creator-${version}"; - version = "2017-04-12"; + version = "2019-04-23"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "UltraStar-Creator"; - rev = "ac519a003f8283bfbe5e2d8e9cdff3a3faf97001"; - sha256 = "00idr8a178gvmylq722n13bli59kpxlsy5d8hlplqn7fih48mnzi"; + rev = "36583b4e482b68f6aa949e77ef2744776aa587b1"; + sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9"; }; postPatch = with stdenv.lib; '' -- cgit 1.4.1 From 6ad3c59f03cfd9e635f8b6466879673a19607fdb Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 7 May 2019 01:33:18 +0200 Subject: ultrastar-manager: 2017-05-24 -> 2019-04-23 --- pkgs/tools/misc/ultrastar-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index d9739f7846b7c..3ab404d020779 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -2,9 +2,9 @@ , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: let - version = "2017-05-24"; - rev = "eed5dc41c849ab29b2dee37d97852fffdb45e390"; - sha256 = "1ymdgaffazndg9vhh47qqjr5873ld7j066hycp670r08bm519ysg"; + version = "2019-04-23"; + rev = "ef4524e2239ddbb60f26e05bfba1f4f28cb7b54f"; + sha256 = "0dl2qp686vbs160b3i9qypb7sv37phy2wn21kgzljbk3wnci3yv4"; buildInputs = [ qtbase qtmultimedia taglib libmediainfo libzen libbass ]; plugins = [ -- cgit 1.4.1 From 86665d0744761790af4fd71354dcb9087ce0dd87 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 6 May 2019 23:22:44 -0300 Subject: sierra-gtk-theme: 2018-10-12 -> 2019-05-07 --- pkgs/misc/themes/sierra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix index d5082821bee1d..b845522a28a18 100644 --- a/pkgs/misc/themes/sierra/default.nix +++ b/pkgs/misc/themes/sierra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "sierra-gtk-theme-${version}"; - version = "2018-10-12"; + pname = "sierra-gtk-theme"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = "sierra-gtk-theme"; + repo = pname; rev = version; - sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg"; + sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq"; }; nativeBuildInputs = [ libxml2 ]; -- cgit 1.4.1 From eb19fdace742e4998576c0b4e1133f2120485f48 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Mon, 6 May 2019 23:25:32 -0300 Subject: sierra-gtk-theme: mv to pkgs/data/themes --- pkgs/data/themes/sierra/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/misc/themes/sierra/default.nix | 33 --------------------------------- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 pkgs/data/themes/sierra/default.nix delete mode 100644 pkgs/misc/themes/sierra/default.nix (limited to 'pkgs') diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix new file mode 100644 index 0000000000000..b845522a28a18 --- /dev/null +++ b/pkgs/data/themes/sierra/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "sierra-gtk-theme"; + version = "2019-05-07"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq"; + }; + + nativeBuildInputs = [ libxml2 ]; + + buildInputs = [ gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + patchShebangs . + mkdir -p $out/share/themes + name= ./install.sh --dest $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A Mac OSX like theme for GTK based desktop environments"; + homepage = https://github.com/vinceliuice/Sierra-gtk-theme; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix deleted file mode 100644 index b845522a28a18..0000000000000 --- a/pkgs/misc/themes/sierra/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - pname = "sierra-gtk-theme"; - version = "2019-05-07"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = version; - sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq"; - }; - - nativeBuildInputs = [ libxml2 ]; - - buildInputs = [ gdk_pixbuf librsvg ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - patchShebangs . - mkdir -p $out/share/themes - name= ./install.sh --dest $out/share/themes - ''; - - meta = with stdenv.lib; { - description = "A Mac OSX like theme for GTK based desktop environments"; - homepage = https://github.com/vinceliuice/Sierra-gtk-theme; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821ea264dfaf4..2bd02dc511666 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16312,6 +16312,8 @@ in signwriting = callPackage ../data/fonts/signwriting { }; + sierra-gtk-theme = callPackage ../data/themes/sierra { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; @@ -23426,8 +23428,6 @@ in libsemanage = libsemanage.override { python = python3; }; }; - sierra-gtk-theme = callPackage ../misc/themes/sierra { }; - slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; -- cgit 1.4.1 From d90da9197a8179b017e6c4e5d78e3623bf0ce1ce Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 6 May 2019 15:41:24 -0500 Subject: libreoffice-fresh: 6.2.2.2 -> 6.2.3.2 --- .../office/libreoffice/default-primary-src.nix | 4 ++-- pkgs/applications/office/libreoffice/default.nix | 4 ++-- .../applications/office/libreoffice/libreoffice-srcs.nix | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 9c14ffdbbfddb..d0d26d4692736 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "2"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq"; + sha256 = "1bvdvhk1jw16wc0fd7vvvjyn7ydwy9i3xa3d8kn1bdmsn97vkpgi"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 894f152d6f678..2a4a049daa5a9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p"; + sha256 = "0gnx596sr498n3frz1wgcnq9kqqaqksxfyjm145235pvrv2ymgvp"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1"; + sha256 = "0chips6h2ymaqwvjlxzjn7jm64y6r4lcr7z7rppan436nqz95dn1"; }; }; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index fda975a9031a9..7170982688cd1 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -707,11 +707,11 @@ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.73.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; - sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; + name = "poppler-0.74.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; + sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; md5 = ""; - md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; + md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz"; - sha256 = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f"; + name = "Python-3.5.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; + sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; md5 = ""; - md5name = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f-Python-3.5.6.tar.xz"; + md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; -- cgit 1.4.1 From 5fe05474575a7dcedbdf4a8acd80eae31313705f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 5 May 2019 22:12:10 -0500 Subject: creduce: 2.8.0 -> 2.9.0, llvm7 --- pkgs/development/tools/misc/creduce/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index a2b487a4bccef..1aa17bac750c6 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - name = "creduce-${version}"; - version = "2.8.0"; + pname = "creduce"; + version = "2.9.0"; src = fetchurl { - url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz"; - sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp"; + url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821ea264dfaf4..943c8e0c3859c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8872,7 +8872,7 @@ in credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_6) llvm clang-unwrapped; + inherit (llvmPackages_7) llvm clang-unwrapped; }; cscope = callPackage ../development/tools/misc/cscope { }; -- cgit 1.4.1 From 20eda8246cd354c09e154cf34528fc357e1f3e7e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 6 May 2019 23:57:10 -0500 Subject: mpv: fix darwin build --- pkgs/applications/video/mpv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 332495adfce20..dcfeae52aae4d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - luaEnv libuchardet mujs nv-codec-headers + luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray @@ -166,6 +166,7 @@ in stdenv.mkDerivation rec { ++ optional xvSupport libXv ++ optional youtubeSupport youtube-dl ++ optional stdenv.isDarwin libiconv + ++ optional stdenv.isLinux nv-codec-headers ++ optionals cddaSupport [ libcdio libcdio-paranoia ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] -- cgit 1.4.1 From 5a9983a76e02342f88ee3876aba137ddf6fcc5bd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 May 2019 00:02:25 -0500 Subject: postgresqlPackages.timescaledb: 1.2.2 -> 1.3.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 9a664bc25188b..055195c1b0453 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.2.2"; + version = "1.3.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1fb1ab07jmgd1drinl25mbhwx966f75c7i7nh3ah0xf3cbk298xr"; + sha256 = "1wg95ryr5z55aghlqaz0jhz6rliinvfin2i4xpqwg7ir6nz773qm"; }; # Fix the install phase which tries to install into the pgsql extension dir, -- cgit 1.4.1 From dbba6f0b3c3783e80eca2f3d4e023fa1b4e25db5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 May 2019 00:05:00 -0500 Subject: flow: 0.98.0 -> 0.98.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8ab655bc4bd3e..390c0e4413341 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.98.0"; + version = "0.98.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "13ry3bmgm3xy24kasx843dwd1nsv7nyd174696iaz2c64z46bbfm"; + sha256 = "1ik758ca6mfybnzb987fa8blqaskqbfk5hkzl4yg1j08p7kli5ll"; }; installPhase = '' -- cgit 1.4.1 From baf17a40427128fca395968232fee0c44166c115 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 May 2019 14:23:59 +0100 Subject: pipenv: Add missing build input virtualenv-clone --- pkgs/development/tools/pipenv/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 681e0685f803f..cb8e61e119d94 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -1,5 +1,15 @@ -{ stdenv, python3Packages, pew }: -with python3Packages; +{ lib +, buildPythonApplication +, flake8 +, invoke +, parver +, pip +, requests +, virtualenv +, fetchPypi +, virtualenv-clone +}: + buildPythonApplication rec { pname = "pipenv"; version = "2018.11.26"; @@ -28,7 +38,7 @@ buildPythonApplication rec { "--set PIP_IGNORE_INSTALLED 1" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python Development Workflow for Humans"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821ea264dfaf4..b44ee8607da39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8377,7 +8377,7 @@ in svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; - pipenv = callPackage ../development/tools/pipenv {}; + pipenv = python3Packages.callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; -- cgit 1.4.1 From 5985cd73dcb43172d27d0b029c5d0f3ec1df0e90 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 7 May 2019 05:12:07 +0100 Subject: firefox-devedition-bin: 67.0b7 -> 67.0b17 --- .../browsers/firefox-bin/devedition_sources.nix | 794 ++++++++++----------- 1 file changed, 397 insertions(+), 397 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8f1817627bade..f180af5381e92 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0b7"; + version = "67.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ach/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ach/firefox-67.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "065f94cf555016d4a4cf87ab48c93ac5dfddf3fe55769b46b008df89a6b8525705e3d1d42f1378b01c4fd84c0c6330fe213a8bbeb968b2062ecfb7fd0d99da14"; + sha512 = "37535c20233e4baf2b523480807df462e4a0b2f7c45e2444651c779b4f00a6b6a392bc39f672a946e3468cc5663146f7bd6780c8a56f797bf95e9e43b0ef3ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/af/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/af/firefox-67.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "f41ea86f9d0247f861a3f2f336dfb480706e114beadfd95d907335b6eededea46d4252e8b5f711b73e73dab2af4f189dcd1bc6b5f0430fb65a35b4df6e58b801"; + sha512 = "436ed27c418d93fa1daa91a8a79076ee25011b03f28ad8682bd2290e71705b525614d7e8c3bc21d6a9dbd465ac4d772892e6ede86f03ff6108e4eb4ac1177320"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/an/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/an/firefox-67.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f22157f1c04b359dab1cd87e3f18cf2dcaa5bdb8bef504f4492b9be87288a6002a31997885303216572f2000018c4951998a68f9314862b2ea7c4ce7be943085"; + sha512 = "bdac9643a0f11b46b49fea9e1b22d9a74ca0e6d90a7a29f3ff4b2ec31ad141ba48ebb57f28b6c976622fb9e88fab8a5081e9488b66b3d87520cf57a7a531bb31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ar/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ar/firefox-67.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "51ba06d4ca42fca5d5eb706ce3ec166c08967282d3b66802b11f41814058164ec71f28f8e4dac37affab15179c4e411b8634b42a5cf4693e9fa5186cbf0440f6"; + sha512 = "f660159977bb9490cf4ed0be3e457739cd488c29e32c7e46932c5420a62bdd1292d19aeac32d8591b7da42b1560b1904840e0510dd69f21227076065eeeece0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/as/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/as/firefox-67.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "461afa6427e234f64fd95f8d6901fa4ad6e1a7aca08ac60205f3e27a8af55b0735fa50b0ae460460e842273f4488662133c1ef9d72bd14bbe69450f1c8c13bb0"; + sha512 = "52228be50fdc4cbb535a05d7bdb70d85ca076be9e105f38bfe6e16f8abe9cd3ede53983734022da5545acc6ac991511943804bfe95b5d603b04037a33b627a7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ast/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ast/firefox-67.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "45bfaa2fccf2b2441a71ca3c23846e6cc03398e5a48202dd9f2912cca8f9c4623a1cfbe315d81952dcec4e8cda491d9b455a19743c32b278f2641828e0cd82fc"; + sha512 = "75c797aae6b739c3bc258e2e80b43f6b8775816a2a2a130251bc65f11f5a793f4e20de360f2248751b399ae596f7e407bac17c9f97eab8b992b21d338d98ae9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/az/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/az/firefox-67.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a12c0ee9516e78479413c5e79a43e149632648a83dc88e87b443a4163aae98f554ceac48b456845e881db575a87d9c8d0772546c844ff567d7ea6be1c51597b8"; + sha512 = "046e819f782edd5cd3d840abe4b4264fbb20932d89e67a229c195201f01b14b454f834d7d475caf78b040f08541c39372b420c88384f10f3c917153aa689c9ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/be/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/be/firefox-67.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "756723c6774e76f62f2447724f4c2ca350e94f81dfb9d3e4b64381d3d0e34cc81a7b56868aef1996e97ae13c15f192e83cbfd30a7b171a7536731d9ab9035eef"; + sha512 = "595a6dc79da32d85066dbbcd7e0a876d0f134a969e0f40364b13f0b2d31ae0c9b45eb50f6ee85afaf70c5ee38139da7702c244b3ff01afc9357af2db69633e2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bg/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bg/firefox-67.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6b548c459ad6d0933733a571f800050b6e416618a0d465acbe251e8899ccb5b3d4b3eef7f46982c9f4f888f2a21aca4f9fcc990615345a6868fa45797f843ad8"; + sha512 = "4a0cdef989e4ba0198aaf6d39f48f7a5e443a798b2ed33f2c30e1b0ff718e2d2642d454a3aac43efc4d07977af5337d4f94cb6089109d685753b2a304e117d4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-BD/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bn-BD/firefox-67.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "7a97d2daef6459cf2eafc7c7469c827c0fbc3fe241aa2a08865ce3b83b4e667f59371d33fb96e834ad1e6de29040146324359473dcca3c6acd2dd892e4aade64"; + sha512 = "a6103822c74f2bf75be87777805b094cb71b290e7b44bd838df1455b720458511d047eda274944da7f0ad9e8d1b0ea228ada8369220b4fc806d90d676d60c1ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bn-IN/firefox-67.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6545354d98ef743017e1b7b951df4f1d7149b9918a2b0e242c10c886cf193a542a8c94f3c98f491b3e5b21ce860cd14cb066a9688b375f435e01aa4b5d9692b8"; + sha512 = "a5628a273240febb6181de25518e72d596476139f5923a23ecfaf53d5b57eb77dff4a4109ac36a5b581508859c112c5eed9006de013e1b57e81a8e5a81a5e832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/br/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/br/firefox-67.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "85095550969c5708df47a9f0c67245273fd0c81bf831707ea99d07fd9e679d4ae4c12416b764599826f08329dfe7460c4c4109b21887fe416aec638e6730ca62"; + sha512 = "1988c67b819d94cc329989fc7f267b8fccc06026fca32728003ef49c4347d41ce5effaa0d70fbf2fa7ee3adac45b05439de1d3c4a12613976092d30b454af4b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bs/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bs/firefox-67.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "3eddbcfd63cbf85f74a8f24b7cd1b47390369ffe4f89663178b6bf893fd5feb040c521814b2033a79cfb75ddd0201fce2bc3993715c50eb1a39c6889fe515a53"; + sha512 = "6e0deaa14faa4d935218425be34c6001b00ff071c0cb7d38574984ce84848d74bbd7c15d4fc4cc56596edf8ab9804f0dfdcc2d6efe5581bd6bdfc0a65d1f52bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ca/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ca/firefox-67.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "ce4e8b99648dea33ed485aa364e99aa2b76afab2119a375c0b1beb6acba52bea6386beccc00db84692817ebbc7cda54bfd39755430ad195f4a409d24b6f9cdde"; + sha512 = "4d3896a3c00125cc4dccfb1537c5fde33a37d4615ce8ebd961e996256312c70c87c208aa814b06b6a70b65ca20dd4221a4df273b098a7eb5019a7032af12067d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cak/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cak/firefox-67.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1cb2eaa6c83bb7c8552094f2b40a710b9e00b48fcc9d76b95ae650834e8f4e33b898fd1e3fddf3e4c90997ee9560e1876acee2a763719bdaa2b98913d62bb073"; + sha512 = "aa483fa653f628f45377ad1b9ee60aa2868dd03c2f4515592bb5f3e2b3d7b899c11e2be4e96086c679693cb39179ff797e634c8f7b01a9bf20cd666b37b75d99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cs/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cs/firefox-67.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "b4212d47a104fa1a1905036886285973250c6b7b253c7b8f1d75a02561af2f7a127edc153ee47f1ca386f198d0a79106ae27c4abdfdbad05fcaac5b179aa64a5"; + sha512 = "71f6777ec1b3db95924ff843eaa2bc25443c4ef282365c3af60eefa6e522611272f4a3630e34524186e6bf43597398ab94f06e2a1a9c57b6036ac487458afb67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cy/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cy/firefox-67.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6238a0f598da4b323a245c7f025e0e67e511c8b07f7f6fa2dee5d7fc232fc9eb21d4a0c00d3b5d9a4912cdbe5fc3f50ed8c4125e7e6cee5337d21580491a31b0"; + sha512 = "12b0a2a937c495cb74ad57eadb9e2def14bf06348feae8bafe274cae2f2ec653f001d2cdabb8bccc1111ff8f3c9ce37b35090fd5d0ea1bd1bf58b24e6f044812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/da/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/da/firefox-67.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f3e5b994100272063fa50ce90edafc913333902431ac24050b10ad96f686516efca6501260e2201d6fd8a8b835efaa3f478e29a8337040f5274056bca1e4b893"; + sha512 = "d247879bde849d29ce6b158ad4fe393d987815dcc2ec610d2c8357df859cc65839cf438af4c717275ef0aee9faa2188223a006b219942795107898a26d7f4cf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/de/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/de/firefox-67.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b85685a7119e9b77325cbd3091f447b1ec2a65781b398fdfa0b8ce6c0bee0b40acb67b8922626fe3ded23838e4d760a61b9382671f99ab3d97b2cbeabc180759"; + sha512 = "c18d70e45e6a2f23a11f263ddec9f0c4212db1c7b92080d51e41dd325f850bfea7e9eafe1b803e189ca0eea42f55c4109051c7e80be2b62c59cd7d16731fb250"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/dsb/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/dsb/firefox-67.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "16c488a16b880441e8f24f0dce65a4e311a68fa6f1c6bc137283213be938518371963f2bc4e04d56adac25bee86223018d8701372187a8db81d88f24fa32c26b"; + sha512 = "ad7a24a1fc86ae929f8a0f97a5952b50cdc22b3ae4914b49180909892466dcf59d0d7653b7402960a61be78dda9d91b6d7462d0155dce271eea7c92f6678adc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/el/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/el/firefox-67.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8bb987cc8f2d0cd5528319530cbdb8efbdf8ccae4164c376ac08dae9e3f94460e73c9295fc7da0a0f88f4bc39f8b9e576e3462edf15c4b794f48571975c9442a"; + sha512 = "5966122c6276ee22971b660932a5ee24ed96d5b141216659b55ddd60f3993586e7777a3e28ed7cc6213216229529978b682e28087e324fee01e75826d95d9948"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-CA/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-CA/firefox-67.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "b615236a7c24d4d45bdb7286c820df4a96829ad2afea2d2f3ef9f539f5841b5fceb90790226d61db393e7c3b7e626ed0c4898e146dfcbe35d468fef8f18953d4"; + sha512 = "b36f0433f1f274d9b3203c4ad8eea194445655c4b5f5e101d8bc2f6bfd5e3359ed157390cc7f6d5be93b11211081eb58abcd1ebf7acda77a6faa0e4e5df3b87d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-GB/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-GB/firefox-67.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "d658c78001a8dcb6ed58d63205b9a845b55a668299e514fd948245341b2aaf02da7721e7312e763b38b02e8375d20a98abf3d3714f75236fb0bbd3074e08a3ec"; + sha512 = "17bc62370df8ebd6e8b4ad8d4d156eb8ba8e53e80c5f2064777d4fbda9f8c9c43a94337d2a925e2bd4a445c8812cd593ad03dbf98d6f8ffbfcaade6aed3dd015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-US/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-US/firefox-67.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b1911ac01ee72cf64ada7e8b8d983514446f174785927f20c88e15e4394f4aa57f50fa916295e5223cd67cca0c3c8e13488242c10491ff05d66e1439ed38486d"; + sha512 = "37043e559fb8f137b1e650ace259e2721186e7291781ca3ec2162c2f4ae33a20d5bea83b13b2de69033ca2dc935b5acf363d64a93b4707cd097c7f9f12ae96e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-ZA/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-ZA/firefox-67.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "390815b14e35134377cee24bd5731914cf4ae08f12206f2a3502d12c3e97322763c6c5a9d05a5b0b7f8e85247d5d61999f499c513fa8c3033aa6eb0f22b0eff6"; + sha512 = "1fd00bce7715e216bfd9aa57e922d20076a811827a8304c0ec3ef45d0b69b3f85f6112125ee09f5104d8bf3d98993e413daf6936f8637a2d2642ab1e33eb0636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eo/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/eo/firefox-67.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "b80d91463d9be96e29eab4d15ec76952e7c664e30934de1b14d165864962c4aacc2725f08b6e301487c55e386f324a3072c3969bc4f474d7120f2c723d9e76f0"; + sha512 = "856fdf4118dec5e5113b43a9686ec47f94cdf69a82e309ee94615cdd177849f66dbcffe5b7136dbabe61d4b09d29b7a2e28d8ba95dca0381334b0d954c8dc562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-AR/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-AR/firefox-67.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "03558cb0909a4f8fb2076b36be023cc768a84de64b3113d9c795e763cb762b68378826d1fc8c30b77f3c0e55d6f3ed6ca2d023b531084548b24c4a9bdd4d41da"; + sha512 = "ff28d6c8152a61047194c8f8ab2acba94cf5760df0360b30b97c059abe60ea209fc8d1227871d1a49967e124b2aac7e1d6750bc8dbcbc81324b20b0d6f46c42e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-CL/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-CL/firefox-67.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "45d5284a78cc6f985d3fb68888f9a03b155f924549f43e4364deb87e0dd0c2f9c532e8a0b8062db8d265c810230956533c6b7477d66f5adbce82779f6e55d0df"; + sha512 = "f78246a655450b09b5d964702945c08931138af6664523342db19a3bf2c0fc85d19162e68b258fe2752bb187325a5ce62da4e4d92ffdc2c16bbca64aa90d7bd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-ES/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-ES/firefox-67.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "650c869a200ba5891be7b377030e32ea8e5c5e1bacfbd9028ad6d5909651aca8da7c82b399ad5491b071cebab168cd7ef3f14b00b8af562a02ee5696dd29c249"; + sha512 = "6cbc365246d9a205499698b7de2972202000fca877f7f3a5ac1ded3639b54159be7abb7c58859727b463fc15b4f664d15ffd048c666d586a4051c76e86fdce74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-MX/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-MX/firefox-67.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4fe0d5ee804dcbfd9b99f658af522be71acce6e9a9bf96ecb47bfe8e8327d1bdefe20c70ae474cab3ef7b1007ab339f6ad4ab4250e9f985e885147a039daa83f"; + sha512 = "22fec109b6ba39194db469e2d2726e3ffc144e00ef7796ea03f4e778b517c5f4259021255e5f24e6a323a7910a0220bd073b471276fd0c2314d71de4a59df391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/et/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/et/firefox-67.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d3df04eacdc53b02f2a78314f086588983b9ada6855604337e82a5ed1e0046210e2cfd37153570c46dad632ac066bc87e19794898144ee5d78cea0ecef1193e5"; + sha512 = "f9661e5cbe47bfab02054b9d0d1bbe7be732b0842858d41123577bb441ea8b1fffdc37717712123c9e1455c26025eef2ebdc93ae09ed571069de9d834603a5bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eu/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/eu/firefox-67.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b0bb4cabb709ea6dd66fcacfe0536e03d9615bf94ede192bb4aa6f84592b94206be039909f46ba37397d9d396b08f8cecea8e07c6b64d8578280026d89dbc6df"; + sha512 = "155adeff95fe121f1c085d1c88386a4924bf6596263f7618919eb7e09b281b50574e90160f9b9a081a77da25c91f91a774371af7737512d26a23a8352bf93427"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fa/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fa/firefox-67.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6dc15ce8ffa1839df3a9aebc160022cb3be335fca06b41ee87190bc4fb8fb78be4b220855b0bee75efc771d1ecab3080116b3440b225f2e15f20536f84f2b111"; + sha512 = "3e2699031998c306f94fabef902a61acc6ecb4b7231f582ad52120d3e9c495cc5095aaff7997415d37c38ca6910d12bbda4e427a4e6fb23c7a4dbcfcf28c392b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ff/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ff/firefox-67.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "367edbbb90d98216d3d5ea457b101e4a0d682e36961c87477be887ae1f7b0dd5efeddd81e12298cab2e9c2e7a9ab1560288263857e79ee7f561a84bec3eadeab"; + sha512 = "feb108143d2bd720d5eed5087d602ad818a328937e16d5dc8b8d107b62b444263cf6b3cefcfc6888ed889f025a70880837ae116e5e0496c6a14bd5fbdde00019"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fi/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fi/firefox-67.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3a2ba7291fb2efb95663dc01e488fed254045b9d23f84c896a29273c825cf5f1ec5883aa66d2afa0dbaba3ff6cc9b87f14e845010073d897b8dc275a47260ac3"; + sha512 = "cbc14643de454e46945e27f97082488292321b017a88a079a079e6aa6c38a57a1b396817ff1a6d1e7aadf7f018085d3e7e9b3b8826b4d24fe234593671527f83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fr/firefox-67.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8aec13533118aab96aef3b7e7e23b65a651d5211346c1769f649128a50ae13b2e5827ed6195ce265584dd3f63e956b28689b60f807ceaf63d7bc558d5c5300ce"; + sha512 = "9c54f90ab07d1f2fb8711c448ab5594eb789cfa7804e761877a2123acab4123c81e62de247d788ec8f6fbc66bf73189d3273ae09e964716531ad6d758fcd7678"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fy-NL/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fy-NL/firefox-67.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "593f36d08d2af14243779f8ca8223b9e00809330f4012ede586917e98c875d39fed9aa856caf32f8afc6bf14c47ca6e5db0e0a8c9897767c97e9edd60558d229"; + sha512 = "0390b0a05912d416aadd8b8f5508b621b3d4c58be6b1d6fb8554f2d4fcb7808e7dca25133bd14877b0f0c919ab30472a5cff69ed49c6ff54f3a3a380af89733a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ga-IE/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ga-IE/firefox-67.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a272716be03895e1562373ab93abd0c4eb2ac3e8ad5caa1b868607faf125167157aeb22a652d2edf4148c9096178acecdaaff7dcc13e993914e4e8ba899f31bc"; + sha512 = "611e982a93eb6736a19bfd5fc1dfbefbe9d18d36a636d6da911c0c0a61dbfb1bd07ea674e62ba2c45e195ed72007000b47b57cd1156b812f04fbb0b2cdbf2a8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gd/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gd/firefox-67.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "3eb05e39c33873a7323cfe966c31cf1ac073edcb37b6aa37e71b58d29e3dea87db8a4d5cddf9bd64e618e2cb2a3a2314ac9e9a5cd23f099fe391dff9bf7d5bd1"; + sha512 = "5d749b534d1469b4f380edaf313169cc21af4550fe372dd2047c01aefb3994122790ae59cc0d97a332aeec6fb5db17dec2f41e3b6391f4e920b4aa1e3657e90e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gl/firefox-67.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "078113798dde9058778c334b428247c83c95030c35b4964bc1a3b70aeba9d6967338c84f0b88873bc95e2d9cc123eed669dc7cd5345ce81e0ad021ff0e432a49"; + sha512 = "49ebf0aca583b46d3ccbd9b9b8618b9c143435667107cc6a5959db85213016a3f10ec838bac08d7d1d46b2fcc32f0ac2c0416c4d4005f7335cfc3324aba80c0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gn/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gn/firefox-67.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9c5ca6da7eab1cec26ff66649f005b77523ddf325869236a166545c7e0b50522d9023883f831dbc6520396a146e415a458e3528cc96e12d357ae5286dbcc932c"; + sha512 = "3a2f1463f37c7a32fa0fc01e61c869090ae17acb900e1041d23b9d3accf5bbab7dacad97bc6d7bf1eed636d65b3190fc92191ae2c853c9ef4ec703b7c7380f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gu-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gu-IN/firefox-67.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "1074f26748385576f096927f230f4363fb28ee21da467392c23f26b912c6bbdea39d0d816ce60c8bae724b294e979f01662e25f9de9d9801c815bf3363bbce8c"; + sha512 = "25bfe831ee1bb8845815294ee580f5882ba221c4880e43214bc4f8ec3ada7321f2947e41e4cdfd12ce5c642197e5bf14e30a5771334a2d5dcac54d472c1c5110"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/he/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/he/firefox-67.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "9533939e4705ea4ab9b111fe4940c1e875824ac53b1856ad18c4a412f9f8d60d1befb3ce363ae128fb74ad1328504e7a34c20906862ff30e3b83f18535a49e1b"; + sha512 = "b78872c735c2c1ae3ac8cd55577bb26d4002e2d35b77ce5be0ff65b607d0a579771c6ad8c31edfcfa1dd646e4b3548e633720aff883d493aa69d9e5599bc7106"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hi-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hi-IN/firefox-67.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "af50bc6a8951e51babc5e9c5426205f218dca19833ce65baa6b7898a5b469c41129499d094ef8dc0759f34b09dbf25861dd32d97de934548c2713a81f8c253b7"; + sha512 = "3b29ac677d56cca945ec57c8010ac4fe930f08466b9e5ff78e04efe38ad56b674945dca8041340f395456caf92eb9431dfc3d2bc549c3cf043e8cac22c2df144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hr/firefox-67.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "dec21b5d230caf1c1be6e712bd926ed1eb6b74825ae0f07f7c6f39545d0419b71b57c404ecb897d11d9f54f08cebd236dd5d77d9ee1a64a900914fd9158cf4e6"; + sha512 = "1366670fa05db420e03645610e3cf47b687e444219a36e1f3694f643851748a811c2981e786410cd34882ca34232c75f12de3f43b88c2e135da246fa262e30a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hsb/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hsb/firefox-67.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "023bde601d59f9daf8daefa1f9894ec43fbb96a7ebe5b31776a288c07105b3ee10b5972c5a676e04062acc81e8d850424b8e7aec6b8ac8d9194284641768934d"; + sha512 = "e7beeea34ebf71c62356a2baa97aeb6f9b4dcd7b750d1a2ea23e5fc7d3b8670579ad55521920cc347b3b3fcd230403cc850ed47e0e952bc7a248d1e0d735a35c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hu/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hu/firefox-67.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d4fdad7244ba456012e36b64149ef5f3d52b5d139bee585b57a138556ef1f541908a24cd97a1bbd2ef2044852b9c3e7abcf0f634cfcc18a0b44765a3c78126ed"; + sha512 = "cd8e18297882fc66667b4d38bc94b4cf92742a969ae150ca75087daa219d3c92d938f4890aef709d76e01acb59ad960ea8e1b3df65d8c660b26e9ebbc29c0166"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hy-AM/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hy-AM/firefox-67.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4443c51211b8d2874e4cc8dff770c87db4291465ac615d087a9852c81b256e47599fe1e87d24d2e3b0145d68e47e8f128158f89bb0d6bd9baa92615e3b79656c"; + sha512 = "13b49bab2f740ebb54312e890ec4aad5fb8038806db909cb4b60972b8769a6512410746029ae6a8835a02fc9dc16bca487bcae99fc3b69e7520e4a943c017f5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ia/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ia/firefox-67.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "589f94f2b4c873fa43896b57148ca1a7e16038b71476050754a0a0374bf0abe97d9d8ca0208f0101568f9fc1cf441e439817106cc3d68f10a0a075fdd455f89b"; + sha512 = "ce1d7a192a4c85aaffe16e24e90daf26b00b67c8182fa4b2dff61d32208d858e6109dc8638c99b63a2efb4958961893cd60b35e99b6adea742f8a50bf667f454"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/id/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/id/firefox-67.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "602f2fc520a61267f3b8ffe011d50b2e3c1abd4af0e805fdd7a1ace4adda69ce00cdc6b0feb26a46360711e6bf49c83bb33e01b0af5222a71456234119cdde5c"; + sha512 = "56475ac4625de8f53d4078ecbae6e29c9c339e850ee1105a1629c23fce185f804deba64a5f048b4ace205f308b019bc877bfb14ac03ceca229624950cf1082ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/is/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/is/firefox-67.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "162b3fa20530f59fe80e347f068bbd8d7d370a23ee2b3f4582c181ace473cdee06e9655ef08dd6bf514df728cd79935368bfab245110b6d143634be252f84e8f"; + sha512 = "8ae3bd4f498e4d723c989b38be3362cbeea59c50d1a5b0693995382e088ed5ecfb8089eb408308ca266baac905cad404f34a04f1da81567f31c890452f52d8d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/it/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/it/firefox-67.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6887b97e91954598c0ac214b5c072ccb5669a200b5a38875b6dd1ea546b14de7dad9639c64b4b49d3039fddbae22ae7f58b0cd4f3e243c780a1a65ea831181a0"; + sha512 = "37888aed248baed73dc7fb7c2830009d232b94399a339ef243676eea69d94333f754b82092a88e5aff6bf5059320f08a795b911f99be0d339c42360f19c4f5f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ja/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ja/firefox-67.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "194911f101d7eba5a7ec2325a4b4accd27cc26c990255e73d9aaac9a281d40b6bc38091cf7cb138a6ff3ec083639a41b0aa2b005c39f1f89da79526ab3ff2349"; + sha512 = "d5666e93433a43df5a7f0e257672dc6f62fe79ca038243d51a5c99fee04162539a59c9fabaeb96f7b026294d69dfafd7ee601d9183188b58d33922f7294f7600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ka/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ka/firefox-67.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d8804f06b2dfbd57f316695d5dd5350e3057fcb2da4e3831b86b6aeef2e9b558d791f00ada3578ae1c7e51432643814c0394922e128fa8fe9da1604edc84ee1a"; + sha512 = "0449a323b2ea7237571dcb5cac6b42a71b8fe0b0f56c6ca0ab48fde793976d00549f76149632efb2157d332fa1c5234244bf6ef34d06d2f06db480c393dcc19c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kab/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kab/firefox-67.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ee49177da5ff8b91458b1de3940494d7ac503b7c1b752fcea2b4d2f66d4bd8dcdcabfc5b898a34528ff02ae170adac3b48db4aed164d955c4e146df9275fe682"; + sha512 = "c5296bc5367dc51eef2db5fe997f5bcca9d2239e3720a1a27f879f00240a61d5382273a00fa335e537a10084ada6db72948594a0203e1c2d96b6ab508d0ac4ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kk/firefox-67.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "04db9af4da7b10129d28d9a67dcbb233e2a77815f3bee3a8ab9f139020c0876c99c856b460ebeda07e3a5228e9c3943f75e22ce4f1d8a61ae20c143f7263862c"; + sha512 = "01d36dc73a3949085ce3c0d674517b91a0cb3ab4492132ddbed8b8611d1c2af8beaf9fa8bc502af261d3abe5fbb05e11b8a50d172138096f0ffd1cc0da029863"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/km/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/km/firefox-67.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2fdb978f01b44f81041bb3a829504634ddeef593568dc31bfba712d79b96c43d4d4aa95d8a989312cf758d72f54086cfbb0e6a4b1ed705c666b6da2e5b54dc7d"; + sha512 = "3275ddaa870e43474c2d9442c260f095f8064804463c33fdbbd49ff9a9ae71384aaf06d42bdb9745156b2e6b2a91497aff12a6f5d3b1ee05e9dff711819d29e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kn/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kn/firefox-67.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "04686a8b7ff088f1f65087c02c1dddd05005134a6d96d69b649364e4a93db2ae2ab0c1512d37141099d6aa41d6ed51aa26faa942c95cdb3cfb2eeb279d12e99a"; + sha512 = "26d3dad47702a4d117657320f525ad1a0a9aae73884aa251ce51c6c04a0504bb22c90b07572345c6e7e3a0efb39959ece605e1d9994830b8d63b44827af60ff7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ko/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ko/firefox-67.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a798b80f716300ea8211470db9583e326029eb46da217f9862d7deceb3c8f418f09e9a3a355a7ef0b8da3f502d6714571b7a3a0f0177fa5afc565d3df47b6cfc"; + sha512 = "94e84ebe0a125dc6bc4dffd1ba2301e164bbacb7c847dc4006895ae97a8d6200538e8c942beee67d4a602721c3f0d9b63ffbe5e0ee4e939b4328cc078579055b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lij/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lij/firefox-67.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "693ed9d8c28b7401606de9f2c45c93988861f1cd606b5d0d1f9bbff31f367c603f8761b24508ce3d1d5b533a6bd9555a33827b531859262201e6e187e60d5209"; + sha512 = "59f58039ac468e3b5e7ff691aea1d70dec3a4e28b0c59521647a1da8fa7a30ed5818ae42cfe159db733e003f9d64134fbbd8f6ee567e49ae3141a82c3e332356"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lt/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lt/firefox-67.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "291dea291f6bf2c9c0373f8c342e000cadd70ae2d4725c833e63bd99a5e0de5b8ced26d445787900086e55201123503ce850f9f3d481dd1fd05dccd5c66153e6"; + sha512 = "f97814c744c7d2a2a1199ba19740f5ffbf7bc785a140dec5490428269cd736758c4ca4a2bbb5c0b53eacd115fd68bbbaee3700e690179d25146c399d0fca05aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lv/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lv/firefox-67.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "dca344e94c86ee0ede7f993696484eb576b54a71da7151be9ee40540d9c8c740d399840a5c024156660f2b9d6a73c6f086691df9e3b59dddd653d5a25a8ce1ba"; + sha512 = "7d1fda58b62a2314705b64090632df36e4e50bbd696300c731343164ce23eee893b933b4b51addab42d302d50b0834177b0bd0eeeab90be3ae4352e844254687"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mai/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mai/firefox-67.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ceb2a05d4c051e31fe1969787f4d2ac0e73714e45c233cf40045cd35ad751d84c064afab14ac58bb976140976a29b9da5d40c91c1bacd965624667c5fc62294d"; + sha512 = "caf028f8984326bdbc5bedfc30c6939f13fdaeb748bf16e039d34a0455c83e9997279fb6f8a002d85aae9b1f7369ddc2d3965edda34caf5b2a3cb759842b4d26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mk/firefox-67.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ee1fa59d256e279c08a4110ec0f14e64f80dd2ca02ff01033bb29f0336e49118c07ec93b0ca8bc318356dc62fd05d9bf3201d9491ac278a8b5a836cf6310fe04"; + sha512 = "ea67c79d846ff200279b67a0749fef07331051a7d65ec46ef53c73b2f08bc950256e1fcefd651f375b9db53fd6e6cb50d7c5417cdee4854330d92bc612b0f87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ml/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ml/firefox-67.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "477d66f1c875c53e678ccd64a666b64fafabb8b9cfc6cbb11dc33a14707d7a90758f8a42a855020f650e59b1f55373208c3cc96b69ecafc7ac3937eeca00c7ff"; + sha512 = "4b59d63e20178bd1d089f3a003dc30002590374354ef7df791b94e53b2c944367c46e6fc1252565e358b05e50006a91c7571c0449ed922ae3c83453f58fbe906"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mr/firefox-67.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "06cfe20c7756d6786a7cd94677f83aa82fb1cbe83245412d087f7ff06372af3dc9ce5d2f5017838d74cfce864e0405c5abec417924feb26fb9b9dd7298f833d0"; + sha512 = "215967d3811be5f81e1086ef6a3751afe2188035f54708abc8bc37fb9be2eb025d23423a92829a1aa2b96338715c0f3ccc272a7e6309463f1390cb1e669af5b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ms/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ms/firefox-67.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "d0bbe9e5d7dae906dd7140725873126d4583c7e31f3bf4a3d0a7716f5af46f5b5eb65aef3aee32e010e1a82ef59e279febfafb08458c43fe9e8751dd1ff68e81"; + sha512 = "fba2be2fc1428f55f5046be4c82e9d798166a7108df2bff43d17daf18ccfd14dfff9f3513dfc89f48b9ad528dbab8852080fd9162dba23dd3c5ae46d8ecddb7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/my/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/my/firefox-67.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "073aae70db0f59630c16e13c91db7c2a7fdb8a11ccf56843fabe4d666751e27d369e1d57118a1e385b8586d3024ffb3c90f8f61d7bade807aedd6f74e92640b6"; + sha512 = "63fe95e185fb45d557841f8f7d66d88e2dd8a90f62842b8b440322366235ad2fe202008e9ebff9718e2e5405a7cbd0b20821965cc764dd8328996a73a1942f3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nb-NO/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nb-NO/firefox-67.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bf4c6affece8d031da249dfd113f1c2f7507a8b4473e03daf5a44e7c0ce71fe6caa4759f78ca954761f90bee06402f7f5b5a9f785c1785f973feb1294947e0d9"; + sha512 = "780cee54a6c91d172f8cc0d7593367f825bb17d2bf2d98fafe0b89381f1e97d9375d2dfeb83131b0c02919696f354b5a25f3e5766cf971a21ca1a371fc1e2036"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ne-NP/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ne-NP/firefox-67.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "16902e80be172af3bc8a2f02821d9e738864f593951619159a0c362cebf0a5827b1f3be9063c1429db8b1ad52aad8923db8053b6367d21bc97333ceda0899d25"; + sha512 = "48bbe58b75d5ecc4ff9a357f01663f158ae492111ab80bce2ef0a13ec07390dfd8fe3b6ae60286b79ffef1f76e8f18a801f84f0e52624c25e1fe985bae5ff7c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nl/firefox-67.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1ba6650ba4140d4f32391f7e05577379a43ca5ddf064ac86c93c633bc1d78c6c84e6d5c4227577dbbaef4d5bae9173861295805e1cf559ac25fea434db2df578"; + sha512 = "72c2c191bcb5436c95653dedfc9275c6c0818cf545b051412d6c05f0eb76885630e86f11b6bd606c4ecd9da65f8466669f44f3a7b12566e4236b15765db1f23e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nn-NO/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nn-NO/firefox-67.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "860030e55b0c514ec4219ec295a02f2ab344bb87e31292ca4ad11501c02e9eec3f1b82720b7c3d69c043ddc0a53fb9ff3e83b38d4e0443d57849d68bf98b0e05"; + sha512 = "0f8fd8e79fa3b0bc2b595d76b37d855fe6444eb0fb2db37e68100176e35c28b9211449866976e6a33d61e3c2414694c9e7eb87b4bd6e64581313d6586dbc22bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/oc/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/oc/firefox-67.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "33de39c5c495d0ceb5e1b65fe96458887d0a918681504c7c6a561359e29b82a7026673516a5afaf67717ecc0aedffa8acebc92b4002d160924e87d401e963ca3"; + sha512 = "7d5a4b33ca3e1ae5596b1c913eb7126d3c2dd77a8c3e092cf47a60c9c3a445df000109041e9b3e7cf9471ec544d602717ce20c6d75169c0f9835e0d21c832830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/or/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/or/firefox-67.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "a1deaf9593ba66eb3e2e1a019ccc8a3b5c7455b0cd250d6be3708971406148404a3e10f3d67ca5ba39a25c92d27006d1196e11e12f8b8c5cca518d748b5c7841"; + sha512 = "41fa63277623f6f3d27540f5c7540d3e6dc4da1b7339c85f728bd549810077203f078fdde4e485cadcb186d301ee45dba310d5394a26e080ba39757a851fcdee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pa-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pa-IN/firefox-67.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "35df203d2c9a892b5cc4c9d12c10e7203f466c949f382074f550a45df54f670168713ac096ec085cb835f51f0790c9af2a88786d474a0dbcd6c8041d2a1a1244"; + sha512 = "1b158394b06cd14dd80df249135d5a78c0d149c8890d0fe14db68c8729f05ec7a58532efc181925309730c9fbe0cdd1e508afdc48943c5d80bb15e88687b30bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pl/firefox-67.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "81b08e3cc5e2b7dba6110ebd455431fc04df6a9bd54e15f5ccac9792b80133d9c8ca4b59746189d5dd752b48e4053ddb30dbfb01f3467617349eff8dd7de35f9"; + sha512 = "101f51942ec1a5b98d9c4bdbf7db9a214cef288885334aa46cd6911761b4a83bfd9d40b82aeec8960b864cf61828d108cf8806c9afcb0bd42de5fa426be36650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-BR/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pt-BR/firefox-67.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "821bdd23cb73437898dc2fe570ff5a108a2a862b2cfd97d1427cd235761c5d24f6db33dffc32c0080576c72a9f1b2def8c7d398bd3ee354d5097b58731d74ae5"; + sha512 = "7c984497c8d412a7afa7031d7f8da11846ee3b9765c0a983c282b4969acbed35e18ac0d242ded8fd441e01e934e7cf556ddce94c4a246044d46df430e133f160"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-PT/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pt-PT/firefox-67.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "611b13950d89e3c21a95c726afba58201f4be46bed6c16bf3c732400b15cea50860cbcefd98ad83ee864b8bad9e89e42b2bd075f448ee8d8eed352fdebe176d9"; + sha512 = "dcc1244206ca7715856bce2377159bf9e5e77512565718c817f5fa97d27a6423f938d8f8bb41712d2fe317202619bb4e6a4232c5baae09c43a070bac2ca75bc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/rm/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/rm/firefox-67.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "53cc28912e17b5302489f0f4a89fc4ab53edc319a8702158ee7ab0a0943b4c619ddb022a5549a0c4ee2912a98f5b695117a991bfde2f10a9036196298334a208"; + sha512 = "30a1f1529193f04213b5dc2ad7740282a08fa412bcffef96fba1bc03ccd5adc8d85045f5ef17bea870baabce5f472e5f7415f1b8bb8ce4af57ad73ced79da30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ro/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ro/firefox-67.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "50c753c9cd79bfe6d9b8564f64d275958b7e44823e4fa5575bbd784ce4cb4f7b1c3c71fa962a8a26f1ecbd1f2a12f108fc7505659be08063d0246ea29488a440"; + sha512 = "5eaeeca9c47db5101e7bcf5d2e3716acfa080e30dca67ef95297e5865b96e204c21846b7b22eb036a76e36e0d61daed8782ef5e8ac3f769aa8442689ecb860ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ru/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ru/firefox-67.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d739ceef1bc6328ee17187e54e3910e1746d516f2e21f03319863a3d564be6ea348c87a8ea9f302b692c99b16c242578af15788082e121b857a1a089ef0c7549"; + sha512 = "56bc5995068476083d925ca704ce07d96d765458678167f99371e07bd5e0a42baaeb9686b3a1be967e2c5f1f7660a0a920597a598ef68ab2d26aba6a15016de7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/si/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/si/firefox-67.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "35a4cd2e1e324a0d8e78b679dc5b55b1bbbe2e73a9b37a65cdb24209d9eee5d52de59b3656f2fb65b6f2513fe4ef70027cfe5e9268a103df95510dc673eedbe7"; + sha512 = "6a9bbed1a3c7da20da354ede60396afad68e0d3c47e6eaef94f942438d5a0031de4df38b0056d6efd407aef8e14df33ba34cffb8222055499cad0231190598e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sk/firefox-67.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4ce6acf4dbf83010c726988eef0ba90fc1b54aa4213e4c335446d632dc99a4f9646954f45e4ed143a132802f10db8a68a6335ee4f855c65c4adfb02dbeca4443"; + sha512 = "de5c54339db849c38a163995ed5ea495cef2e326afe0c33f4b72dfc840e4931d998c878d002cb8fa543344cfb476dfa2dd6e6140eda0743f8272258e7b1b53a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sl/firefox-67.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "097dadda67b70b58244020b4a747dfb6a9a638552b2387ac3dec1130fab79e156bfbe0e4dc913e1669420dac827ef0efcb639560fd5366f8829e94456b2afb74"; + sha512 = "8f5454264e7d04f8a91559223e9f659af0444e5ae14d1ee511ae97bcf9993132fa4f48cf2d2946e2c56d23d16e9f0293ba3c7fda56e57fa198fbc3e9157f2782"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/son/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/son/firefox-67.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c01e0d7d45bdc5eea290c939a906efe18720e4f1fc60dd33afb5252f59c90bf40e227f1392212cfb272efdda6c1ffda14ab617d02332610d0f890f886d053f0e"; + sha512 = "872edaa811f2aca694151904b326f57b16a6e486b9925a73293f3a73aa175dd2d74b96c0b636ed79684ce21c212cf559134c4f92c2a4d0e950ea2a35eb305b94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sq/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sq/firefox-67.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "68020ac5ad6035fef3d58990718f14cb4175a2962b850b8ba98cb5832a169cb72c4eab9036da693b93faeb601ac0f35ae23b80d748be0dfe4d0414b51571f6e6"; + sha512 = "61fcf211977befb569ba38189171559cdef48f00771877bfa628ce519caadb9bf62fed6913ba0b9eac7961f6e1fbffa63c03112e4f1267e0da2415fe173f0f73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sr/firefox-67.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ce18d0ba989949e79cda33eb4ac26a3d7588acbd511e57c9c31ef3a3f8011b7f669cff02e4b0405bb2615c18e600d75824fbd556519dcd09616fe27181f87748"; + sha512 = "04cadac4237eedf25120a0eb91fbf5de4a35099b61657f393d3888be894036d6509157e1097000a21009bdeb159c4f39d3b91ec4ef616c05358d67acfa34b593"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sv-SE/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sv-SE/firefox-67.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "96008e9c2ec4b8cc3bc646185a502cf26622d3f4f2d9b23ad02a963c5e4e5a1b98c1bc2bba342b0979c4b9e079c22a9130ab322d27d0d469afc02a41e8f3888c"; + sha512 = "29ec5c7082e8b2629085e6748fe8e06de65ae2a90ab0c05f094b9e7583759159b20500aff27f5b791681c26183478178011205cc0ca0784e59492a27676f443d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ta/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ta/firefox-67.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e90c1bcb5326d3823ac6e8c0bbc1d3e98a5911f870d791af42a7f6aa539c95e267eca1248df03567f7e09853178c40c428b3cc04bbaf15553f1cdc028194c60d"; + sha512 = "09f72ef5d673ef6932b498e784380b69d40235bb94dab70e1fe3b61614c34813777f699dbaaf42c3f2a1c88b6c3d15a61d398ef9809003be34391ca4845f0eb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/te/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/te/firefox-67.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a5a04abacc8afec69e4d865ed89f0f029b623cf24cf05d275ae79dd292d28e5fa000ee9fde4325144e2a7727d0be5929c9f7c30194eb802b35efcb2101422e84"; + sha512 = "ca1d6da340e656d111d82eea18d094a6ed7c4e83ee12a2b3f022d36f00ebd5f8a14dea6187c19712a971a856c0e2ec11ae5487c801a112002614f065851e09eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/th/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/th/firefox-67.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "1bfa1ee19141416707afd13594ad94da0e5ad5bf71ffe098109dd093624531a438df3dc3d4da603821d29e139a007923e367ce6ef55837169b49469ee030e752"; + sha512 = "5bd2de469ec5c94da8e914961a90364a4b6e16959b1e7c0e31e4394ab0056a705d89f0992d1bfd5af3c0f099976b15efcc4641c77867f3dd1ac4cc7259f62693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/tr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/tr/firefox-67.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d89513130852096ec1bd685cf5072456035024e951dc9b6cace23ac8d9d51fba47465c3b76d96810bfbbb651188bc9a5ff082ec58771bacc6c9b1eb46d99ae37"; + sha512 = "1e09cadfa9d233c45ee5d7db491f95d3e598de422217be8e4e5c0f5582b0b6a1886c4922f8c61987c522508bb733817ed95663c70a1a73ba273439ab2bc2e03c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/uk/firefox-67.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "382b333159efaa048cfa73d7e11874a00e4f34c48ab38c4263f49184d00e3f35a71cc21d11cb09b0e68c04e714d086aad30b346d91955fcbaeaadd968c29fba6"; + sha512 = "6b8f8d8dfc013c2aefb1c5502aa881f592065c172595f22937284f4949da014ae7cc463868e3c4b1f2f4420af5e1d2e26aa81b97d696be254f87ec6512740c83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ur/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ur/firefox-67.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a620241d89b926eb1b42646a1d52e75f049191b711cca724ea1b6335ebf8c0773ffebe97cbc355396b21c16b7c322c8346029a64355ebdea2a5eef1e5329754c"; + sha512 = "6e5bf0d060327388d9816a09aabc1368645de937633d3ba8105bfd2da935cd3bb7c191e46b3a56fa00bdf99e16a67c66f37aec094034ede04b5519d2968b7dab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uz/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/uz/firefox-67.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d392eb81144e93fa11b7c85c6defab5eaba7585a93f5fa475531d2be73a65c546f3f88b24cd3370bf301c4f780e60a53bf68bdd480fd4a6785e9c1583e71da47"; + sha512 = "3a74620b79138d67ee948eb47c6caa192bd4432b088f0b8be4ba5b0769deaf4ecf93933cc9cf1c9389f120c828918a48227b4cb0bb2342275949b816ed7af4ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/vi/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/vi/firefox-67.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "7b4686deba1dd981e398f1bb6f192f828cb1cecccce6715c81cdbf5e89b4727cec214784a1920382e14c1091b20bff0919f74e1da8bfbb1a3568309801bf7a9a"; + sha512 = "aa5e5afa2d19e319fe5b263fe076ee7ff837f2b6f93e22afb90f18a5d1bd446605be1475559344aa11c2aacc825341c786d6235e87ad5fe5b6da4138c5bced7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/xh/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/xh/firefox-67.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "63cc7b999aae85c46cc60b2cc0747a25e1d0663756938c329fc539a3e8ae04e43224051e066cd05bb38ba351f1ddf868d1651da94c0064d9715e5019b78496e8"; + sha512 = "db2d6d8781dfe93ef9ebe8e750871d950a4f7046a2eedbc7d1646e6da9d62a5c14573d8f69d9cd8365763a4809b79242f1451b6b1fb7b81888ffa69405dc087f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-CN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/zh-CN/firefox-67.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1d902bbc7a703e7b541669c7f12427cbc74c01d784383409def1babd9907a93c53c32ee6c52d4c237b79bee69d005226580387a08e3ed51c1d685853637c34b6"; + sha512 = "6d386c89e7dc5062ee72eacf2e3524cace2e6a6af9a52a418a07c20e91d3d8de55d95dcc6f4fbe956a86be2d6b8e32667846b81299542c5b2296ccf4283dd315"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-TW/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/zh-TW/firefox-67.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "cf8133b5330c4badbdbca14681226a3298e4bf4844ca2be6208f4fd7d3d209f4215b4a3a1b599d59b449e3c76808d71eec1705bec47c964b219212d4032ba1ca"; + sha512 = "7203b16d135152122592a09399c694c00c0db97535a8a46d97679765730c9d7b4417523a3220a57aec8638b9e40f4b63941c0c20d23534c10ad1cdbd6e0cfdcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ach/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ach/firefox-67.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c285920aa77f311451f3eb36991118072afd9d5fe863d88a49fecfb56549f1bada5ac364d457e7158a2c600b216cd5672775f87d85f3aaeb8fe648d19c8b7086"; + sha512 = "05e8545f2a3f7eca97a6537fa5113a2b9da13ddbbbb5028d5846ba2c2307bc276d5f555e7ac1c318bbb9b34a26f9e07fa94ed3c74a9efed2ebbc759c6160b0d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/af/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/af/firefox-67.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "335452fc21c6b25775b93ccdc1ada7ee9430ba9f4b6b8f6760a00477fc00a2bc1e68f318c0260cb3386dfb6ff5f1780293393f9f700f15b2013186d60735d789"; + sha512 = "6c6cad4c7dc670d6fec681c93aaf2a64238edeef4654ff58a887bdadc26a1e4649a356c9bfcbcfa54d013ac8ee4a252c4be1259e64c5e2a358bfd32ff1e78ccc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/an/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/an/firefox-67.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "548e723fad381a772e48d8a60a2bbbf11fce50ca187fbf052d9fe153fe9c6c592769fdba4eb3c4b423ed9775497add0abc1ccf378e13ee4f069531fd0cc03e29"; + sha512 = "81f25c7edde79c8b5f023cc99b63b9e4e0b14e7b5171cac6c17874e29ddf86f3e21e215fd0d096f2552c4871bea3bca64527c578c0d85b5abf3fc6cc09a9ae4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ar/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ar/firefox-67.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "08834c2b950ec4fe06fe1fc3eb65e4701c01c08fdd91e59195053ae7638bf807a20346460ac9938590c5625e3e6845bab4205321e8d5e312fca69250eccf8303"; + sha512 = "b917d3f9d0cce6895b5012e89a58396c1daa97b108598412305a8d0eebfb31de3f46880a5509ede12313dd7e3c23f39fab03e3ada6f305ff3afac4a1ec672824"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/as/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/as/firefox-67.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9573895c11a55f34ea6e43e0f072119873a28c85478b144ad4822ce6632b09d2290a87db67957b3c306668ffae0bf2c5703d4e3ecdaf1ae77170dc9e28ffb2e7"; + sha512 = "7ec4aab5acb2c8063d7ad50c75c1ad7f68f5bc585dc44843e03f64283e1bf8ca523f96b594ce714b1e8887466af166c22950439f2e2826da74ea48af70c6000c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ast/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ast/firefox-67.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "be780b51079ed16aa62b00e0d116d8507f4cb858a22a5fba1e95d5f38c087b56b66e37a3ae50f4e2b5e5db6a5162762dc6cae94e9c07d263e38c480fabab50dc"; + sha512 = "d569429f61a1457c82a7d811fa648e43c32e530f7bac23784ce0a2d46dc9af0fd3d1227f56d42a78178cc7178a68bd61f960906a671375c94d5beae3695d1389"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/az/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/az/firefox-67.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "11c28539d558882835eae2c70e1dd72019eeea8892bc0062467e77b6a87208ad8d9ec3ce8b6e58037013f92e495db1bf611ab8e64ac69102c832952a021d018e"; + sha512 = "061bfe7c52091a204dd66d3147cba88a674c0a3e8fbd4cd2daf679f6bd8cedf4c7c204f89876605e558399acfdc5b07712feb8c575937fbf000b8e22b8311732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/be/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/be/firefox-67.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2ba110389b2f416aad2d62e0b85ef2b99494be3add97908b8687243968cb44a6ac0057f0ffdb815ad7e93ea1d84e718163fb14839819efd9a4a38375595a9be1"; + sha512 = "68da2d1a6cb21c88dd2251958d824818416f468f55da69bbd4f7a3c95b07901be8c8baa661659969706ba6fc7bdc89e3c8c109b3bd4005f1d3c734c8648b64de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bg/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bg/firefox-67.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "e5793f784fa49d07714f9984a884dcf9685431e37453525f67c0263d991edf380fcd96e956f9d715dc4d32c790b5996ff23d7e759ba5849b91777e20cfea97fb"; + sha512 = "ddd78ae52a64ef2f99a928cdef1326ac4c2b21f71728831273aa69bc767a23b698f019642ba1c858eb7e44a697ee11ce51b64540de02677209133d4b685396d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-BD/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bn-BD/firefox-67.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "80670cf579eaa7f7788a90ac4fea4e85a433324eb258d6d922a85585a9bf8fd8e3955343e4707a06e98f1c6ebf7881b0dabf4a9e4a3a8b503c2cb779d7a60c4b"; + sha512 = "2e2bcf0675fe48f876a3bc6c247f3affdbc36b8ee48660f9294827061d31775084c9c25e907881a7b32446ca9832305afc560928afc409395ea15788b1fe99c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bn-IN/firefox-67.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "bfdcb672b4bae1bb140867e82f3ec1ee8a431d076d337ebd44ba17bf532506672ed6631ee54d80dbfa0b7814b77099fed2de345620a94e14d63e7c59578ee01e"; + sha512 = "e92fa6388b49a2c516634b1294c8cf67319a62eb3c3718e53121dbf8a952bc2d2aef7423b79c07b39f32804d2a9088adc2bcead8f52f7409b7c847d8eef03f02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/br/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/br/firefox-67.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "275b32a715d433027b9a7132624358e47d35ac7f81cb43aab21d646aa7938ca7ee26aa67839fecabb556badf5a8bdf6656ff3df5fe9311452b9aa37aee34f98f"; + sha512 = "3ffa38ecab1d96e4bfc62231bc311a3fcc71721ab735887cf1a3f40f8d6a483cf6f029509a784d8b58e9410834eec3a05f8749c7df72f55b42d34c9c497534d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bs/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bs/firefox-67.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2684ad81e644ff26985c938fe88433b70e5f007b0fb767e361070376ce10cd81d179c96c500209316e5cd5dc239fb68080fccef04988014ee79caf4d7c480197"; + sha512 = "09d2fc5b5df4c9040d81c0d0b91b88be7a44a244997c4c09344cdf9b116ff9c0cbc76f7e0d391533575b6c4eec56ec184e53cf36ec1d8f4c22a6017a5de743f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ca/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ca/firefox-67.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6cee8b8cf26e38e785387200d84792a01081981b3c2934d2f9d06ef50b26967d0098e1429b1af7cd819618f5079af2a7533060a886be5ff10db0bb108fecc68e"; + sha512 = "df7fb7fcd5bd01e7c71c2d2b94ee5a00d3006761cfde5946947ee28a7a04fe343672d41fa8ff32d6f7099e960441a0fb9b9d12ad50e6668f795ba81c1251b7fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cak/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cak/firefox-67.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a7f3963b020a074006fb6e367ad25b632899d14b915d35e64613a39fd0c185425063e92717bcbcd3138c05ff73e7734a84833c0065ad8655166a50aaee845946"; + sha512 = "e40cb218abdc28ca054789384b19205580d3031c4d6d568a29d95252f5a7c23862e8aee403a46c427d1fe70184c3ee81515f79c5dec4e476d44af917e275300a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cs/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cs/firefox-67.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7ecce91b3fd5986aa58b51e24c46d3c689050a41e95bab3136589b660db1ea4509c93cab7bcfaf13b93ff533ddbc584fcdfde60a0b8d4485b937cfab9e98e64c"; + sha512 = "da0f27f23e1d08cabc4c8df41e3c7483c3fdd263b062f8d9b9e0caa6cdd869856e275bbabe3e6883011de94840c7c1684f2709feb461d38d56a25575065403c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cy/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cy/firefox-67.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2f402c190177ed0aaf52923d003fe886403ed086d6ffcb0ccde9d0e9384168712da5aa7d7ddcd0730a0d6387a079c699226e039494667affb66d911882f20892"; + sha512 = "da5f34a558637732e5d312b7e9a48f817f5e94b26c1e4b3fefc2e19b126da249a121ac2376ceeb1519adbab3ea8b690c8bedbf6ba73ba5d8697ab748a8e02fe1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/da/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/da/firefox-67.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7235f4293b950fa26aebf81726b00420db83e423a2d423569ed4d7754aee7fcbeae50b442ea831052220d9ed4c84d922b5a4658bb92a5bc6c27f57c4c0fecdb3"; + sha512 = "0827ff6b5ebd3f6a00d5e0a1bbc539a2281aad34434ceda8dfa09f50e1b96b91e7507b31cc493da9adcd879bcb8f9ab6d2614def969377cdf449454906bb31f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/de/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/de/firefox-67.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "472bd0c3013a9e5b1ef96b30b1f5738a8c9bb63e76673bed6a45aa4c28dde3f1e5ed3cce16d18b47448c92f6129ebe22479480f24b9fa277f1b4ba1155ed11e5"; + sha512 = "1bed4fb74ecfb8a7259142bb871c88e88f9a6bdfd425e05c2e3253c972ca3f3609ea736a58c49e370bef90698a99caf4350327e876cec4f485ec504ed99d8d76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/dsb/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/dsb/firefox-67.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b4c8001347555317bf5cbd89e29174700c025eb8f309a472126c572dd5b6c85384263264ed7a8ecda404faf632b9b2a3973a1b948f30c3e3b205bc42d6b17bcc"; + sha512 = "908f90a44a2f4d42e617de8658674abcd7311f81b5a0dfea1f475521c752b143a48ab4f26442ac41799e540d1809f524eb308d4d0f3d2bae283c4b1d4c262291"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/el/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/el/firefox-67.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "de37aa7776c31e28c670fae321d7bde7d4be5024bf5e5494688aae1aae909ffd034b46004b0d816988cfcf03ce9ffa326a503882eebc6ed05a67df0bb3d89d68"; + sha512 = "4c920a7490f67d3f1a0b53593f2e08127897b07bab5a1b1fcc94750cf661c4e6460710f482b9e79f8680b4af2bbd481295b2403c192166287a4d5c5b7a59834b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-CA/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-CA/firefox-67.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "95cbe469dbaa9627163fb989e6b366324a4005ddcddc5255735c95825c6cf116a6af12bbe4d44d1c6b55c824ae00e8b122020f261cd3f9e450cef25147b2bf15"; + sha512 = "1d45f4973aa3ca40ad48511232a5c003eb2008911fd42e777befbbf4ead3c1f1c932a07439c7312c1b22e250d1ce6cc37ca4d65a9aeca83275bc0cd1297c7c5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-GB/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-GB/firefox-67.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "cbb468eb20d7bc4dfcfa229dc45e0fdbceed9d97830baa000642d7e740f1f28605de57112b54b75b1e08fcdb2a4e03cd7a7fcb3fbeaa4fae84ad57c1e564c506"; + sha512 = "d10f9e09af2ca2d0c2de3834b2601b1ce567c45bf8af62a49ea982628b18fa4efe4cc0140a27b275bc1689021ff80cfe2bf2ac1385506d81dda8ed48e42de143"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-US/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-US/firefox-67.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2ae29e73ab8f8dd068b5e09ed78b2473294f0791643adac77e1aa565149138b3e01b605f20f6b2e02a242d44e67bb5e036305631bcebdf2a15fbaf9931f011d8"; + sha512 = "851371d96f9d951e9df49fe124d09e5b9351edca88ec9c73c09497f55037012152b2ebd16feb133f1072353c1557283d3ae818b7a09bfbec6544605a75f77f22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-ZA/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-ZA/firefox-67.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "b91e664151d3b2cffba5cf23be229540a72e1499b1329818f416f9437a3141a98de20b5ce17b2ee2b8c7f540e589a4f1bd9a949f03bfcdd8a8c00fe92b0f6cf7"; + sha512 = "897060daae75f0d0dc706eef76b83531e52be488ebe06d9426c49214d800e8aa4ed7e74481c5cc3609d6d972dc689c72b44e7c9ca8adf624a553ebdc3b878fd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eo/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/eo/firefox-67.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "09eadcf32183d49b388d8c8aa1535349814ba42068f8325aa34351b6b4a51ec7e31d070ac836519e9d531bd29981913f5998cd83427b308b68f026cd27ba5fb3"; + sha512 = "9f249a21eb3aba5970d9559032e7607f312a267445670e680de36941076ce94fa1fd097455928b48c1fc2ea261ab4c3ab690446dd4aa76fd672232c87dfe34a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-AR/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-AR/firefox-67.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "792b7c4934e4e9cd0ebac9586919bd65a142230c0e88da7eb5e848c05b7a8e5d82a906815f448a4c618f0b068d3512c7170cf0e409cf0111b24a87eb1039dd47"; + sha512 = "d125703b4ba3702facc644e232ca99e80c3010ae16a264ce4015a54097d10abfe556fd5cb64a6516aeeb571e5ac62485fe232bbc5a7a8299241e10c69b899ee4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-CL/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-CL/firefox-67.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7729ac7e668023838ebb5790e0fe482f20926308e7701c51d010bc0680605967e7918ff572fd50961d749522fc15d8b48524b6f3b532428f2ad1bb3c341e0369"; + sha512 = "527bcdb70f9c58f87f8c6b6ac6f3670ac59333e96388317febd72427d71bbc0751664d23874c00bb15776e90b373442151768bf0e50bd4eed2b110bf42ba7899"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-ES/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-ES/firefox-67.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "14cc974cf9cb588d35c9a426b38d747cdef83334a0f46de482588263e0c4dae0179821dc6dbe938ccf5c17ff8d2952665522e77b9dc7ce5a8a65ff8c2d2b8f12"; + sha512 = "c80796ddd41126e488e2cc54585c5cf4fc5be4e9208eeb9bf37a541f4f04beb0ea8dc6b8fc5d1652c281d019079229f257f4d3e6473884a62534f7e95b44ab38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-MX/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-MX/firefox-67.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "0eda6a4240bf8645af0d1f7396155cdf13d73091c5599c76876ecbc45972c3cdc6685d694aba41d42a7f50d49fcf4910a382f1afd210e88bd8b1e219cdf954c6"; + sha512 = "f536bda54effe87e79259aa956706bedb4a0aeff2768bfd1acf4a4afbec330ce596461c535c5fd0e5e04491be650b8bcdf723a33c88674a0a372196a8be769b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/et/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/et/firefox-67.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6ef2f06a3549fb58bee6ac59f45b7758f40c3b76a16aebf2d2ad2bf602e4510883d0c28c941162e96d3694dff44628770f62682c5278bb09af30933442ac5baf"; + sha512 = "2078e6d8b02e3b56c03fa09539e79f0957ee3a4685736f259e97f3d0c3e54cc7822ac696b4cba64b5440af99b0375fc2adefd32fe91f2f1e4cd69e88682b0c99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eu/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/eu/firefox-67.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "38b323bdb16931abc8ee01b1e3e19e893d2eb830f55775e52e22cf8975b44eb67420d4b703fdb24cd221728c728b6b8f55d6476c9fb4a22324b9acf422d03d23"; + sha512 = "ea548dd6a8885b97713871131155c130f021993682269b84f18d84fe47b0a36c9a4b831d17dda3c49b75274a1c6b2091d23eed71ba6998429c950ecd12e394b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fa/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fa/firefox-67.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "3211681e01a02745e800be7e7744b25c12c6c774efc2eb9e9167eb13e55a25512c6f8e9d5203967851310c38b9304d1c4556673ae305b782d274c2e8eec13d8f"; + sha512 = "21f69295ea88573d2b86697cf40b0c2dfbb91bbbac3255167dd3fda9358dce96db60186093566b29ea5af616685c0c38635e347f80004a1474f05aaffd6a91f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ff/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ff/firefox-67.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "17a867cf3d51f59b740991cc70d235a55dcdec256913a461055c82f461f629e51fde1ff8931f6315507a1ae4f9d7e632e69a06303e720bad0d6ff853ea45f1d7"; + sha512 = "107b54a8bcba2b6c883b9056025b6d5a1cc0ebeabdc7a6e5b9d6d5b888caf451b2dcd5533d43d64f635ef0ac4fd4d76a49479fd2b7d28834430e6c87dcb617ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fi/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fi/firefox-67.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9cbd9620e6ebbed8e02d3acd35967b1f797ac8ae141de45d4be5bc21b166ce6803b4b667b05de789c23f8326c652b2b978b5681dc84af49798d319019dc9bcf9"; + sha512 = "d11ef17af249addc815bdd4a7c452020a988858f4cb54a5de8e0d6b3865ac7f2ff6c46253031a174301d4921e10647f03215a52f72de22f59c686821a669501c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fr/firefox-67.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e4cace463f0f87532274f1094c7e843eca07100541f300bdd092860dee986a87779e03bb960e4f6a06d652d93d0e667093c516614442277a9106a84cd8d9ca75"; + sha512 = "3c08279fb7de2fa92a2a7b139d0e3e33445b999748c44fdee757d0c0ae659453110d1a3cafab1e91aafd09e546aa1134e7dba5270a59c43c07d1ba63163320fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fy-NL/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fy-NL/firefox-67.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1cacbe08d3a059ced3397110fff471b5879e3eab9d2391383063638d62792c76432ef58be2b2c7d4e23bb72fa145a175ff228314c768a1fd3bb41b72df990b66"; + sha512 = "022e12e20b75d5852a4021cd563fbb06b3212359d37b0de5bc586e5810f105756b95de6fcd74b523e5cddea55f8d4cb9e0396db41b8fc3c22c6f304d7bb01e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ga-IE/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ga-IE/firefox-67.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c38de270ccf6b7ba5caf2ebb986c80a7d35996a3b7087816a2438e5dc8440819501eb08f9810c592c699b101693cea256c5265b37f51433558fade6030ecfc5a"; + sha512 = "b2c5e4804b1723555334dc5286e1b263765fd85625f360f405499da4901cdc8e07faf33c76ef4db98858619238caf531a433ce0296b51ad42e856848b7ae6207"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gd/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gd/firefox-67.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "57573946f74bce289e14e7b07d4056e3fe2b631480a6fe25d8c844a7e8e39c5be4e065d21540fe53bb798cd35cbc26839cfb238ace6c312c6a1b46e477f6116b"; + sha512 = "9fe09dae3d82f840b2447246c347ea42f263cac096a5512cdde71d575d615b232e5ba1b84f833a7e6bf7f71ae8835a799035f8fe7b68b16e075aefe5a40e8ce9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gl/firefox-67.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "816c5bc6f70d211471d469c4c2e8492fbf314419a24be460ba9df68f1548f1051333864220d664214f830fb15bc9e19092de5e070c09dcb938674f93b7b05131"; + sha512 = "f11f8fb98415a628a4155f6f4fb37652f3e270495049ff58fb782968c222a3623e68cb048952b8f4cf7fe6865544e596cecaa1617ee2132fbf1ee3ec7a3baa3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gn/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gn/firefox-67.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dc09910ccc01bbb19adb3d02ea593dc959912a704d43e23e734ffd9d7f9bd19338832786544dfecf2faede03a9560e10537073208c1c7f23e1078a876c6efa54"; + sha512 = "555a97a026f3a034c81b02f60ea9374c5b7cd9e59c9f7a21b15f965f514cd54812d50b777522db242151f938f72d401f41af43188f3f98afac1140e0c9b06244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gu-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gu-IN/firefox-67.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e2160344d5b59640c454f1387106c775a4c7b230db11b08748a6b5f253af9aee6656cc579068693e37c9c690a5cf21cd999d805c335b83f1b66f5d762387f8fd"; + sha512 = "39332b77ecebf9aff868d82f82d1e77c05eb8dc11da95fd1d959cdcb0e240fc1d10004532b0a400fb497bec3eb136396cdb2300f079950c3e101257c77a6df8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/he/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/he/firefox-67.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0c2cdf90dcf41e0912eb13e11e0461d007dca9c78449bbbf674e672b47552f3210ffd14b80442781c5746a098098e31756828652cab0e347db020cc37c3f6f6a"; + sha512 = "de37d0d61b096408ae5610cb44d5f88f29c8e7399053ca62962e17ebe88eca895eab9df49c66d949354dfaffa0a3bfe427a6d704c969b578d0471bf411a400f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hi-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hi-IN/firefox-67.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0adb98dd37ddbfba3bc08ce59dd9f401fb00c6c5deb550b1a92baf2f2e42e4ab6aecc0f9ba3d35c57cefa3326f112bff351f4ff9a258369889565e4277445475"; + sha512 = "bf46d9a1cb5e6ae120f546ff5818c0d0b0dea7c6c9eea7bd16e867453c7c690d5f7dcf02aa5037ea3a847f10d677224cebdb2df454eddead23c2dc611135826b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hr/firefox-67.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "86782b71427e4da1c30371e40a16d84b13b24e04358d812a41faa08fe7bf178241d44fa91922058554e959008e276d38dfd61f7389e0c9e44737979486f22718"; + sha512 = "206cc0edc61f7f14496ca252c91b199aec921496e012684c1e70b3b3b7299b9f54cfe0cec07992c5198c3e8d8ab3576b94307d5c989aa3910f21046f4f88473a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hsb/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hsb/firefox-67.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9ba1fe0695fd467d48c1fbe78423f0b91c962524762f1807b5778a9f81c6ff623cc6d4eba618a228ec182414e6e6823447b3992dab43176655fe8f90fc865c79"; + sha512 = "de37187c7de940ef9561ea5ea37dee5def8fcd77ff3ec7e41cb0e3d2532f8c8d0f6330881d2fc5bb35051586c936c6269b0c0625a9043443b3e62c974fe97766"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hu/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hu/firefox-67.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "47d44fca671a44fe085bafc404992ca8c2b3fb2155c178c2cf38860e7105678077125487fcc459da3396157904fe6870e47bfbed09b4eaaddbb404715e2d098b"; + sha512 = "cb5285ec2351312c4ce92d02762c6f70c01993c7fd8835bbddcf9f78cbd4bbd1934b289caca41d7397ebe5925766711ca59a30b64ca0134deebb91502f7184d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hy-AM/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hy-AM/firefox-67.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "72fab75e3cb0df96c2aa101475f1e66e5ad36473b400d4ea3efb1e14b22028a67303228b04fcf39221995ee3b18302d9d447b315c48401b8acd566d815bae60d"; + sha512 = "c76a6ae2abe57adeaf770a6aab892752c968a646dca1d4cf4ad515a57decb2b831bf5b2466cb0c4c873fde6c3e63b1d59ee0c4c916921575573edd29c2953a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ia/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ia/firefox-67.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a057c3b8bf87fbda631206a6c2ba1398c18641b92093478f472e818f81dece057234c221322497eee68d33838f5dc99a6cadc92f157aa464802e92f08f7a5f20"; + sha512 = "77cbf9e977749a72d830a0409618b1e584190d08f6befcb8d326864f686822a099124e6bd242bd108e7f7eac60e7685c4dedb39ed6cbe54ae490dc1195cdbfd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/id/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/id/firefox-67.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c9165eef8d41c5e72956beccac415fd4695178c465ecd81abe82fbc372826d8823056a1484e01442f883022182818e7c5154441c113519b2a918e1233346001c"; + sha512 = "b4869d563ee35de55efe8777e47fb32a4cef18969d7889c8dfdec70ecf253602855ae4c646abe685c669cb1014730e9aa6ff1098f17f464f13aee779c1a1ee85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/is/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/is/firefox-67.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b41810b6e4b5f28efe83aee464f5edee0784f24982198fc0b3e333b7a16d816504e8ad558e6298517695f06c3c7f87d7b98ad80e0baa6b10d748c57ec3fa8e5e"; + sha512 = "1b27ba489a4f0133826630fc364f30843d11abf171f74b30d93b2f1a5b86af2ccec45063c5ab780e842e60afc7609b30e886fcc8236e583d8abd34ef7d52adc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/it/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/it/firefox-67.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a20c21d5249fdcd0e7c2bb62177046ac26fc6b0b87f53ed56511f44798fe6a99737851045de3dcd2f42db689b32853848d25df8cf2a8cf731853fdc23a191a7a"; + sha512 = "6a7fb879fff792987d183f04f4922ab44efee647a3ddba78999bdd40255b84a7a53fa53397826c5f183f4312015170eac7e74e35cd3073019e5db248bf661d71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ja/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ja/firefox-67.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "233574779b07c9173b160760dd1b229305b225e9b9580a680baa31a0f5b6b2133fe3013dd2f4cdabec3a1c930aa1def9f3ae687c4043cc9a4edb83ede83a353c"; + sha512 = "19b51ee4e52636382a75e9e910eab0a965121d5986b9afbd79e067e51381980835ab3ff0c461ac7fa715c2e5de3ff48665c6dd8034a7c4f40525d8a4a1475fb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ka/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ka/firefox-67.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b1e3b26e05c527111888b5d683e040873c3dd324bf3d3c143e22abf1e55bfc4b43ccea09fdf05a58dd28710d5624b01529c1e341b963c13895caf2931c7048e4"; + sha512 = "c792a5b920a6ee1b4abf38930c442af67e5f4f0a3305f3e4c7d3baf24b1937cd68a7a869f7f40b526be8c3b68cce227b5c7b393b86d7b6fd4e3365dc9ef0f13a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kab/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kab/firefox-67.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3f0a5dfe8701ac74fafd654607d40b3a258586bb7791823be84db682a84339ec1f0305212de9efc2754ec90ae7584a05c58c26d370090871af38e5ef8bbb95a2"; + sha512 = "d7cc7a186fb777cc3e6a4477a3a95cf86c689e32d3e9e1e42dd9464562101ec9be2421c6a5d02694f886203d3b9e6120d580076664c60bedb6c3a8d2349a10f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kk/firefox-67.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "55a39f67b34b21d3fb31b4dfbbde75af058ba32b1e5f666847d2d053743ae51cf0787a09959fdb8fd27df6daf38f801f7aa2c0c6ac4f64d8ecaac3d893242e5d"; + sha512 = "a5f355f987edf85410133b259cb9b0531f60895a0467c5655f8bfadd9c731de8655d9a790b299c641d70bf8afec27ac6aea47fb9f2bce70f973284251b3c0ab7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/km/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/km/firefox-67.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e4fbc74ef0df4989b5776d3a5c526f323d2472f5a2460b539c120c54e3c3fb3cb8397e71126fef3cccbbe9326d2346195f08f415c49938dd65f63807894f67b1"; + sha512 = "9d60a9e2ab8f54e7ab81c9c232cc50b7b311ab5c6097984f4c77ff360045b37bcecab2b4f03e483b058e14300e7c6fae47db8395b2f1d2c8a4a71e73a2508922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kn/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kn/firefox-67.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "5834427a79672c0e7538825e52eff561a7f018e763eab8755e295396f64315de968360ba4a8a039215dc80444d8e465a1d5ba7c11a60694b4ea16e7f0f340a77"; + sha512 = "761b81406904250a88ffd8bc4c0ad05f81ae9ffbac30b65c1ea75d2ad8c9d8b0beedac2a9a5b453c694cb751734d5d9e132e57d75f78b8590ca917f2b329c725"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ko/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ko/firefox-67.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9761f01f078d2cec24ac785c68c95588de533be04b4ab37184b01c677c98ffd70dbbc1d1550338253dc38edc884d51d134496cef70a05435a838edc0b5068990"; + sha512 = "be41e29713f24023ec55e48784831dc6dc49a01b30611a69d7066739d8712e580c0feaf72f44265de2df5f789b2853754a8fa1b22f9cc6e5a9e8531ec8296ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lij/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lij/firefox-67.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4b3bc0acb18d2a2f80a4a469882df2b72594357ef201f337996bbb3315c260ee503030620e9e42a823ebd8cdca531f63e9a94b9f52bfafb83a7cde1e520d0e3e"; + sha512 = "93eaffc2d1980651203d742391e3a68b6c10c1f06bee313e64d775f9ad441eb5c0313c72cc6ca2fca8e897a2817e73ab8a601e42f6176ff8264923a3ea76f4c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lt/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lt/firefox-67.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5e9b8361dadc8df55055dbd15f4b2245cdb9acd7ddd7853417451246e59fd4b30b570c30acb2ed078cad3fc239f15218045ec99eb006c8702677ad289e73271e"; + sha512 = "80c920d3fac48870cf30c3455f84bcd741952e267a88767f1b196ea755b62c5fe9e7b8e31994e3675aee243cbf97bbd4f92b0dc061e82b715816c07968351fd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lv/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lv/firefox-67.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "757428fc0c04f757c424da039bef8d7f4653bae24b1532c1bff55305a1f7be8063e9e4a01ea5034f7f2badbb5202bfcb82954cb39438c714dd97ed0b6af07f04"; + sha512 = "379255160004e55fc493f01215a3c796b085453d8a8b855462cd28f905470d0a25d8e3cac1ebe0a17fa278485f5c153742516dfa009aa3cdffee73e9d9254289"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mai/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mai/firefox-67.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "451cb28d1aa9d8898827be4645eb32f49cdea09b493802c78c9b4316b22fef7cd99a46c1c07e2f06e7dec2415abb6bd3cc7b4075e54805a843aee852aeeb19ba"; + sha512 = "db312bdff17db4b5e5e01bf8040e915e3be8969ea8c98ce85f244432c89ce0061bc7c0deb10bc8ba83f430079fb1265f518eaaf410abe481a8e0d9576974088a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mk/firefox-67.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6ce5dc05deb1f2761a8a1d4703522b4b90fa6ceb1d7189818f0b22340d956664af1ec3b92c965bbc46889835e4403e1ba189b3c0bdea92e36a8aaf3061a3625b"; + sha512 = "55f9e3cd8f1e13de00a1e32434a5322faf67da783dc1be8d7d41ef835a59ef73d9dbaf6757414cdae4d625b7497356df810a6760d34fb9e26823b050ca5d2766"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ml/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ml/firefox-67.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "fc9a68806276cbc7e9b3b528d6b93075429aa8759722bac01575680e6f7e94914f51e44ba0968aa841631aa876bcf716a0f9c1cbafdea31adfc0dddf758a80c7"; + sha512 = "3b27044a7b1e5c0c31babbd44412e70374cb865c7c243e9b593adddbbc3f12e6be721532b2082bc05ef4ee475fd72370e31aa340912b6187f908f674c3923341"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mr/firefox-67.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0ecf5e23e5c2bcc32946e3e4672557224e0af6081f8280a9c1f49927bd9dec9b3ce4b445c800a8ae48e75a514e24beb2bc0e760f859bf1f5a6c0cf02c594a6c1"; + sha512 = "04fef5a56e611a91e0f49b9ef8747d5ae2f64a05f3ff6fae7d4933d047f67dc267c30717d47f675c2a2c88a9cfb87769f3f78aa3939b764ba77184728d456697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ms/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ms/firefox-67.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1adbb3d092dd0909f5ddaac58240dc587dc819fe8a64e5e5bd3a81ba2d7effb516ade1a37bf437c42803ebb9860b322917ee347b62d4ff1cee503f3432988923"; + sha512 = "fb4ec9edc24cc3717b30544b68afe6fdfd794961ac8e79d16a2dc7df47b45e2b44c0c908e64e52553214417dc27a3ec1302e70a1605ff304cb86ae8ccaf422e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/my/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/my/firefox-67.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c7f9549a94b511231bd0cd22e7705cec80548a52eaf8f4af5fc975d18e0ee504a2e7be5b4b06504d66cceab993dff4ecc37e014ddcd051ccd545ef19cffcec5e"; + sha512 = "35b62a3f008eb58522eec17db537af88f83aceb69e85e2286ab28525cdf61114c532c5673a08643b8a73f82c6775d5be3a7837c538c942790d07861b580da992"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nb-NO/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nb-NO/firefox-67.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a6129f1dd66cde5a9166ae180ca24d533f7b2ac463eff50276354f0db7eacf28f64d5df587e833342c1968fd3c4a1f9f91861907767e5ed0ff543c37da6925bb"; + sha512 = "b89e3cf1351ded3174864f651230a2fef05d3bf4cb38f5bdfb8a538359f5074d9c51c2e28e96ebd4b6bf5e65fc19c40aa314d1fc73f8f5dea5d2395eaa42d2b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ne-NP/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ne-NP/firefox-67.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "3281cac33c6dd97b497d2a10e4d4c9c60efd6d138ec9944d0d0e836629c036c7fb0c00cf84e27bd9bb7e443ddb6a69df4485a014930e2ba0a4ad8a224644a9c8"; + sha512 = "e6e24ce09459fcca4f0910ef26b1a8131fc5154fa6ec395257cf12a4d637e158937833ed7c8a35c22c86734bf4b144682c4d736c26aef1407f3ba26dcbda4c9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nl/firefox-67.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b54914b0b065514a0af1f469fd601b76bc8c30087d7a23d5466ab5c8a71e5ec31ff5293ec2b1a621d6c4ad64158144d0f0691682cf974b97cde011701a8a9fa8"; + sha512 = "b3f2bcded513040431f7d394a3b262f5f6c2a7b0f0d1fe24806ffa6f07169e94779d2a91a6217a190c24ef85d1bb04895dd379c89d144ddaa7e2e98e4ad44dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nn-NO/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nn-NO/firefox-67.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "6790ce0522f6595447a9f3b7419255cab8f4635807f8e67d83095d37c89aeb4eef657aa8c1b9a3aaa436b06484872933e5b0a8a115e43f7fcf17381726653c2e"; + sha512 = "7ca3a47a1601668717895870a5e68956ab8f5f464694105a9fd28e5dfb5965c3b2063658045bd58801757afc9607d63deade730893a29beb0b886b88700f107f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/oc/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/oc/firefox-67.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "418bef24367b311cd26d05e736b73127538297b5c2a672b9e3e4c2b1f81b92e04564f3722a41fb2fd05d712f7c848248d020a2040843e797f7ec7747fe274b53"; + sha512 = "80ec6dae359e04632c718a72ae8c8a7a9e4f4908fddc0dec134c485795ba57ace2ce767a3f08e320e6bb903900d3bd76a0a5d01deee792d38d23d3a95fad206c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/or/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/or/firefox-67.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "50972ebf6d86827604b066ad175a6a16250225083ae7b66a27690d8c052da84899a382fe80ea7f329b0d79b826375e9a356f5660f0f19b106f9539ca4375d023"; + sha512 = "e08af296de25fecb08cdeb26901ad95269212372f08703f8d199931d9ca5630b62e177d2d6fd67eece4fa1639fedec49c73ad2513ee7ab8a8ad841194f65a2b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pa-IN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pa-IN/firefox-67.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "96a3cf9c11b1d1c77e3d51576229d046072fa44ca035bfae726e1dfcda696b0f78e5ee34a0d8372fc641245f41e685ce716be6a19bdeeafb0dd74a3aca5e089a"; + sha512 = "e50745d15d84facfa58465815521f6569130ef040f5a726bcd6b6a6462731740fa13a924ff48fb4406cfa6d72672f75894d00b1509a66fcb2a287c5b8328d707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pl/firefox-67.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5edef293b1d8140240d7621503032d6b28ab6ac6c481ee82c0252e7dfa8a24633e00401ad790a80165f8074a289a58125afa29d1133331aa38c6e6a1740b1261"; + sha512 = "31bd0ae87cd147599ca5212eaa990c4e5dd58df0ae5c5ff6bd4841633d3a85668d66450464d6d9ffb328245671d37224a2988af65fc1abc83644ff121e7c6a83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-BR/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pt-BR/firefox-67.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f294b7fb5e2f2277ea5985e7441e9515a434ae45ec45b40e590e469720cedece0b5475e7f5249b8dd4aaf1d1dbf76a2150aa9a5bf53dc1e81042b9ebbd1956b9"; + sha512 = "dbc5693487df47f592380d603b02ddb850c0b6e4e664351e5704e45f3f65dd1615d0b0bdc08a10f5e8f184976eec156d58a3735a20564b5f6b197386bd4c7a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-PT/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pt-PT/firefox-67.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "76e69887b1f6aad40164db1c7129ec0b80052dcb039a3e70ce7b5829d1f01e4a4006c028474cf101e59af61c0889f54f00351bdf94aed5d7929ffaa26625239f"; + sha512 = "a5b753bd9e21380f9ac5bec17703b81e591b6d3bea809600451c668140f34a6c3cb6b23bb99e72817a67efc16a30ddac12cd91c9ba16d80ac5f873f99927e228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/rm/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/rm/firefox-67.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "07a18b9c089cbd64eb4baca99a76cfe2358e2bc5b3e8e63e7ebff64c801218774fe6c50cdfad0d5317963db74d79fc7d65000ee68b87f31700ab54249e73c39c"; + sha512 = "0d7b5bb6f5fdbbc50f3d60898602feeb494c54e0659485061cf3f9ab69ca161aea5170c99837ccba96fe3afb600ea84baf959b0bb62338af05264e1a6bd6d598"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ro/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ro/firefox-67.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f9412dc6fe36f9c36d36c1ec3f9ea757a9401d0f111c2b95332c0c2fc64308969764d06df39c57ae457b924214c841843b9d64d42020920d83fffcfe2cb18834"; + sha512 = "deffffacd851d82adac2e0889531825e86f030a02c96462c469fa2a955dfcdb4f60b02fbfd90859052cd73b8408ced16231025c776c6c530662ddcc5a11bc55b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ru/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ru/firefox-67.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "da5cc7a67b119d1b454ab5a6597bf697ec95411f32680971ad9ca0882d74b8008ca84d72878271379a7404ccba4f04b00f9d606ac157323d6cd33646bacea313"; + sha512 = "119f52b77e6a174c16822247d440a8faf69c3c415106df4863bb4eb4ce5a7d9d9126ba341576866390da3465477e5f219b0bc3b98338dca79aff28548d341b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/si/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/si/firefox-67.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "31713c81b82debe496f6b94799f81f68390b5c8fef96024a5baa8e54ffc39d39fcd820683873abf3b6456b5e789e2b882a6f0dba9a64e145a79782013fef74b5"; + sha512 = "7f7c7b105103c61519b42dbdfa598cf73134722ddfe8007d7bdc8ded0672da7a233fda7b97197fe9f7b6f87a27bb91382d7f59fde86e7bd52802f65a61d01ebd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sk/firefox-67.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0475c5ddde2f150fe2c2a62d6d62db80084f7bf37ec191e2b976d6fd5a0a0169d7c557cd1cf9ab56b0f666b84bea8a6d51510320e8aa75096b654b6b335be26a"; + sha512 = "934919d2a151d7b8437c3f80acb06823ff682085dd668bd6902394cc99db53b1d328629f72db7d916a57457f7ea51ad3bd5820fb31388eb74d21b2a6b28e89a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sl/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sl/firefox-67.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "771f9c7a404a2a2cbcc754fbd26ed5a47d093da522c8270526f1ba31b0535a669beb7325d81b38f6667b8cf982c95cb5a8528bb80fe32b8e2770d45b1b3d2311"; + sha512 = "d167add005229b3647f0397dcfe39c0dab180adc6df384f86e2aacdbb555edc713059d64b33bf6f2566c113cf95db68b6d849de82f5cdac4384db313b7e49b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/son/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/son/firefox-67.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b283f759743e0298bc9c0dbc82c524a6e997754cdf9aa57792ada118631635bd673559275e9e6cd270e49ecae57587082290d66f023f9dcbe1fe0ec5d2649644"; + sha512 = "ee35cd86bcc132339f5fae096b1447d8e2a77d00e757e57dc8a52185ee7adc57b6278b8580312800fee025cd3abe50381936d9da35635a22541ac1682a65d9d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sq/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sq/firefox-67.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "698a5dfe611fb2956d319b81b09886ebe511ad2f1e99bd6970de31498ed8f016edc3d136a9c3aeae42367cef09639b5ae9a22539560fc394bf93bc83d1344e3b"; + sha512 = "7b76f65f456dab1f4d88f7d4dd43a88aeb7e92783d3b3c5416518d9516870582d2cb579183a34f707b9f9ed4b0a52e1bae6ee57b4b73632bd3000e8d04f1f02b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sr/firefox-67.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a9c3b24129df77638866d9cd72afa5f72dd6181355174e40e0cf8ac2c1a1da87c9a60565e6d97863e50e14a76ccfe0110194ce2547f8297bcd89bf8cade4f24e"; + sha512 = "2246d41787f073ca4fe28a02cb91b7780accc4d93240b98caec769cc2f13c8c7a6c50fe53ac86ad35a8db15525ae4ab0203336c061fe200f8bfb1af21df8c94f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sv-SE/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sv-SE/firefox-67.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e71cc0f01b4a9e279810523dcf98b43a9ef82a64769ee7cfde94896d0caed75a0bfda07cad1f0120d44b738f48a0998d090deb49a7e9395cfd0150e18d292c2c"; + sha512 = "113294247e8459161c3ebd17fea55cb474ecee7f76f74cf71730a6d4994c7a1e1b25f255c27fd646552dbe09ba335d62954bee5fb66a0bfebbb655bd8ffd2674"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ta/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ta/firefox-67.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5c7948e1db8a8523591cfa598cf2b1971f01d7b8a79baeb932aee2aaa8ba8230aecf783bf7be8b27312599b8a59abceedd07cfa5e140e9107289e717efd77894"; + sha512 = "e7ddfc1e1d1f5cb5492f4a5e37614ecc692778d73fed32dde6a09e6b30d7f0bea03807ef62dbc8f7a3ca283ce84b9b7db53c63d7c5558f9f9ea4089076f54a5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/te/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/te/firefox-67.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "01c2e2103faa9b2bd22c6b3a9604433350095a8bcee430007114c440b765f091dd3adc28119c24c9024d70fdff1256220305ac8b4f66182e6fa9e5dd35c7c20d"; + sha512 = "8f8ba9ca13f49df74f7aa24bf93a0820504aac00a4afaf00afc7ad781c06616d96a01fa886df9c6d1f43d08f51c8753cc9bcc906986a6378162e1fa5685ebe6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/th/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/th/firefox-67.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9782614b88612fb1bc669dc26a61d266fbf1a8613e3ad3cd1193482985c05f182343589589c24ff016ce4dd1c63c755348dbdb6a699cb2f093ea00f7a629e573"; + sha512 = "b2c97373adad7e4bb74d667356ced230606737b3b2a53c2a140e6c5e7bfe17cf398862281c6775749c774336b4265200f4f4149511006e5a6f9878e8dc643a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/tr/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/tr/firefox-67.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4dacea29f57f6acedf30231d08d86d53afb88b055195a0c11a9f4e2598460900b3b20be4aa22a8fd5794de3f636a575a0e55815621dbeac4a2f7854399915767"; + sha512 = "1a9f803dcc7d7aee156f209608e2f1257bfcd6e145b64a26be68577ccb0db104b22a3aca232eb17042f1bb6b4b2552e181ca08fe01905d4895a6ca87ab813270"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uk/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/uk/firefox-67.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3b92fc3c99366d332261c8cfe57a04fcbf285b5d5976e60da29a0844a30e9e15b1441cebfb8bda6dfc048f95ec233ee099042285effccd2d9fa10dc572b03e2b"; + sha512 = "ae0c6fd6840e00f5da761090655dc38b93875975eb3833c0fcda215f433d4565124f8039396a764728c089b985e568252b7bbb43da5a44950561a64ebe0f655f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ur/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ur/firefox-67.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0194916cd60f933c5a8ac7738487b90584e2881cd45f51aa1fa81ccd410b0596623bdb880226247a943910add37342e54cccc9bd250e2091cadf871f26931ea4"; + sha512 = "c2a5a90016267c37461c3a8823e1671b8899a9824f21017d5b2b66b80a120d9ea53f42c2e7120f54c5c5e3b0ff014a750b015d3a9aafbe25dc3331664df7b3a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uz/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/uz/firefox-67.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "579779fe27dd2d30a5fe2498eba0e9227f0322f3533837dee60240cbfe98b68ba2b696984a110dd42f4a5b3c12110f61e33c38f7f489fa69a5c1c38280932466"; + sha512 = "ef7e5f912057d999cce8bda5d914282756874a6cacc2a3dd4bdea6d8ca738f3963d418629ceac22122c6a22b11c741c251bec80f0eea76cfc0b08d245420725d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/vi/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/vi/firefox-67.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d7f8699f2f172725095bacb2a7a9dda73d131933d308420a938b49a7cbdc0cb56e957573f9f8c46a909cc07184f848e98713390b1eea816e97cb6f4007179902"; + sha512 = "d5eb70f182e61d0561b5e2c146503ba46ffa7b1f15e60cf9856e7020f6b4079702b314deb7b5e4ec1c28f8f611eef492b2340bcd2ceab6a72e15778ec073a54d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/xh/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/xh/firefox-67.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4201fd07a57086607501c193ccab243a6a6e1758d349895ed1fcd3ef1142b450da16285881b9319bb63afe7f622e5cb7dbf68db27d17c6f21ab94920d5c8a305"; + sha512 = "45687da419278f6574193938a79b6fdf7e714692211a84986ae93a819e86997187a10046712c7642b987077bc77c77d204a0b7916c969dd1aac78716f8f4678a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-CN/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/zh-CN/firefox-67.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d0a35927d7fd6b6f72b21ad6c15533af13a478d8465f1eb39ef9ddf1dfeaf5653d097e59de410f97453f9b545b97b9b82f22973366efc3b03aff7603594f7edf"; + sha512 = "ea09bc4e6f4cec7df66d5f1b10a048564a8a7613fb1ca33f7798d5f86c862673f51b4e8a49e757a67b88601c0a503aae5d20f02279feccc65f091b5204c27a6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-TW/firefox-67.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/zh-TW/firefox-67.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f01bccf18cec3f201a9a69e167543de472d7dde86304539d6c17f093468d5197b0230ef4280a0b7af8d5a264485a69667fd81b458d85ab0bc7175aa80667d419"; + sha512 = "2484176d780165bf0adf1e0903dd74671b9ed4983601d4bdc02f8960a17f7818218f9d01660a406ecc1f4db1d2aa489c51845bf69beeb58282fa061db918a8a9"; } ]; } -- cgit 1.4.1 From ca088617ac93e1aa06454d55250ef7c3a85d8368 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 7 May 2019 05:12:12 +0100 Subject: firefox-beta-bin: 67.0b16 -> 67.0b17 --- .../browsers/firefox-bin/beta_sources.nix | 794 ++++++++++----------- 1 file changed, 397 insertions(+), 397 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ce8f28e8d86b5..8cdd6a030be18 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0b16"; + version = "67.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ach/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ach/firefox-67.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "ad524bb1db209a00d50242b3988db64994d1bba64cfe67c58f375ce846a089b72fa93d82d8b6ba3caefc3a440ebb9484886a4b17a545cc0ade937f805e17f611"; + sha512 = "d972df8e4c40b1d14c0b72fed8c9d70bf426f753ee83cefb7eae6178c0e0c381eb09e427165f70ad2193af8570f5a1f8388e6934708703e4c3fc568b5a3d067f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/af/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/af/firefox-67.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d1d1a2d7097a2bdf045787005d57e512527eb1e74e8927302be915b2be6db4f6debaf47e6eb1e96cdc757ac47a85ff34b3253856f732c8367955c1b5821feea7"; + sha512 = "5ad9a1a9b11159609f2825ffab6d399e9bfa8e357ddc30080e77016392d8c48af6745d82d20acfa4405ab234b0b1a031ca3f044583089f8c4b128cc9ad5c2403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/an/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/an/firefox-67.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "bb28baf5ee4900c60100c2d4491b75a33a1c74ef91410bc03cf9495c7ab5251c902a6d4626677caeb0a348839277a438538d3b00b7356aa98c4f1dd077c679d7"; + sha512 = "48ce5fa046f0a51c117f4b2ac10918daf64f5dc94ab1d920f8e3347b026be9a8ff3d995f4a5483ebce6bd39428de1447f4688794fd742d909f92a6fc1e6bbeac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ar/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ar/firefox-67.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "34d9cefa2434eb31d95a43cd11de50f152d6b7ea4b8f882ac7ecc0bd0f66be11675183a5d278ccbdbe3042152cabc09ceb887f6053e80d3c83e87deb26ea6d4a"; + sha512 = "724762f7601f9767ecf778c2a59e9d3aa752b6b03b97efbc04db423702e101629f7fc131d499e363e47a831003be4d068ea01712584fd0f698e06d28eebb71b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/as/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/as/firefox-67.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "ad260f751fbda66a033a3e6c85126e3f581cda181fcf848f55740546ed0ed643f2a502fe896a05e38411aa79a1c4d99e00a76010be0cf794e4c81593cb0fa90f"; + sha512 = "5326404fa9ddda83b241a9ef58c53537c099202d8a928037e1f6e332982ef8b94c50d6fdb0f447ceeb3e332f0e45172948af35ef91332783ccbd107e0a6e6d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ast/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ast/firefox-67.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "709ad90fa518ee5bcf0d93dd912ae53f62292b20abc6a6fffdf2ef6790c16cd38d1e01f4327ac4ec3333bc73da97998b3592da6d6ab0c1cf6bd8c9b947d97e23"; + sha512 = "bec65c571d211fdfe474bd1e9e18a9b77ba25ee3de940cbc2f605fec1942f8db864b889725bc08f71ebceafc066a6e3c652e81e2d2d79ca53714b0dc53afb12a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/az/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/az/firefox-67.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "971a7c7f9910d478f54851a8232522572e60e11c365fb0c2140cbd09016d4a1bbaa62b0ea6d6e7a841a01bba9968013c76537c1439630afa60dc24e95d93df9c"; + sha512 = "433efa4f25262a1ebc64fd30f1cad3f85f05f83448d8ca9900fca4bc0d4344fec0aef54bdc6deed3717c0f32a28f2c5ac4570b9c75c30754dd300f36d298ec0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/be/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/be/firefox-67.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb1184bac3da5eebe6e17ec5d91c5eba43f76bacd7be619d487ad08bd3eb6aa3e459699a0d66e8d966d7263d867bdfdc7cccec2b84af32d6393ffed2946c5214"; + sha512 = "8aed8545ab84fa77fbb25b7ab1090b5b758a1ebc18e4a2e112cf5e0a063ee6160103a017fd8457b3d90a08648e372037b7cb0699efdee5294b6c233ef8bc0150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/bg/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bg/firefox-67.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8a099d1762e1aacece601d394d47baf066ed03c5919c7c02f64188f25f30c076448f200bae2427483f52c59d3b11f2ec42177d21853ff17b36dc6c92e4d31fe7"; + sha512 = "eb6d929f343ef270d5e46499bcb3180ffe3a110509e5beb6b4d5219dd1031da931a0952a5ae311844a36d637b76f51a5ffdc1486c0ec9ff75015467c5644c6cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/bn-BD/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bn-BD/firefox-67.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "259eea824436d64206cf16e09ff52b84c6dbdd8d1216828710d6ba8eaa1cd9f2c3b62a6f192efd543d1e45d12e1e2adddc34ab554ac1ac40115cb5f82cbc4ef7"; + sha512 = "43e5ae1a8e80c6dabc5d39511c8e063b0f05679b9ba45639a6f92faaa6693b1486318275885d7d1b88ca4fa4c21cb82e15ba842a65e2ffdd7b9aca8fae0c1212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/bn-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bn-IN/firefox-67.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f49326870b7750c4933a8c245c1aaf32d7b57bc2d068e57806cdd457f7d4f3bf8c7aeb82ca098d9d4ee4c997f94b74ebf3d24296ac6214eeac30b6c37a16756d"; + sha512 = "1031278c8243faf19ea043ac3c6f7752391d32e09ddc3a7f6e9a0fe15ef6b59446ba4ccfaeadd4bfe3640996692cb1a9478ecfad39790f4b2e85449bf30873b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/br/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/br/firefox-67.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9e14a24a3116b1a1ce4c3b0e9db0e8739f6cafb587e6ff241d18be568976d54e53769a57c336954f37755abb3184e5fbe239f560a094bdb6ae7e17fc9d36765c"; + sha512 = "6f13c2b96a8e2f39cdeda79b15d7a7ed9cd79c51f3a704a377c41facdd697d60ef7f9e204b6f551b9e674b15badf2f46e7e262e63333c29caeac13661e72ebbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/bs/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/bs/firefox-67.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ddf56d46254697b81ffa0f510348b82bd2165f632184c85a529f86532c898f8e27a11cb261ef8194180f1705b57a7ed450af875e70722f1cf529e2c1fc7dfc82"; + sha512 = "8d575ff30881e0c88e8f3e2838a3517001aee4f282e9301312e105759112eeff1807da8cb13590e3f9ca73aea79ccc7e1ae68cc7b082a10c382fa0a1a9adae3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ca/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ca/firefox-67.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "b624cc1a4c543940a03b71e7954c678f66e85a7445b1239838b87a10f50c7230a69570c0cf057f275b1edde3a24216573ea189650fa42d754fdccb538d645d9b"; + sha512 = "ff303ab168d45abae0cb3096a02b5c1bc4911e9cf95929541a400e05791a75a3ee6a812c0cc41ae541b6507bf20d6e852d40c16c68aaa3708f972d018cc16c26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/cak/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cak/firefox-67.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "cf983175b734162424176c207b51e8d56f4e4e007b8e42e718a18aa6fd23bc336157d53e30475a3c2fe6d5a7a306d398615e47d6b7a5a2f45d36985eb94f67d7"; + sha512 = "af88063c276af628561dad2fb65e7466d37e9746d68883a57d1ca212de999b4a11c3836432d1c2fbbff35395c626d922ef6bbb9e9f59e994ba089b182d592daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/cs/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cs/firefox-67.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c8e9d9b00976ad0963dd20e971ef85bac85bf6641ec75a4bd1c0793935e22661d7f16f3c603243e2b92b47e657ee4e893b3fc40cc73c7c312eba77b161df03fa"; + sha512 = "0a86c553dc8788f2c04a386db2f76dbe22145ae116020cb7a48b22d89b34d697273c72234fae2674e8614f4ae268839d2e2f4e94a158cb5ebeb2ee303dbe29d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/cy/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/cy/firefox-67.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6ba5b6ccb724d76825f0843aaf404c1ffe32375f4959c0a08c418d921410157d856a4ed45409071ff81e268fba1c60c5464860793009c71047e240f12d497665"; + sha512 = "eb73a0889b7398ddcb61314ef82d5b425c7ba3b5d1219b31db7ac6ca138de08eed8814fc9bdbc02dd3029bfbff82d8fdc0b088c5c8bffed7ecb2a62bad2bb586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/da/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/da/firefox-67.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "48648b8bd191027169d626a676c6483b2856ed8185911b099f3d2a514ba172f9ad5b5ffe1af8f5bfbcb318fa6a37efdd600da61e0836cff8ae367e1418eac0d9"; + sha512 = "52c7c6fa1ef0ae41ef17d852e97424783f9683e3d1cc8581cdcfd009fa5be9ece873ca5a7c01ec2690e259109e27adebf8870679f1042261cd6b482e21c61ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/de/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/de/firefox-67.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ef8f820042c0b7f5becfebcbdcce9f4e835875aa1f928f8d06808978476cbc443029946a30f6668475723634f9a08dbdb804b05be74e994fd06500ccfb9f4de7"; + sha512 = "345198ef7025c0dea849a42202d7eb3dbf381eed4735c55a8b08b125afd30a63134999fa62f270d3332bbe3d0c6bf9e201a323f9d67d27616f349b61ef02f33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/dsb/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/dsb/firefox-67.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e171b2e25f26a860af5d0623e872b56697e9f882c8e334690234cd0ce45d28a1cbc2b398a644b95cc1ec4965fe68292de2cd8bf49f75c41f1d95d66cf8da84cb"; + sha512 = "d9d704f11e49ddd0f8aa27c596bf41fb14d71884424939b7cd1ba97667adeb9fe14001e89de64b78eeba4837fa06c6b5ede7fdc361bcb97a3a69ffcd71e5ed21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/el/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/el/firefox-67.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d8ce3d308feb5bc7882f8471dca698e1983693bb0ad3e131a456fae3aabe6885081f59af6cda921e9426b61e14cfccf3fc886d9a24830b5d2fffd90a8f3a404b"; + sha512 = "282c08354850521581e234a4b9fdb854549447f837f3fbcffc18153433904f8cd1f9c48b44c3b9d55c5c58d69776e062bdb4abaf30f4a503d8ef80ad4d7b65b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/en-CA/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-CA/firefox-67.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "a2317760bdac081add477669ad2e71818abfbcd54deb0d543563414ffcdfd60beb7d1c4fe581438940fbc80f82a239e316760f1fca65ee450e93597ecd5d4094"; + sha512 = "27a8f4aba3de26de293034a3a8df3d51ade8ce9e873477e3594f512749336c0684493e6d71b0d89793387571cb39b18dc1502c773a9b2e4ee8d0463f1f89dfc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/en-GB/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-GB/firefox-67.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "eb391c86999b112273f61c148bf4ed30a30df07a396803c9d8d510dc936cb8991578c7018bbf174b47b1e8ad36d7597a4df1ffa4dff8bef7bf04fbd9e826d525"; + sha512 = "732b08849d49e82ca94fae502f72401e6ad99d5278412fd8d57917fc09a306b1ee89ac7bf081f6f1354dc412fcd652dd571a082fab60870bb068770b87166964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/en-US/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-US/firefox-67.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c791d39b3dd5bc3fdb41e4be828c20d907c5362c190495d8fd7882cd2440eb334811c0531dbf9d76167cd73d929c63c9731535ae474f7006e8c5b8f0fedc3577"; + sha512 = "f7da3e20f0261dcaaff354de5dbc736d1234ee025b7f9bce38738c5b441ac92fb1f237128cc018efb6df3332d691234b63f1f49d0fce420f715c5c2d7e0aa8f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/en-ZA/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/en-ZA/firefox-67.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "0ad3da7a76de5320ca293cc6a289def3d695ee963a6f45de2b8959d2cf2a63122e3d97b4ed3e6e7db7ffdc65baf71994ab35a9a2a9e7963db15cbc5af008224e"; + sha512 = "8db395cead672345072a21fd6443fff92c402b697a0456fc2ff486dadc50093721e0123842384d286fb44f3d676fbc2f3ffee4ddbb345b2802bdbf99c542d2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/eo/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/eo/firefox-67.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2bb7c7e828ceaeb334aaa6ba65e3aec9adc0f773b05fe01fc61511001deb9b0d4c2f080579129e1f58b0dd10b5f566bc45d7550144bcae220f3f9ab2086b8c9b"; + sha512 = "a5f7c94f82ce7036b2b2a5c93c292d89c3d85fa0e3f2cadab6b84d44df3002f26028c2a2e2500e2f8c4a172aba031be1326defcfd8240895bcbd2592531a075c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/es-AR/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-AR/firefox-67.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "26741394581c095d2895381208d3c232e2397fdd532e4e14a8f95d6397a649b0e05b00277fc696f73a329a485d98b222a6e38909b80e729ce814ffc44d7cce0f"; + sha512 = "2856e12987c1c381acaa0068fe2bb406485167e6b6021c433db48368cc1e538d09db4bbea0e780ba9cd8991c8167ae0e8c828f2d60b243a62a6ec4fb48d4414a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/es-CL/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-CL/firefox-67.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "44643a379ee38dbb564f2150df89b68baa8cb52412b590bbb845bfc73806b2df283b0ecca91651ccec054e24e28da756dbeba5e4ae7ba3d7b91504e95fda0dc0"; + sha512 = "3a9e01d17859a87e3fa8c2802397a2c79f00cabc5d0d7477f8a8ad0313cf54081612dfca5b8f46193fbd0c6de3dba2981f3c5625c59dc5fbddfe2b9f8f599ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/es-ES/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-ES/firefox-67.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3c590b4dd2d89cc374dd1bf1490f6e82e6689d5996eb75f31dbf14926739d436a48e0a8d093aaaf2e02f2d45e817d9d705e8de9c992cd998eae3452d27b5456f"; + sha512 = "061527b0429505e3137a7e2edeb287a778d5caa03cfbb1f45747625f3d028a09aed5531bef05efebedb8aa7f6812914aad8f2626210d382bf5d8408f932b4505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/es-MX/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/es-MX/firefox-67.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dc4424645c7c97aa6220ef01b9f9347695ced26d2becf725c1f108ca040bda6bf80841f0794eaf861fc9b7bd93bb6cc06bed4b694693a3ff66542e7f2dbb3417"; + sha512 = "396003a3c3bf5beced73622df527110b075f715cf33a32b67da96df5d4f1c45276e3bbda4ef9e788c14e425f985594df6621217a245efa2f8c6a0e14e2430a01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/et/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/et/firefox-67.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "43758e52d34f71b5e420dd313202eea8390372862993a8cd8727deea7ea8a5be9161b53e63776fd5dc15984bb76fcc9d00fcbf54eecf16e8837d88d0d4abc6fa"; + sha512 = "6a51caaebf3775ca9749849dd8f21052d5eacdfa4f2f46c52d1a8326584c045c33c61b0c987e6727bbdd8a7e0f7674ec8de471c558d505105fc81b6f70b75631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/eu/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/eu/firefox-67.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "92734ba09ef6b12b4b3e8067f92ffb588911aa22423a60a6c173b4e7a53225402dd5f179144a0a02751d9fba68a26a82616141d5aad8dd02f60563eac5580f77"; + sha512 = "2429b5b862c6cacf4153f3893cc3a6a56aa598be27946c73dfc40dc93f03730a91e2cffe0a38a0eb6a82c4a93d5d768f79e3c6ba143c0d2028c0638cd6d15044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/fa/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fa/firefox-67.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e3fe4fd0d5893053884ab09cd1ba76d5066f735d1a23841bc9148ecd6351c0fd7d6f795141952c7106cffffdbd7a95bf1755ebdf949d8cbec63e1ef9e429a1d1"; + sha512 = "f9a174603892fdda1f003b16dba38cc281ac894fc9de22683184343b12e0813b37ee836b074fb0dd62a9d2a232016d667199a6ae3e8ded72ba8c23ed97e52c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ff/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ff/firefox-67.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "93664618bca6c9e7ab05b0c298db6807e316f99283891cc1b44250e3f897b36523bf545c041996d7950662a02e7089e82c79c2c9875ad71b6c709d3942ddce11"; + sha512 = "4529a6dd05a9c9eb21cbf7f1147e9be52ba4d08d20ad6d3f94c46db8d2195550d31590b617e3f693f181012c1bdc5b6522ec124ea81066361147cd08b9baa06f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/fi/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fi/firefox-67.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b41ccaf95cb8309f922d45e02a6b757e1a2c7ad0ab72a327ea49f7ffa83cdcb50a32db9a9d431fb2adaeaa7f4b6fbd8a8bdd62718ae7b88574d8ff6b30c5bbed"; + sha512 = "da132dbf65133700558a0d9edbcb2d425120131ce77449914dbbd0785e433ce11f044ac8cd15054f20352716ace145587789433287b9d0249aaaa2216d0be812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/fr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fr/firefox-67.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "5e8bff6728d2ba64d6b3049f1c229906d272ca96dbbc00ce520d95a9d25cde29810a42c3cc3fb8492a1664ad9a1db8c6801e0fe25ed33f39a7284d9120fa0cb4"; + sha512 = "a094a9165c30e0535b1802fd7b7bcd2fd6b11a08e2f27fd9297a327ad37fbbf62f99d614c66b2855e0e64a06355f3239af158115cadab6de548b9bf15498bc25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/fy-NL/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/fy-NL/firefox-67.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0d37d1dd6aa613b94643cc0fdba9e9487fb39193d6712f1e3413fb567c893fb81692fee5209282e9a0593f7ada15a2c63488712e619aba6d3b1b29451d0a72b6"; + sha512 = "1d49e5ed376fc526bb71918b94a6abaf25b7661d6209ef09c5a9eb08ff1c2075f2b1a46a8ea7ee8d8b65b6537c0f2aa4edb7ecdffd28180f1f77320a0ab7b541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ga-IE/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ga-IE/firefox-67.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "93997585b2b42edf46a9d31e6416e4c1a251e0eda963aa689a1ad301cf478aece04921c9aafd36e3167d0b8d4c73458b38bd86f0ec99084f34a78cdcfb165301"; + sha512 = "24ea4488586c533afe36676bc674d491c5af2493de722d14bd05882a9af9487916bd45bad83993d2f52cd69085a88b534ce79279ae5163b114ba12b2a248aaf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/gd/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gd/firefox-67.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9ff6f450f8c82704d3bf86b667f702bf7329177334f9b37ad3d9ff3671f3f69d18acb2c64b0b99d5277a0418934426d6a0a30f59ffd1659644461d57484bb249"; + sha512 = "614ebe6292caccfd897e53f0397ae4008a26bfc36b11ddee38539073439a7f4fb1d49852afa094d34ef745a91fe7dc7246f09593438803e9f3b8cff7df1434ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/gl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gl/firefox-67.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "14516468e745a2e384b961e2614c6e169419d2f224e7fdd58dc757dce0ef97f12edbda8f4648387efb6fb402a0c38a59feb2572b4afc7a17cf59d109464ba259"; + sha512 = "2b093e1ba9f07e1dee3d0adb480e96aedd5695e5d9736a1d63f3893bdbfd98037fabe80711b4ebc389331cece2d3b324c802453a5ea049b8fe89499668903527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/gn/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gn/firefox-67.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a99d5f51f4a85716d21e2132b46eaa4650d146671b24e706697af3a67ef0166429a364df68e469d0942534ed94edf293fd710f0ff4b4a8bc3b79fbfb52722211"; + sha512 = "6c6fdc4a10c1c1704bee1b7c014177cac8445813ecb156fd6d9e581ef08d75537f067a61a996a445ca37d10c8fc8b957953ca9f056846c71251f4cd3f4d8c902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/gu-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/gu-IN/firefox-67.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "0a921704cf3b625961c65a02d1fc788ff3dd2d05e2678d453c384454626c7f7bc023b83cb09f9b6ff517e6c38fb575ca7931564e86b9f3519f29a13e94ac93ae"; + sha512 = "8e4a8f3846edfc12142a7408d9b39e22a5df389c69b3393f9f5a016cf42eaedd687dcda74573f66ef8cfe31ce0b906f32301843053d34b559bd300af5ab51738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/he/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/he/firefox-67.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "57f0c40c5020f8bb3faf7908d324ec91d68ca0459caf3802ec2c846d18be5dfaf7829a86b0b346fba6f3f2fcdb71739a2833d9540f45fedc93ae58abc7b426bb"; + sha512 = "dec44691741558f18bac80ae045aa01659d4a08ab43be0a566787cde56fc8f94008a38396633a85aba2c690de21ee26fd4d67ce195fab97b0c988d5950085664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/hi-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hi-IN/firefox-67.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f6ac5fd0f6df7cb2aad5171ec60def4c557fbc70bb74cbf8a01a06087bb1432c7780ac4623ff41331fe30f45bec193e1b1b5c6e0c1e92694e9bb24b2aca2764b"; + sha512 = "e774dfeacca10137c074c0b3373992c576cbda7cd6a343b30b454f1cb53cfe946576f9e49901766944d9b8866ced6a17fb694c212dab2b36cf4975a3904bff2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/hr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hr/firefox-67.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4dd880fd9b0d7765efeb44c18852282fa73386fc4f8adc0d2c46d1aca621b50fd52ac6d5d1293c224218e7ee42d2da94ce68e6c5a7eeb427f732c64c9f0e6fb4"; + sha512 = "6bf935257121d3269ed20e57c7b5f716c0f5c8f139c23dd3297014759a78dcce79655e9f6f15ee23e3d71f28c3fc526412854c0de4ebc7631b9dddd2fa37fc08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/hsb/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hsb/firefox-67.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "71a24b6cf72a22224f02443dfe98a4975610da896ce2785ebc2772a4254a5c43a08f51942fac78400bd0145b11dbfb089a6a41aa45095e489a2f17e5d60eec76"; + sha512 = "cebc838cb4462f44af601e3074a28bd284a07d87b7f82a5d10d5a5c244353453fcc76c2eb45433421c1d854d198f4cc8dba48e36b5e681ff84b89b0fb051c37d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/hu/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hu/firefox-67.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "dfc403d0a18cec522aad0b9e50f9f12fbe2557897147f31308eb7d273f18b5fea1603fa664552dcbd7ea6c8117a8ef923900ad6e762fcbcaa82b35f6204f94bf"; + sha512 = "d930ab76cf92ebd83cac0a18686aeee759cd30404e8ce9e4a06bf51894accfef67fffe4bf7e9cb6b5fbcbc3c8afcd18f6dcbaaf3c067eb091569081986d41314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/hy-AM/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/hy-AM/firefox-67.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ca3fe33ac08c0f8041cd099a33e482073f2b39e299a420614a59282da7badbf188a4b34bc3c39112ddfec6317cf1e90fc6eef5b71c0aad7fe063d4704faefc1b"; + sha512 = "73aa0a4ab5057a3bdafffb8909879fd4eccbc2530f60a31e9e3847b886c47210c981c9896d890925c62cdda2c047e7e5b1553c0d357217d07bfa9ae7d1be9cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ia/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ia/firefox-67.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5093533450f0857a256383e0d803d96ce803b7ab1b677716e644d7fb8f9763a915558647aa7fdf15e2503cbede65e94c61eaadd16c2898b4c0948ef8839cf159"; + sha512 = "0e7dbd8d5aab8e5fd797ab2703ada2c4a3f81020c56a3d8d929a390248e863cd3601c828e0da3be6174ab7ce1acd5303d176688e9e6496b51188932ad2a779b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/id/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/id/firefox-67.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "27f49bbe122ae4e956c98f48eb3f78f6e81f7b82d95acda8b045be8553f46a1492ee53d864d3836172bf4366eccad07257ee9cc85b09d0dbbd862ff331aa7795"; + sha512 = "a3578b1c7849dae63892020595705e4e70d29bffd4923519084eec702aa143e01a05294d94467a82265c02f811611f36f4ed204ccd3d0c827665076b43fde481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/is/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/is/firefox-67.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0f4bc25cb6ceeb29e817994180376da75b653b1ba3d6c640d44c007a97b28f7beadb9dd0e7da0fab9d4b3e98c3bb7e64bc5ad7705fdc2fa77a94d2fbd83aeaf9"; + sha512 = "aee9291395f1684b71e8053e48650d4357180b269704a09cab7cde819f14a93f7bd4d04844e4170838929e56c0dd6282b2eed37265ba9ada700c83d9300b79e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/it/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/it/firefox-67.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "cd9d137ede83910e1a4ce644f5361ac44fb22e01760ceb08ee13479fc4bd45eda62c37e4564a9d8f16733ddd8ab140e83ab039b3e9960bd352b62dbcca00793c"; + sha512 = "a06ae957abb7f0bb5a7314a43e0849c4f5cf8520cf4bea2ddc8cfa2d7fbe110c456d6c2a5663726b03ba4a7209e66c18810c8692272d40578ef84aaa14d5d30d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ja/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ja/firefox-67.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b5e212c6e3d4705347fdbd27334c30e563cea08534e211c0cafcebfc53e14163c81eb299be3b00f61e5485978fd29d4f6e2e1f581aa8243258a89460009f15ca"; + sha512 = "13ddded4e2449f3c49c249fa123099d34167f5d0caaac13f6f193ceb2625a4d1466b5a31e12c5347a240f84d3672ec17e9d09d9dc9aab317a5eadb15a52892c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ka/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ka/firefox-67.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "debce828403efbcc74492bbb9ee93e17adcaeb21d5bd9c77b4463d1dc935c0217ce67f85b392315896a32defd794da7a7789e0aa8a53c326b26d40b665e03ffc"; + sha512 = "4471813a2d15051a87b32f76eafcf5febd0852b7ea009c2ab714d4bc30e2a0882b6d20857db1f339b759b62cb85d211447be0f5981b95edeaa1f250a824c3cb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/kab/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kab/firefox-67.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "98931eb1d44e57c679173b2b1546d2dc12fcabdd504ff0af95952cc9558e2019a0aeb1f6c23acda7459767f87c821394ec3a367dd520edf267329b108b1da13c"; + sha512 = "508166b1d711b0c6106aba0997e13998abeae1b4dec8736c08d86bc1ccf5824d2b097e77890a3219315e99fe544314fc12a5289466f9db5268857f328f339b5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/kk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kk/firefox-67.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "21853d668de4d98b83d42b3a2c15fff9440cea295c8c6b437635d5167772bfeb5dcda958789c9b1ab1dbee91704969893ad2edf05e0d3b655819f6061aa8e5ad"; + sha512 = "e5ac50c7fcb57927fd423029916b50af10b69e0e7810f93d08bab2f3cb5e7d31eed98f82ff74b8319048a491a8dde81d07e77e5a8e66fad2d77b1173db643d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/km/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/km/firefox-67.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "1790bd7433acd45f7015bf901aa679901999906dea0946e1295cab7286981157f66b2fdc8076eea92e26bffb9c62c9358591325b7076dee1f001fb685023a516"; + sha512 = "2ed715bb8604af685a131bf2950fbdaeb7a1b1dc29444273a0b57dce213cdffe398acc8eebdff124c23068fb553e14e95990ed05253d2dd553e7f4c0facb5444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/kn/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/kn/firefox-67.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "2e558957bf6afa7516f0fb79d3adb88e6460234c011103bfd71e3d9a4bdc1343aa5a131e42f1e07edaabca1a1c170bfe886fa3cb85678c47431016a2bb95424b"; + sha512 = "7c052bd8a16208f485bed9b0e57c31733250208f16845cfb84c4e77a4c491e4e1dbd3ab11e47ebadc18bf00c8fe5a52c596bf858709eb2baf3b79409d8420019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ko/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ko/firefox-67.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3cca420dfeeb80c4e5df6444c30168683526076332aad66e8ad3f1b5059ff884201f7b7dd26d12d0f13508a1d92c9ec051e5f9bfe15b7469c9ea91dfcec6fe7a"; + sha512 = "d1b5db7b7c1850a9f0ea53fa123a3d5f5d6326e4cb2ea9993d283c6f5a3e372782348a007bbaee5de5793c3434701b7ae3db7796e82a10012a9834cc229fe0e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/lij/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lij/firefox-67.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "2b66912402ed540fe053a5c09bc677c9fe1c10621332de16345f04da9318573ffcedb4d21baada122fd72867849509174f7553c815481fdabbbac0ebc90ae7f0"; + sha512 = "ef2a3fcbd87cdc10e276981cd1d437863c275e965a659d848e6b8e64586af8d899dc1ea2f77d5ca0fc17805a53727471f4dfaee6fba71c1ec6768217c76129af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/lt/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lt/firefox-67.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0ef5beac076f23e385d7ce5c5b5ab7f4d0b18eadf12ec5fbd67acbfd45f435847810fc24abbb92b68afe3384bc8f458a13a9195a7b90f89a9c4fb3affffb071b"; + sha512 = "851e47f24aa4f183629f31263a206fd8ad3eaeb012abcb6fb52a072af5c12023a2097c982968d32772424af53198dc019c82f4db608ef9509855f83313c86223"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/lv/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/lv/firefox-67.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "5dd981d3857c0683943cf68e09c9ecea1908e13a37d57eb792f615deb8003b3448633f3a12f5d03fd5e83ff4c2fc39aed2a7fd6da20d6b6c5fa674416d0b2480"; + sha512 = "ebc5ff84fa5b04b6786b885e12b59b3da1933d53bdb86f5d6dba4cd4b10da4727da1f680e34640b47beb1bc78c50480cdc597ba4be7583be3d378844098b6145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/mai/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mai/firefox-67.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e0b013d7fadfc1dad4eb222329bb4fa70b0ba2b6b19e4e27b1c85d931970dd2b3c12552ebf6b68a7bc82a074187e41e95d8664a63ee95e1faa6d44ec0581984d"; + sha512 = "9f8a4fdebf27122efa3fc4e0a2696805d8a6c57766045cbdb83b976962c407b8bd4011227e4df587b21645549b88357e15e6c63bb62ae6f127e98736444f0bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/mk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mk/firefox-67.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "fa79c53f91b5389c07d96a4fa2b55770493d7be88b6a1aa4cdebf511ca9c4d1aa5a0b6caa386033b2bb31b38eb79c18abe845240cd415e216ca9ee3e80ee915a"; + sha512 = "8b0c2383278098f4bff948a91731e0d547324bd06623a58e7239514322d0a607d6bcd89a50afae72e2c3609cfac08c7276209779992310f21aaaa7cd21a87408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ml/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ml/firefox-67.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "34f2a3b304448684c6aa34474493a890fc73d4f10142b6f6870599e2cd2f1b45ed59213adb57e78f2fa60c864c09f9e17a87e75bd140af7bf0ddb656e6c04350"; + sha512 = "4b81cbf8f25a51f0812953f2c9b5523c9f18a91e6008c9169e1eb55222f03435be47e5cbfc45ce6707f4ebbcf705d7a283d0fcae3cf42c38c4ed469f0a4a6f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/mr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/mr/firefox-67.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bf385c4f502fb91a7bc1afb0c9c654cfdbc46efbb0203f957a7201468affa59e74f7291da7f0d75029f11a7a15794b9bf358a52e2f1adfa49a9becc3e71fafa2"; + sha512 = "bcbb37e15d0474eb591a5d1b3e8821e32e7700462ef50dbe106d4a729ce272d41f2afaa33a8cdc4cff4a6abee5637d72b4e57869f7799c54f1f7d42cb5ea499e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ms/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ms/firefox-67.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3a2e44112c3dd9809df39975f3ac26cacf9f1936fc790d0e3d54490bcdd8c74f45678352edef585e728c919cddae5ad4f090125122392093253d072b5502282c"; + sha512 = "a7e350967cf7d3c884920ff0bd49175727b165cda7f506f16efbd4b6b77f8af92b0861d293a74d008db71c9354c1fe661d081ecc646995f1c594dcc5afc373e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/my/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/my/firefox-67.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3a071a211fb3ca69a4be9ba4456fb3941570b5025ab9b23eb5f4d8e7e925fd1559befb991371af3d7c2b392e4065ed7408cd000f7dcf7711fb10c3b6ddefc2b0"; + sha512 = "a616c86801f0aaf348263d38b9b42836fc39e1f33d1447eb99c834937b0c8af570894577e29b4629e7036282607d42c9c0201607387cd0c4ac4c403fd38e3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/nb-NO/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nb-NO/firefox-67.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a04e36492c96d1809c8379737c33a09cd31fb81551f3863d84b180a669aa8e0bb79f2ca6ae4f3316a723154567f45e9461d8f4dcff3abd1e8361ba520e131e02"; + sha512 = "5e6d123acd2c3779762eea9166dc08a21969d46c454503d7fa1638ec8f2c38f179a430af225d97119049ec318726f0a4950ccc1f81c039d2aac92ea7d0d6ba08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ne-NP/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ne-NP/firefox-67.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ab849bb76b9262eabef349bef83bd191f1736a966ce7229f0d62493353f95e93825c88646742f07237da04422b4e0f616465b8125afad9ca181c5fdfbde80048"; + sha512 = "ff65559f40eb01c7744daef562aaaa9b6f2c12b1b4f76bf8930f4c840eb1bd6802713e04ea3131d20ce9e3b0e8466bebb67b1062a759d03528e54785d8c06a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/nl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nl/firefox-67.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "7d5edec8d5a477a0726ff52d29cb50684d1ccb42ecc4e580c4194821e10e86c37ff72a895ac2d8c9274d8105ef34661e410b8e3771f8ad3a60406c784e513f42"; + sha512 = "0b0fdab60471cc02f241ae07103c7c18e21708d13911f91f7388f4b71803ebc1e6e7a0db509d06a0523c6e9f775e954955a5d3dc674e2f4ed6f2e294e5c73e48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/nn-NO/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/nn-NO/firefox-67.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5ad392893c7d66c1c3bbde4652f5342a62a27fe3525e17987c0062593be44b4e15017c5f30a536687902e758baef9765fa519d485a3d868b48ee9e35e598699b"; + sha512 = "393adf5b39ab77382ddce7bb2b38b87c7c1fa86d9f666c961b9695266a932097316848ebf6ce46847bc8bc2aa05a8cab0ba01f568c31cef33675ffd32fd279d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/oc/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/oc/firefox-67.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "86e6d3a5e7d11f39e3e3690640805dbdfdad80ee900191a57fc916256b8a01f3779c2f8c1ed397862ce075d0130fc2e040c02d63c987c0ba14240e8dc966b94f"; + sha512 = "308025f320dcf0d359020cb2b9b560f40a74d6bd167322d1a92bb23c9c17ab9c9f9a07a9df9c1ceb2f7593184ec97234ccec8ee5b51e6979cb8ae90ccae3ae9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/or/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/or/firefox-67.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "3ef8a86b26e88c4daf6556aca8ea8422f8455a4ec6906466f7ee04f9eaedb3848e0268b69696c977349c6ffc22260b94a9eada20a23a39a0237d0e8ed12c30b9"; + sha512 = "12bf952a51a789ca0aaf31dab2f37b3165abb9682e7b4c0629f8afb89b4a97bd02b37757cb9d6d64fccb86fd7dd2a3b6240bf73dde54516372c597024c2048a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/pa-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pa-IN/firefox-67.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "81c689382130751a811e1bcdbf8d0993c301c9caa814e6de09dc7ef0c5bd27a7b58ebcfa7255f99de28a90bca9e343964915db5305703bd0b726b3ff6e5b0f02"; + sha512 = "3935ec90834f6b595dcdf16b67b67e98d1698480418dc3e4e7cbff36c7ee3ca67a114f20c1b74d046d3d23466b0a608bbe336998bcaa67e04282b5abc70cce4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/pl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pl/firefox-67.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "36420638b90460f5d3a15e42926a704d051864bff66bb8c7a0a598ccf5603398418929754f28db078d7757c9a09efa34ef663962e87bd3c12eacf460f7f07734"; + sha512 = "fa7fcafe51a046b19a1de49610d0fdab8f9302eb2ac478aca5fcef936162850313d8830d09de8cacad0836cf93596f3efc3f78900e72b1f9a2a51156246cf7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/pt-BR/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pt-BR/firefox-67.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "32735c5deef8b93fbbf24093e01ad7ff50e7eef4e98cb7944d9d73f4ee3f34a47e927363b674bc65e6d50aa2518d75c95e93360f69ea43f6ab16aa0be3a65e7f"; + sha512 = "ef730208f5aa09e98912397806d055425a85bab2937e2a126c304047e454bd9d051404acccaf125b0df14ddacc432fc48131d7ae9e61613b06b2666466913139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/pt-PT/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/pt-PT/firefox-67.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "84c4b9ec0990ccf50b930230a94ba276480da3f9d94f6000011aa38132d73998151ee66099397c4372350ddd9e0ff11c38e641dcca6b6ba696f97f4b55a9b8fa"; + sha512 = "d9e545f7266643733d05ba3159fe427172030aeac17d53ec786cfdf3b2cecfc6df5723eff2f13b85caa1c1df491718bb7125d6e5de0aa4175f877e9884196b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/rm/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/rm/firefox-67.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "50e3f42dc13a20bf409494db5798a183299ee8551bfa33246818bc54c15fd9e61d7de82521ff3b362ad6299c6d5796fc87495e59f183bb88dced76deaa167d83"; + sha512 = "262b951c958682009d7568e1c4c4f852f337162a8544f6d43033fa5d35c9b5b65e785d730e7fdd1e5dbae3e2e92dc66b2678a28be255144d9208ed92661e2c65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ro/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ro/firefox-67.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "23f751ecd904702489246dd9ee446474ff82470713279181e83a961f392f94dc2db1a8585eb1293aee9fa2595e1b7a668897c95d3bf0c1b039d0f28fc552a47e"; + sha512 = "2638d6ab621b1c12d7a4e6e299c571a44e4572e5a57b35a98db5a21b6d4d66fce29dcfd7cc4cb52bd1b6babf70eb910dd07a0d25ff5f117e1eeee3f552a98603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ru/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ru/firefox-67.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c6faa01485eac9cefca311fdc063bd34c0fdeaee3882852e0496e08b4172afc22a227e5d74739f8f46524b7b7a82fde33111bef5e9c87659f40c2b13f652ce64"; + sha512 = "0833383ac0b1c5845dc90a8e990321d67747bac98b731fcc4e9400806e8584f53bd30626e50235ca8246dbbe2454e06f667d2f3e393bc20b4c4fd2c989ff6fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/si/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/si/firefox-67.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0d39ba80d0b930243d6d3b4af5a22c072aee22cd87542ffc1f8ba3cb512840217293647f10e4f037db4eb9896f50a4661d81b055329e0413e89200f0197842da"; + sha512 = "d6e6e57d6e7b3ef80bb2a0574d4cd711669ed6cf026433b672909af2d749918eaddd61bdca2fb6c89c6288595fec50e58fd337507f04935dc88915602d4c2879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/sk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sk/firefox-67.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7511ec42894f448d547cd9bd28df2bf54c1cdaa022c70a7f0ac0ae0439453f02c6ca7ed3af7c6ffbd67f06371596e4abfbafe743111ff4e1f87a6e8c444c1132"; + sha512 = "4cdc735d757551058acc58d70f35589d56a88b172e156634c15cc969fb0165f8512920e256dca2cb34d0a9e33e3438c41962063a6d08a314d8b31a19dde3e09b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/sl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sl/firefox-67.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "abaac8c9dedd4b8d48d973ef004bf6eaae7b2d742a5a96ba989e79aa8915d65ceb6231ebccda70cee973fa52154f14ef998052f371cd57ec3874595be79836ef"; + sha512 = "c413c3242e1d1a9bef75b021dde12ceedbf2ae026ee70186d398ea24ad14d68878cde3ffc34e290b65e5d64dab8b4352931ad9ce71c4d758678c1d416f673653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/son/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/son/firefox-67.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "72b756437e7c22c1410f299d6d7acb15fa46b7e7b6ae590295a7358028c8d064a837027887c9d4a3487c648efe770e25150673b06a7eedac959d8bc832199043"; + sha512 = "b76ed2e4be73a466e74a30cd5d3eb9fc4d6e963d42a22471da3c657d58026187db0ea7e5f4e8eefebd558209719f6e01e01d0c54af77738214d49edfef5bc85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/sq/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sq/firefox-67.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b28972117b9f2e58b0dec3881aeac9b846d22d3f83937467b2f2840108b9a19f21b18035528a8ed79756ae749719952a8068f73c0420baa852bf37fc76cb28fc"; + sha512 = "1dd5462ce9bd3217192f30d9353292f6ed8f9cb032f5591435068961f26c6eb630ec602477d4ae5c87cedb58fbf7a4265f738e5ce14366050c433c4ad5c94184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/sr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sr/firefox-67.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "97abd33f6688c99b1f54353e6791639a2d60074b6d336ab641f367334145361537d53134278c856d4de8127e65d09696da016563216e176b40da312c3a251b34"; + sha512 = "4dcdc2e145d647a24c0c765afc396b5a54b06a719a2ef7c87b51c8af63d04fbbfcf6801eecffbbce0364cf79577ee25bbdfa62c77fe20a25e5e6ac04ced35965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/sv-SE/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/sv-SE/firefox-67.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "6db96ee35659d6d7aa99924d597348f801167f20f9f5fb877ef18d90a3fb4cef9657210fbff775b32eced6cedb683ef9705fc1d4184c81bcd2d57ae4e1af6182"; + sha512 = "7873ba8ecf982ce3bda6fb3b6f0c757062c0a15ae73ee848389c8a8864b1555a441daa9227a2532185631b30aeb8dff974ecd17548bc19aad6d194d566bc0618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ta/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ta/firefox-67.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c6657578d76b5a1cc74613fe358b73a18d8140879e4c4fe3719badd99a1df43afdae277a16100550e36b2c699874947c287ad8c2003177310f48dd6339a1d9d1"; + sha512 = "3fc6a0592bf90bab7e1f14a2c3eaa036fabf25715a5bd90fffe31ed853d7fb808c5f2c0082205477de5fa0db9c7f13b9ff4a1cbc18194cf5ecc95272da04e42c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/te/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/te/firefox-67.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c00a1c0ee102bf6ffaa220b85ad179eb5d72849290ba97ea13c2710c354a03979d8846731eab1c86be5fd716489603e5705f33c0c6be56473a53cb798074f5e7"; + sha512 = "ad6dd9e1b1f7f3b87260b771565c93c5a1dd3e3816c0d02e0b3d9a29693be1d933298fb40c388fb6cd0d5088eef2d3673f6a64b95b13bd0b695be8e3a48c3bee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/th/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/th/firefox-67.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "16af3a4c2cf449b79d101f5e83d55be98761cc41935bfb585502cce98109c169f217d32ab47847024a301a215b48eef1f26e7987702e579dae9747992bb4a291"; + sha512 = "4bb69801eb42b7e3873311a58478a4ec3b8c645862ef168bc05108386492045a66f8a1f56f7e672748d048afd5a5a3fa98211c2a93a2dd437b85ea304b1ef44b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/tr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/tr/firefox-67.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bec6a06142faf2b8f26fa23b52d96d877d6b5d060082f2c2ed4670ebe1be032f425f51a002f8d23d40476af1a5c8324e8454097497c8f032e94d55d9cad6ea1a"; + sha512 = "432da9abab5f9e37ec44526fad6652517148bbcc3df1ba05e0110bd106f546d3d5013643ab692ab7c7632c320a1ef576192fb59e5fe992e006dcb41828269a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/uk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/uk/firefox-67.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "81811a22bc68e78589b496d31a00fcf40498c53a0abf622595e53a56fec8ba199eb2a0ce11524232a328d0dea3fa3a37106ec603777e198e2a045dd425890b86"; + sha512 = "87aa3f86a456610f621c9fc3f3df91d95681727394d450f3c14a9a97357f4010b25a30a20f3f3f8dae81874351c170bfd03ce98c626792c043d9cf03d2f73789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/ur/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/ur/firefox-67.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3251e7012cf05b4edc2fb8f898a4d8b2fa8bcb2c6e3dd319641fc610e9ce67cfa21c8aee674fed4692919c371a24635a7e5a01ddc1013947b858a868a51bbc37"; + sha512 = "170bc3a3ff6141975fc6e64a4a88246292d3b4856c05f70f1125037f8ed6f46f178fb31e422ef0bc3fc4f90406530a2388123004416bccfb712fbe847e668457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/uz/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/uz/firefox-67.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9fa764ac4e833a9d41b128c5ac9c3fc8cb6fdf756dfe37038828391cbd88e6799096929685c1bbbe1fc21a48146013558f14545502ed59ebc037e184344c26c4"; + sha512 = "db3d18fb95a9db22ab18f53f6990899ea59aab426e968ab29e3dbde45df334fac8b418398df9b6deb9dbdaca6e6a2cb8db4fe892046936fa90761f037ab36c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/vi/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/vi/firefox-67.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e4d03b7dec10a696d0507abf77026d65db799e68e66b687b70303ff8dd329d70f3ab868b51023fd7bbb390c0ce851daedb7c6ab7de738310f7047fe88ff81dff"; + sha512 = "8d43a6f95ffdc4c6408688736554ffb22033e27f89e862cf9aed6969f18fb3ffc80be6f3d685db2361dca58c0b7446aa4b4f2d32f624a7d00b72275870e7e782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/xh/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/xh/firefox-67.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "dbdd35f56c0ee13bac2334f51dcb100c952c785c33ac5709755ab0a23b721e7c245a08ea13e99fb8e119e592afc13d6591ee771bfa67f8522f656b84aac8b34c"; + sha512 = "b724fa6cc59f1371bf86b7c3957cb4b37d101f0713ce859008bd78658a35f014a9f2f68a7c5751b3e5cfdb59ee80d0227e24d939ec8eaf62a96fc2fb438b22dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/zh-CN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/zh-CN/firefox-67.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b8611610aaaceffe33f7c2194cc51c77fe3fc1042f615a1539b79e7606ee1da7afcabbce5741cb6327b94f41de599966731748fb4cd76450ee2e5ad0c93ae8b5"; + sha512 = "2d0d2db1182f4f15d72accb8370012184a8b27525c3d9b7c815709be23dffd04a45cadfbdc31f2f3bd58f8643c2f09b4c59363b7ead23fdebd9e8236ea542725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-x86_64/zh-TW/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-x86_64/zh-TW/firefox-67.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "282e36c3b4fd9e649df2db2fb8e1853f7951fc4072946eff4c3483984b0de6e11437abb9c2ac1cbe58f51c5fa119502aff845a6bde6a0403f62069e88b53b74b"; + sha512 = "de02dd3b856cedb3575819aa24b91a7303a057d29074ca25de759487192f4dd9c466fe16d2680f0a1f53776a897bc2089de6490f13c546bb163dfe28c8f1ef78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ach/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ach/firefox-67.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "24e512e4fb45310d33cd1b8bff238ee949a06e1c9ffbdfc40a17e9d66a40b8f6b417e6d3733cc36254f52264d6da729ac5ea14bc315e80f6eff6b54138e7c84c"; + sha512 = "5e2dc826aa6b0870f9f0ae43ad9ec80d8d73e69b1090f50045a7af4bd9ab9708fe0dd4479248abb1e58b36b4347be101582fe989bb37d7a88f0d1c1af144d58b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/af/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/af/firefox-67.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "0451d7d281787d81381d10233299c768b787e8dec76f6cfcd34712ec62e65972d417d5821b89102ac64a9487759ef60d0423cbf926802aa475e3fb7295b7979d"; + sha512 = "6a39561973ddcc4598303cc4f21ad234fd739ef6b8683380d48c6e865846debcf1b1a85afff271d9c6036ae11fc7bdc1e6b00fa12ab0d9f376145c167bdbd35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/an/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/an/firefox-67.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "9d32e10bd40c9dff1c937a761b62999f07bdc02dff4450610011f67db0e9e75e17e843e9140e1e99699be611d08a9cfb2921711685ab26122d746edd48139fe6"; + sha512 = "f890a442d07a8f6601dca71f6939be99c2e50729e9488504d47f90543159527778ead5bd94db86bd4551888463e6465abbe8677cce1521c6fa8f2124d4d9e3ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ar/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ar/firefox-67.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "352d866ef091cab10578ca60dfa60dfad2a47ed70850bdf4df1ff54bc0d9308bd0bb08cd45b2dee374cd6a65a4af79e62d2d53372ce8743b68959968e1bda94f"; + sha512 = "07b2fcaa4b5a689b3a3faf76d48e774d05635714569d96032c636d89cfa6a3c8c4dba455052556ac4dc053dec481662196b81281a5c27db372191460b97ae458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/as/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/as/firefox-67.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d46be1e9e4c5f9e1af4a5217a8aa4654d1b4f7bdd993256f6d131854a6fdf8d09bf5828bf29d88ae259e20bf7a098422885a014079f30d1ebc685651d8cd713d"; + sha512 = "72abcb41fb5c2b08cd6b32efe1179566640ce1aa6300cd4b47c5bdfee5862a92b4e848284f0c7793b5029948ce5594f2cf9a592255f9013987cbe67a5900c68f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ast/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ast/firefox-67.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "759a05b431a8def020e31f3e14c8516837e5d59dcbc2258a8b574cfec4bdaf6242a21e9f108c7b3ff6427dfe3af9e47c71851d857a79eeca56d283019e29e801"; + sha512 = "7d2b0b6ebdfaac83ead00682af7f42e870a218a99576a4837e81bf67c2d6fbd4657642f2a4c4a55e7633f88f847e7673423a756b96eac00752c8e5023fc91397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/az/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/az/firefox-67.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d787aee5bc6b345365890049ccbd57f47f973526a47f5ae9be55f7b1635851d8eda273494a3c2ae66999f0524338ab12f16dfc45916618dc41e5620291e86a97"; + sha512 = "c4c3e1fddb8dd682caa5de4714cdcfb9263ae915aa6926fc99c7e27f5e8abc5ba8c45fc4ec8ff3b21f029d8d4d2cc671103a24fccbecd6b4e54841c25c240eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/be/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/be/firefox-67.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b2c8cb4e661488cd0d1ce05fb3c765e4c5be202a234cec89b14f76891535e7a260808c99b440b1b610e437b33ad88db2eb483bed759b053564d7e1355e556ad7"; + sha512 = "49c16d91f380b611c8e6e898986824f0afa7d7ea24a3460f73788f4e5d0ba60f13c1c2a37018e3690a54693f22662d4b43192c5aceb93bfd20f3aca9fb7ee33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/bg/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bg/firefox-67.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "897f0b7704a654f3ebbf3a35fbb245af543bfa8e67d7b0a3320adeca1a5cce2d650c911b60b4a4e801d330c99bd9df9a3a9fa92510b1f97dd295a44ac7f43a02"; + sha512 = "4e13b0959bec44ce0a7075611d4687eed3e88cd8e27888678f53bacf5762190ba628890b6c1fbf0b0c910d193a6f5be1d779119bb40ffa39c187e310bcf4d195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/bn-BD/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bn-BD/firefox-67.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "af8c1566e0b159fdaf0e8ed33c1e19f3a55038af3842fa16ac0fdcd1430e6f337b5184bfd71534d28f2ee3ace74436adf4e262f2f4435cc4e5c973f337087ffc"; + sha512 = "c3ddeee73c35cdf958aded90de953941b0ec9741a7896174a9a39976b76ae45c635fb44dd8db26f080766b61e4d5ad54f1257708d2063ceab4a0890689666332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/bn-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bn-IN/firefox-67.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "60563d9d9c334f114300818fce866d7b73c91992b5ba855b4a54efef853b747357792434340a1e3ebc99a3382e44288b393727716145fa1f39038f78f6d9cfb4"; + sha512 = "998a234db5db22ace4509a1d7d651331de2c8c2d79c21e0c9167a2b5200d828913b9e878c2399f4bd139448f5de27d8ca52feb89d5983459f54652c8f4da4d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/br/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/br/firefox-67.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fbf2f509997292c8dc56211b08ed99549ad911b586ec67227453d8eaa3e950b6b211e8f3a93ef55781d3aeac3412ebfb272d5d54ad3edab15aa5702731c3f2df"; + sha512 = "00bb23f5ca80975dc6d58a06d3d7b30b413525b31dbae8c5abaa65e6dd65c4b0e4f187af0637d28fd0bff6a0508bb90d91d0b3bb55651bf056e06911acddb051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/bs/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/bs/firefox-67.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4624881cdb4de31ddf357fff345e6eb8914f3129c0bdc376f8e2a18ee59c02616e5199eb1cb931ee06cab3d82af5c2e73495498472c47c474766eaf67546a7a8"; + sha512 = "10d5d9d286d7178ac06953f66383f7eabe677bb73784df0b8e02933d64956a70493e02c7aca099cdc63a80645ec2536ea093637b7c579efc2f4a24a93972afde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ca/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ca/firefox-67.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "899f0ec4507535b54ccb7f3b2fba036793cd1add3c7c6dab00708beb896601fd869c7d6499a0be2753288480dd8be7d6ec560d1bf7df0700a5e609c8a86621b6"; + sha512 = "b412e2a8facaef2de23f139eac4910572a148dcdbe22429e5c64d4cd1682fbc187dc2a9ef396e9e7a4643b0add3dbd3bff5815397b4877167f0accdfb9c81a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/cak/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cak/firefox-67.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "caeec50974edf9e7d088dd5a5a56d7931142cee1fd62fe905f916fb1807834207b1be90853b8cf715e8e0604bca6f5f9a8a64d494bafcd0617eb001bd8951673"; + sha512 = "c62dd0c1cc16619f815fca5240b1bb219cb973a1e47e75f0a47a34e2be739ea2ff1fa3b4b1822486ca4d6c0538f799a2ab3368b2582d005ff6f2bffa742321e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/cs/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cs/firefox-67.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a1c6bcd457b3a34df9bd24b9e2b7637e0edf440b038d0eb392c460d3c8ca3b94baa4607fa9d817b89b6dcabc17e0b754cfb71da363c8f7269551491d5aafa36d"; + sha512 = "a724da1110e2597097b09d446d96594858ca6aa6e8e02f536be14e74c19aca434fed261d9ca217f69e9b15b54067da2afe6b395f0fd3f44bd024c6ad0c5b1ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/cy/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/cy/firefox-67.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "18a621f3a2e1a09d89806269d81fd50c638f0db8414977c6c71c0b4e73685262597b02411121f467268474dc225e8110733586d03bc77505c96856f0dd2c8835"; + sha512 = "1e68b3351165aae7acee53356b9d765f1b8022b6775d340b33b196ecc7b2608961e970f33db8ac25310c0e98ce2e556bb69840b7078f89ed1f34c64d2af3be26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/da/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/da/firefox-67.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0500069a67ea8c50f44f4e2c9272b12609bfc206e32afcf642676b0a93d9fda8884d3a1ad97e714d42724ba42367861304c0e40fed966cb58e11d3288d9192f5"; + sha512 = "d571516feedb549fa6fee78b4d2705daf1225c41cffd821526530b78e059f9f58a4e37e6302113425a1ccfdf6e3af88bc380b075099431a98715b1f5781d046b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/de/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/de/firefox-67.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "31138cf943a820db7290b5e8cbeb28ffb1ec6e2a333d765902f5facc811f46521a4586c6b41886b0a6f8023e03cefc4208c3234a00537766bb16a27b1e68df30"; + sha512 = "711e30fe39a81084e59fb98a1256829dd3d6614da0486a6a0a7483c5b21d596438610be69bcb1da46978d26a86d7b60d2445cd70f7b16483be346293f10a03c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/dsb/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/dsb/firefox-67.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9d29e5b6de1fcb5a6d872e17183cfbeb55f734ff1862d1e67eb2048a1aea13898ccd2dce0c9177c74dbccba2fbbab92bcd217369d590b0132392e1c38111dd8d"; + sha512 = "bac01c4ca713a17061bcaded973bea11c1fe4b960cb7dad7684389fb96d83ed5cc12c744fdf88677d38e1f4593059bfeccbf2e84bd165c261af4ab611556f8a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/el/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/el/firefox-67.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "c22e86dd70b00427e110e0a21ef0416edd671e4e9888cc4a55b286509f9fb37cd0b0f3040024042c3753c563c9deab11e6910083171e2e49928f4ea1601a39ac"; + sha512 = "7d36c4eebd58c5630456b596cfc4069f4601c3e07238b1b7fc0d10b5a02c295626f4af263c274edba110c36bc48a0b1f4b351ddd7914cb077775a7b37bff62f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/en-CA/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-CA/firefox-67.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "54af36fa24ad72d049c7f68866fe619a6631a259f34dfa0ddeab507d6ac0174474ae796b878494c52f6cac86248d09ddfbea79d587b03161fb26b6bf39fd9137"; + sha512 = "281fd337e5d99892c29177a51b99fa5f6c872190119dbba5a340cc6255398c0b233f9c6281365c1ab466a26c0d0b22ea9ecfa19cd7de166de45213e908092732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/en-GB/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-GB/firefox-67.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5c7e58cd7e738b81e4663050081ff169439f60205ffdbf2d789731abf4831016c4df8605b1de9b331aca3f7f61d9be1622dfe44bb812bf1d2f4ecd765f05b880"; + sha512 = "c03d75936de0f53e31782a869626120a363bfa334273f0a262d85c207927391eb7ad036805d1abcfa3cc372284c1c9badc61a6ec1a71ad00d8332834c934b226"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/en-US/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-US/firefox-67.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "07b79a9ed8df6265e7b2949090a3bc37acee19358e2651c3c196c75473c72c97831e3cb04f9de7f6b6dc5b07c852c16b12352bf781d1a80ba4b52ed4a887dc32"; + sha512 = "db51834187e4892436b2351c85b29559fa55d461d285785555f6c5525ee3af3bfac2db24db7a9fb67c46cb27d3832eac362b859c10dd9ab5e3f6af29f6a8bd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/en-ZA/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/en-ZA/firefox-67.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "baf37f4923de4056f0ddbceb40ecc8b18e30373e9bcfca008b86368a784557cf84b687a67ee3945db7724845e397312144931f6db0e54dd21d3ccd9ea8535d9d"; + sha512 = "f4d8a9b3f1e00835f7799cae363ea14e7753d0f85170af7833ba04a08c1764603fbee6bff79bc3cc70bb71490efec89632a7715681cfb5b9ad8c790841281b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/eo/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/eo/firefox-67.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "73bc3e0675a43b47bebb0dbb24b08158d2df8e38c937df9fd93d8691ae9c34c8d66760adb976f1418d0d7a672a6ee9343372fd3695d4729b4596839bf6b9af36"; + sha512 = "cb51153857c23854270a74b51e321e3d769e724c995b55f008d5849d0dab79b7b4fc5b488b50ef77a9c11c0c9f4eda39e6dab038ddb0e3d8ecb2c26a7e95a26e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/es-AR/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-AR/firefox-67.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "61e3fe90639693cb0730faed91c2d503bab83825432486321e0985313e20f6c2378cf49407f3d0ddbd5c8457267c8626525f499b304c30b66da8d25f74869953"; + sha512 = "dde46c908755ee912df15d4d95e52636ca8d5009626215c434e637ba22f895765017e94a55b344ea44850629f7bf6a5b39c63dedd9e82b830141ea0375d2e4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/es-CL/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-CL/firefox-67.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "4b4ade154343190c3aaebfe86b8a630115e2c65e0a5fc73cf277819366889f85c177af6b1ba1e21beee6061f99778da44656ea41d6d05e90e42c9cea370c1941"; + sha512 = "d7580e5675af69576a327341c8b8572b1eaca977d074842a8681f1aa6082a819c43001effec7255b3c067790c14e97027df3e014a70c9f7784b44b7f22f39fad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/es-ES/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-ES/firefox-67.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "fb5808308312f71b62d2d691c3297e232464c44629ead6a012e9f373d21f85756dbe4a7f035a3ea270a7cc81f70e147fc0221b3d4e9974ad420df6a7b6c6766e"; + sha512 = "cb861d7a75cbf7a1fd6b0761a7f8afb3dd5a6f85567e65ba3e888a41a916340b9a41d5815518180b0feca4bdf7b95fac3b8f205395a9d0bb8ea1b0550bb1fac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/es-MX/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/es-MX/firefox-67.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f3b140276946cdb00fd2d392a515511dad873ab7f9ec699125d5335455e52288858fd7e0888ec076c29cb0bc313c6c2c1e5051e07e4fdaefbaa2f74650b65eba"; + sha512 = "354c649e408ae15ff00b5e88accb7d52979706886ed3ba1bf4fd7790cca2b23405c34aeffe35d5476824c15e5f4c6c1123a59f43392c3a8d9fb8108364e36625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/et/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/et/firefox-67.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b191a899a304d71dbcc2d4e840e6fa10680b4f8f547d1cb86b84bc0484c3042df8098fc17700cb11107e1023b6ec9805fb9c31c080024484ee693773cf0f6f6e"; + sha512 = "25a14e88b3a87f8833bd820e9f438eddda6eb4b17faf3f6f09da56b7c649ab91295cf37394fa01f9ab94ca8770aea70fe707bc7ee5f613bc6dc3617ab831af79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/eu/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/eu/firefox-67.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "50a28a419c0d067e8d5543d61b2857c2f810ce74a69fea2430d3097df87615d18c33c241e588328ce3dff461569b526c7f66d08cbb73c417c177ce1622ac3c2d"; + sha512 = "885cabd74befb02d056c1295d761fd46a03e59670eff7a7ad31f6248dc02f8ade924a39b664e2708483d97dd00b958a53c1a035bbecd92445d9633f07d28b905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/fa/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fa/firefox-67.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "11836cc114ffd98190024481d3a45be925b18699dc046fd0938831826b0c17a58d8fb1c5448bf03b675e953faa2539f571e1ec5ad8d5d361b233388dea72cef9"; + sha512 = "9c79a05157471141caa88513ccedbc522b85d26faa52d63e9c4650720fce19f6e83ab91e333e4b249cf1cc0945a04f5cb1d6c3e313e34b8984f53306a603f687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ff/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ff/firefox-67.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "060b177dd5cad5cb9174b78edc89fa5ff43c801a75e537e38c7bcb9b72e625e083f37005be90c7414ebe349710165b716a8018fa3d4f6bdea3795d77965789da"; + sha512 = "8769ac72f4ab9136930af41ea2d7964bf2bc615e0a6d7ffbbc9396875f2ea0ab709e14493adfcbcf602a700f656a7eb03c67bc75adc78379c4170799e38a490b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/fi/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fi/firefox-67.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3e7bd71bb00ec6a5bcb03920efd3e3ec529a40f057c85c68ef21d8b62b7b2d07755f94a91d92cd1f1266ad8f3ce5404f21b1d9fe9e314648320ca6c1a2566fa7"; + sha512 = "b677a46820fffdebef4d7b9b2a7d50cba76f0f371dfa27aa7f2c9aa954d075467eae9936a6d2edb47eb726e57a251fc30c481c2d95e493e32815c7cb315a8a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/fr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fr/firefox-67.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3a673fc6868434b9f386f84dec46088e4ed78a1c3d8f6fa86a92639dce3a19d6ad02895283ce1eda47466f1c8b1fe57e32475aa8ca93f5ee6abbe589610936a1"; + sha512 = "dc6433a9ee7667af7feb9eb4445477f0c9cbfdd34f906c9b9218b465b8d743a309b831309312587b3c259ff986e4d48204e23a3729d3157fe9287db0599070e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/fy-NL/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/fy-NL/firefox-67.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "955ebabf47c743886b7da55019563a403a661cac3af3a73c6fff6e9dfb29e8bf0a84d146aeefa9390dd3c54a2ce2b41dc0392f0f9052c839090fc3a226b49c9a"; + sha512 = "0e79e794d88a257dd7390d1adde4c3af0968242c6fad464742f97710f248a385aeca70eb6a2b1772c91bcadf7e02187fc914e1223b2f0fcda55ad7e842bf2560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ga-IE/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ga-IE/firefox-67.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "44c79d8fe8b0909a03e23709ee5404750220bc84f1526532ad887c73404a2dc8587f10f7747cd7525990daa705071e6f1633bc65edba7936eae9b6e6cc7cd59d"; + sha512 = "9776f8ab91dbe9ed43cd446eaafcd2da329092921d99126812d8c15dea9f475880e2e404e8bc27c77e7558562dd5b552a570837321f8d044058151766a53c918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/gd/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gd/firefox-67.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "eb159332404ae671876017a3bd338aa5f07decec0619588f8fba9b80bafc8f4699ab222b02b25e9dc75b76497425ab5d267d39e566b4f70845c0d85264d2522e"; + sha512 = "158ce665efb91a69deebbc3370080546420a06e093f68e3eaf8a5c6200d59837e3eea7f5395e674209db1c25859488cf43f6f8a2767b7bf0751bc2d68eaada99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/gl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gl/firefox-67.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d78a155d26c3f9066218880654740b3e0aba32ab17c4cdd3551c5ac7f728a86daa3ecb04889e63ccd633e1f0af25ca1c8f7a2923f377efd51aa492d2b6dc2610"; + sha512 = "d5e9f7ef9e8392ac7bf0a927763466b60d3467f54570682775d8cad1f6f974e4c8f1c3332c1425c1f5c2d4f60f51db4745c9c0cca9c4753475f546935574ea1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/gn/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gn/firefox-67.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "abf19170264f2d60c85646c49fc85bb0cb4028be5a0cb3cd8cdbc5e2e891d1e225d3efc3cbff5e8d58253c2283dcefe3216f1d07b75a0d5615bf6fa3cdf24ec8"; + sha512 = "5dde85bd2efbe5750b57e66bba184927c0732a60118ec11069f6d3d89991576b9f12bbeabb8336968a0413756dc35a68407d425b3c5943b0b11f4371ff5aa181"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/gu-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/gu-IN/firefox-67.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a3e556dbaf85315cefcfd4c4266d7c7b3831327a041aec6df18c9e54c29c473381d81c85c84ef708581f11d78097d379c86f0d010af96d2f061e0b951d986b2c"; + sha512 = "221b561822058f1fe6669ff1f0f5503b7196e0411d543d76a5e21bc334cab08d74bf521e8fa927d3b7d2fa3ed9a9f56846962569cfe45db9a85e1ffbe77def20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/he/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/he/firefox-67.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "27c601e6e42802c4c11c5e7c58f03fff9c1229256db8b81d7f7b1720d16edfff60e14294a581faa67ccc578dcf0e60ae2a154a3e395a3467f778eb52264bb014"; + sha512 = "99c46906fd8b57472044fb4d6ba2e624b960afeb6eff9a6c5886e65607af15d5a62b5d1a01d8937e2f1faa67486bcd4d17b4e2b5c6ec983388b872aacfb2e084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/hi-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hi-IN/firefox-67.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5ce3dc73b6ea0fe374342eb2e501e00b356ee424e854ab4bf3ea6c38597829fa57aa1cbf77b226ab8d20f6ab7db99d512a41156c7031b7351612e725b9e691d0"; + sha512 = "7c78e9e84151a6db4f2c4b00116ec3c4cdf9caa167009c9360ed068d4afd24f323277c6b8bb40facb62dd6046f3481efadb00f8b249046c57ac156dea4d121cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/hr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hr/firefox-67.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "2cff2d316498a0f32c56cebaa55b4f81b4ac8ff649520d974fc7791214f42bf308e3dccc5c781b5fe93dc6f59af6440f7f628f1aa35acb1b25ba04f4a20a0b9f"; + sha512 = "206935a83387f77a4fc85e98dd81532e9a7f373cab4895a8e71dbdc0b5794452a91870a38daf1155700e92b413bfe1ca4ddb854299a86ca8f409bf51df4962d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/hsb/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hsb/firefox-67.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "96616ffdb00fe06709875de72484b1f2df6cde09e39a5e27098b5da95ffb81bdc5527799c20e23f654b621b64ef2c946f77c37785e078e0100541c4ac2c923b4"; + sha512 = "241c87157f15a71b51bd74cae7cabc8b19a7046e1ec287031705c6f288cd568d6225b9119f539963622950b15b1dda3f7031034946f407ab15d070655d5a7287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/hu/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hu/firefox-67.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d959b1f64e161b2e2a83d3a2fd4ae5fc9320185593c7437f12fe18e08e2a25be7ee915582dbe523bdd99020762f650d6fc40543d911265b13b8893d23a963498"; + sha512 = "2683ab21084ddcbf86da7ac9390679e65aec30e2fa513d20f230bb23b3f0e21489d991e7dab1b781ab2e927d37eb18528fd29973f02170f5811752cdff53884c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/hy-AM/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/hy-AM/firefox-67.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c6b6f1e4e5fb27687e02de2d659167f2375870ec9b986591256fd192ed2b61dc8147cc9c3a7014ba6da92a99047d3eb0d0077e83b807a91fb4a1a8eb38715dab"; + sha512 = "b81f1238f396e88a02e55f5dc0c1b2bbd51d247a5ff7b918f88fde8b2464e31fb08aab108dd07e5c8abe4f27330f82971c73d685f927044138abc818e3967b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ia/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ia/firefox-67.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "4cebf1c1ffe67683a32ba633f0e25436152c58f9486a221fb98f4fec15872e6fb93da254e72c9464e7ab522fed640ca40473084fde9b36607e5de0376d63c007"; + sha512 = "2c9ee27f81d5662c61ef0e293be5568f53f5e5f0e3f7f6e6247de23e13d9dec5bde3ee93c141e8c11863aecf3ccc7d8000f88b4f1ab72cfc048162afc465268c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/id/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/id/firefox-67.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dc46c50f02e54d2456a54238cdc77551f27c128c83e004b7b62d1fdfbb3188bf2a6ce75db10032944ba5d960e623efb312c02f9fbcb94ed5860785f64852a70d"; + sha512 = "53c0c4572bab7b8fba5f3fe4ecfe2fbca02fcf344b9a451a921eb0397b3c0af264e9d70191489dc70d3f3aa853f87189c45c3cbd26b31560dd737920c46254cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/is/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/is/firefox-67.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0747eb575458ecd9d9cf7f33154cee51f7cd1fada498ac661884b9ab43845e74af664ec7c8270fb8df3b616abc5d8ced8dd1a8f46c49a8bf157a6585948a03f7"; + sha512 = "6a71af26f4d21d82d1d0e272f48f2b0c4a7e52a4d1e3ff93f7f45fa5b63d7e50a09155ca7adc38860454044a4eb6b929fb24ac7ff036e09e8661ba2006e1ea20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/it/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/it/firefox-67.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9d1c6446757e758e04213c5da8f0b1bd07fc2a9515c8faa797f6cc55d3f6d71dbadc90db51cbc63026d36ec5e5ab11a43294914d774f98bec408fa19cd62a9e3"; + sha512 = "f29ad5e27344aabdf39f1d592cbd0a458cf63c073ee1e3f01bdb4cde665b885f479e7fcf286301e80f1c31468fe9d171ce63a684b734bfce32fa1a71c8384e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ja/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ja/firefox-67.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ed652b5bc172785245d750a008ac478673b261a6c8100006a1096e03a6edcbb6678273132699221815cf373a698f6a5205e500e401eafe5b2d98e6183b033f46"; + sha512 = "b9d9e8eedda1273302c5568ea0c39ba1eaac0960351136d1761d75cd182e57bd80c10cd790cd4a1832fd9224f56dacf1829ad45ee932038f22518b8132c37170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ka/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ka/firefox-67.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d8678dd1c0ebef3fdaca55d96d5979e381214ee8cc9482d0b6b506914dff3e89d94fbe1244d16f3be45a25c1ad24e53317a63d9b300303796ab66717aec86e28"; + sha512 = "8dcac75ea5303cb47b86e259d381b7e2b4d947460fd9fe57fd236334bf4afd969e4cce2bee5690d619c3905417ec5f0a6791b48954cdd3c124d181dd28fed6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/kab/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kab/firefox-67.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "bd65ca4cd6d967026721aec64dbdd3d76e8f8e31e8d083abab74186c5128da433ec041fe7d1406e47c73289c9bf47b59977f8b15d1ccd4a58f7663e2fe39d739"; + sha512 = "a1fd847e02ac23f4355eac80609ec892dd6957c769c1fa3a6659c0e5ff8f8e9ba23830ecfbc7833ec1a514f32f7325aeb854b74a0b69f402e6f92c3c3ffc9aa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/kk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kk/firefox-67.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b5b5301ed89bcdfc91ddbc357569822323b4a59203d4e79c9475bbf5d15a5229c0d5e7c6f692cb1818f0ef8dad2831f53e76af570a1f3f973ab6fe3dc981f090"; + sha512 = "ef11e019b1f24d65fe086ee1ef6eaffe662d4d879e57ad1028d0a4ed3d91d5d3821e61929887735eeaeedda53a16b133e4a26c1289f109b6dc161cc0b9b8d737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/km/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/km/firefox-67.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "6f52203866915f1125f2158a721826889d5d32cb47564d05ee89715c071f489c0c7d5565148ea9a153e3e6f67e6d5b8411061b46db7bb07ac1ffca1bb4874298"; + sha512 = "97f5d8e017528b61a5a33f54ebe46cdae993bad7de5b31bd5e023d9fbcce4fc55673a5cc4dca3488dabe2fabd73f137d38ec7b606dd2968c1269ded59c761223"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/kn/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/kn/firefox-67.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "691f5d1859830ecd012dcb8149f78935beec70bf1bbdd56250d762e03471dc4f82faeec950c228608607254ffeaa2c6c6efff6afc7239167802353b32d154fb1"; + sha512 = "61500f9fe70f3c9cc3d96cf923cb8cc38602535d9a7018a375ed6d3e197d2ede9bf7e43af61e6fa6ea6ee0344464440bbd50b89e03d1d498cbab4af60e3179d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ko/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ko/firefox-67.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6efd7143f9eac860d654a36b7160368583312586d3a9cab153512187ee4bba1c4ad8924052d90905a3712cc743d7c9f279e74bd9e4302f842560b156ec3edf77"; + sha512 = "b21506b419fa8107c9536fc2d769ae3a22904291376849df6f37db04508ec9cf0fdf826ca59b6087aae084456b74eaa641bc5f52ffdf92b3af5a1e5e08dd01e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/lij/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lij/firefox-67.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "89a48ca0166e17c8e0f8ad34d62c9f3f1105a28e248ca857b532606cf5476d4ffce5d67f0d69c58328a332ed3db357cdb7b640048aca44545b7c7388e0d0463c"; + sha512 = "7d190979e6d3b1064a7e8377fbeb35d48ea2558eec730b6486aa4a8e710cceae612de374ad6353d13168849b856a588fc4275e5fb4448d8c7a888925c68d4219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/lt/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lt/firefox-67.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "95d6430d1a365c08a87a8349239f3ca87eee64ef403386ab22efed918325f9e696bd2654f487f7b1ea78b5b141d1b5908ef772bde2bec2a0d4d4ccd3a0381f24"; + sha512 = "56d160ff01f238bbfde59aec30711ae2a5cedd5997b2989da35d91716742ce467671909905e3fc323227fc819e420af927c294e7057b698255d3e01bfa524aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/lv/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/lv/firefox-67.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "ad430cda9506c8cf355173fa10718af83ccc516e5f86e288ed954951a9ee80ef754c96038dcc0aacf6aee4388a4c9bd1982ec479120655815da89cdbfc1d3f72"; + sha512 = "c814420be7fc181e5ee7f0b8ef56f7aa2506a5de5f6a7586befbfcb2442869998193f6412a54b2dcb4d0bf52094e539c5270d35ed1709b70187643ba476ea262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/mai/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mai/firefox-67.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "3f071060ff5584c53410f8aeda631783517f5b5559894c2df267aa0ae39b0f9992c618d0cf72905da78f33c7fd281568e46455a6b4e1e5d56a0bab5a266b7498"; + sha512 = "c0a44bfca4c3db9ba7cea0e1249b8983d322d0414b03fa868f72437961ed98afca2ae91c7ba0cc13137ea182f14d709906b080d7e41b82f4dbb49ea73190ae40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/mk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mk/firefox-67.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "18c4ada523ba5b6864f10a5b98576b82c5d8df6b74f2a63d1a8a8e6b52b80c2a8330df23714fe8e9b8cf9ae90e8888150125b0e9b7d2f4bed0dc6ec8ae8c546f"; + sha512 = "f3533ae65afeb45d3bfa8f6b4ce59083f9853a2e803e90a9cfdcbcb0ba58a30b0c6b231b5262366a3f9f337a92aaf7d8534b7ebfc8fa4ff617c1799c6a05d0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ml/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ml/firefox-67.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "913851f51c2191c9b5e8eff24028cabcb797cf541ad282ace0814bf8b5802616569a10c35662d7f78f8277d336a727d36a66172afcf2e125805f7c2a457fd4c6"; + sha512 = "3214165c93f40c6add58de638d956f98bbc76051d57eb8251bdfed97dd0409d6167cde18b63cc2ef787756e5f62807ce0ef01f749e4b8312e265b648bd8ba55d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/mr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/mr/firefox-67.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "ad6213273466845ab5ed898d3d7433ab923a47f219b60e983e3e7ff2f6c83c12a07762f585be0b3342a46e5a26c8111dd4f08ec069130b0cd9cde34ba4386afe"; + sha512 = "330dfe55f9713c9353208e008b96565df738aa9d31d0b247e8a3566a190e8c117d2a75ab9ce2bcbf47d69bed1a527d9e39262838b8264cb896821bd16037503d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ms/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ms/firefox-67.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c0448e56e843442fe34af819131779ef8871bbe7a8053630e1c76c38a718ee6af39720026b2fac6bfe26455a942ee721d40481e81822643c98bf89fd3f834437"; + sha512 = "75150905e1f61c75ff61f2b98a14e21c3b2a8366cc8e22871166efb0796e55ad7b77eaed3f12089a481ff219218c60d964f1a62f6582954e43aa761c348d8792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/my/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/my/firefox-67.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "afa16f935eea856b33bf1d2582da558ae44e69c8e749688b501e93af856bfc24af4108520b5eb15b7644fb3e941880ca597c829e3009fe7ccdd88d6fa3058233"; + sha512 = "1ac0e5ad914680e2936918702dd29325119172ec9959f4108b1da6f36eae05c50b10ad48f3faf433321b0d5706950d5006b0d47f5f310097bf7f3ff81f05e870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/nb-NO/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nb-NO/firefox-67.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6e5b2c0880ae0ccda95927186ab80db5b72228f11d2b67ebf893c85cd0fd7a9c0ebd0f6d98e1a1c5b9073391681870791c83b0fdfd9249d8e9f43f47f9c041fd"; + sha512 = "3d22b6109d20e08b81d36d41e41c7f864f360f6f66dc440ca30e996ea52c7bbcd8d1ef7ff38318ea443843d0cc3ac8f0e94fe53d1dac9ae09a5cbc595b08ce6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ne-NP/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ne-NP/firefox-67.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5963b46b45bb71e72436d2194ae19321ac1104b11a1593bac2140a9baee8a3c558046d74d5317f37e91f039577ffe0415b25e4cf611fdb34f002f35a79ae1769"; + sha512 = "b2ddc6467914af5e816bf5acbce901e63a9d21a1f47d6125c30fda4ef555c2a386fc2258ea613a8fd277e5cfd7db0a917159307268595cdcf67a8c473f5260da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/nl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nl/firefox-67.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9bc2bdb8ca1c6ec12ec6ceec1b3aa1fdc65b2fd16ec3bb6f483e43d07928016a94dc4b7c1859ae8f8c4e03ea32daf193589a91b9c80a899f72f53543703c4c73"; + sha512 = "79525094158eed262d1d269368cc3cc3248efbc7b667cf2b6c455de6c14533fd0fe5a6536f1b8e78baa804bee6244a46ccd7e5a261cfa20fe61f2985d52847bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/nn-NO/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/nn-NO/firefox-67.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2c64f3f8d31a64d1c8a297bbb5ea158b5f34830dfafc1488fc70e69d6207a3da6eca605e3eec7e59eb0851c61e81fe43b0f15956acad47668adc9318620d92d9"; + sha512 = "78c8b082f84c1120994a21e231bfc97d76f785f675a3098f225a4213ffccd34ca2a3beed45520286bf9edfaa70a924873225e162328ed04c40cde1e8f0eed486"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/oc/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/oc/firefox-67.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9f4224ed0c308bf1293e6edd48f32ba12e5dfe83cd5d9ac07da69f0c612fe624ba0b43907516c34b7bf057bc59256ce305e24428dc8b80b3bfa268e02f15b017"; + sha512 = "be2f575c2c009700a3da80db3769d1e8383fce60b55a59768752fa4b637d4985c380d63a38a1c348a3f8141f28cdaa4efdacd28b6cafdcc62ae683b7bee978e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/or/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/or/firefox-67.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "28fb53664b6f84a62b0fa4a8f82959e61779dbad22b9301133e73c070d3b4a0c52f6b68a1a7efd6c3f1620845008e8da709d1b756eb33919c39e61397d48d10c"; + sha512 = "93c59d7953133c827ac0bfee3687b7464234928beb2a903ccea62a483423408db1750500f028b5fe7e4136c08179936de5b24fe5e0a76b931eda21a76eeac039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/pa-IN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pa-IN/firefox-67.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "27d8feed5fc9d72ec153cebf6ba44edac9c8f56b76bcdb748b33aaa40608f4e513374348ff315cdbfa9ea5798cc33ba15cb8c936b21971d7bb6b1ab92b4b8bdc"; + sha512 = "c451fd5e76bf9ea7533df6b52e08c61e9ec5632588d45a491ae755d980476e946f951b85f08e03f071c4ed67e969dc06fe2aeb603bd997afa04ab14653d4b37d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/pl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pl/firefox-67.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2cdacb401c70eb7ea97cf2f2d7254ec1eb6e85e3e0d085206f44c67cf81680ec78f8ac3d0d4f4e8da6cf8af9045fbecc684a5cabb2821e9fcf5d068480dc0878"; + sha512 = "b957cb08156642c30b2c8158875309eac6e3e30cd9738c30f433125206c3a9798d3325e436a55d34cf8c4559b88b5c6e4e86b64ce71fff136e48bf8db90d636b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/pt-BR/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pt-BR/firefox-67.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "8d3830940c1883f93d4caa522ac782e5883e165c7537c03eb6e61b42d880128fc736f0991bebfb030b9c0e27f210e7d8025476b3554e3bb458e5895ff2674c52"; + sha512 = "6fea1a12942e05b9023a55e6f30e7b1661106c4007a0c4b0fd2a2f97f8a280b681176937c4534acb756fdf69fd5ad7cf33b78edc5709928926d2ad42aca632bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/pt-PT/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/pt-PT/firefox-67.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6e9e09c5ab614d94abde33f452bd4ffba49eb2d8a8581f3c3dd23188f8ebf3fd89235b0f3e8c8dd6b5f654dfc24b733edab50202baecf6d0a25dd0430a801da0"; + sha512 = "4f2a416dbab14767b83361b303d5d2eaecae8397a6729acf3274be7f6b9ec739b0312f94f1116afa7bccb5773fb7512360f4f8a403ff81c511a129a1c1d46b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/rm/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/rm/firefox-67.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c6c4cd67c63226f1873e246ec3295fef504952e228391ec20e96843f73b3e716df5f1e8f8b146bf8678740b95181f68fa623f59e2b3daab301f373695fb5d93f"; + sha512 = "3eec49e997ee34e6f79475cd1c3224ace06d030f1c62df8e58b89cd83ffd2ab365a284932c08f9b8e49314a91d3f1d03c137cfab94729a5215a8dc824401ce5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ro/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ro/firefox-67.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d91a92a0df401f519a02048d2da1910bceb9eac165c4f0ecfab7379bb701fa0369a27ce7911da9db5738ec98b8a3172cfe61bf1ec5a2c0853f39c618aedacaaa"; + sha512 = "9662eaf290ec38500decf8d474ea3d635d4a4c6df4125d4a36aca9635f02d80129d5a92ece301ed1c0bd4d6990432479825b6575c5bbe40d9b93ab09de7fbba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ru/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ru/firefox-67.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "19fefe3ab0133a697543aeafa9c2b215b37400ab9369221d0c6a8fa5ab5290900a2cd85eb795545a718004613fbd2ccb4ba287aa38682254099fb9663ef35cf9"; + sha512 = "a0840386db86e383f6397fb440a86efe623eea56e5b9246c0c2219b50864269ef35238a1028dad5b858a1ebc347a44b588150e1140679292d7f8e43b42b4b216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/si/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/si/firefox-67.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ab823e5c78f867417e8598ff2b455b9c36f0f1e7be9d60f62e6cd0c589598d8e75a98bda5acf38b9f7ea622aab2561f2e65eb410da86fca7bb8aa37dff745b9e"; + sha512 = "3a55e60a4f8baf1d0df17d1317da7b5cfe5bb7e5fc7be512599c9ea566434c8ec98d7e55ad51c3709f46ca01a96b5322b54e44e8814f9f11633a20e4a1a8d83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/sk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sk/firefox-67.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "154eea0286a2857ea5400699564e53acde49d0521c014d773e58b8aee40a6154ac4836271e5daea26311b092de82045e73388c332dda999abd75ccd79127cc88"; + sha512 = "df88f7d9667717c8922e6cd575ebae714246d99252b7f65b3d12c4d1dc9717fa06ecb89b6cd07bd37c8b5a3744d4c5380a7e78847398c42f112c07853ee5724d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/sl/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sl/firefox-67.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d933f3b1435fcfa819d4d7ee2643d43adc4ee9a603a154e039e76abd35b107a183176ea0cf42fa02e449608c57c817f7940e4a5030a23d892604a2a1283d203a"; + sha512 = "add245941b10147cdd7888dd2183c72b43bd36e5a57bd28234ae8ff45c239b20242599a07aaf499947118cf613df483188f945381c43590864752b0178eaa8e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/son/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/son/firefox-67.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3b22df3a50c5cf194cf42e40bfb9437e024a115ca13731827782b0324ecb62682500f5561481c29404921e826ed649a175834fa44e296a0026753b3f8b0eda53"; + sha512 = "95a1e1c4a749aa0a8107771db090a628e3980eda4562f413d9417ae71b812a23cc5e9210c93e5aa1e3422503360213bf8168a9f2ddea0e83e06b3a8caf5d9f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/sq/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sq/firefox-67.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "262009275e6e7f6b0c4e74a60e7ccbf33d9db8f56090db56d29e7e32770a4db8ea2ffc7adf8db8cef96c727505d362c2f8367b51285c8e0f661f227bfb62c273"; + sha512 = "59f9898e8ea2a9d1c9cae3f3fb9b7ae20144b38656efcf9095cb4e534cb5b92d6aae695a37fb21bb2196300ed01a3896b7ad9dcd4a6d3e5c68dcaa1d43931070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/sr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sr/firefox-67.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "dbd0b49835d876336dbbf38cb72a49e8d0aa29430db540e8557cb3fdb9490877ea70b121e08b2ec87fff7b753a8e5e11e15afcf9b722386610267d9da4dd9f41"; + sha512 = "da5ca0f67e6b452eb128fde6fc6e0657cd296e2d4fa2e3fb9aeae88563ac0e2cd91a85915d3c758a558795c92a849fdc2d22bc7a650fa785a08fe624bab0c452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/sv-SE/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/sv-SE/firefox-67.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "2fa6218559bd722d69e5de355e0acff0a3f9a4eaa450fa7b4c6592261f6e3dea4a69592c22b79ed9e2a0c3c1eeed9f2445c2a1dabbfc5fc5aa3c1866d89ef5bb"; + sha512 = "4d5cc5cda0f85653a8234af9b674b8c334ca7561d3cd4f69245830d3d31e8f1f7ff30fe0615ce154ddaf0d50db2e717192826b850b19dff7aaf71869e401f436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ta/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ta/firefox-67.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "640135dcb468d4da12095ef8807c9c3c8e251b65b569aae32ca68797d6327f34cd9636b8bc89dde6ec7c02fe69fef31bc301b756dfc255d080796ccc36d7ea10"; + sha512 = "d106704886b39d6a4dbe0a98a5fe465edeb975346d28659fe866ed8afa23e7416276ec11b17965171a5cc3f3ffadc4a58beeaeaa0ee8d879783c301dff5ce488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/te/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/te/firefox-67.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "9f0ed5c45d9eb692c4469f71b84fe3a2999df6ae88358a2d7b98376ca8e2d9327b2d2d5abee5d6a87df9fd8c635733c7ddb997aebdd0e187362c4cde5a3eadeb"; + sha512 = "c28dd4b81e4583aa79a7c8e389813ee3c7e66ce27435fbf4203dfd7b9924eaa88f4509ef879cf64303b155fcf95bb595e74130d1fcfce0396326ca8710f65e3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/th/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/th/firefox-67.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca1969e32fb068daa87c8c3d0c4a7c8b0a7604593fd630222efe472d524951ef8f5998603e1ff02bdfa4bec92caa3de33eaf3649d7f2ecb1800ade8dad00748d"; + sha512 = "750ec351b5164c1036e6099d8150e234f8507acf759ad5a94d90f5cbb75bb2e1a81c1728dc1c4167f66bcac4ed0c9eb436e58507b0ff1cb2024970582dcc1dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/tr/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/tr/firefox-67.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b3508c7a4fb7131d39d3fed4e030e1df5a94fb5fde41e9314d9fad73cea8c1c605de7e2ed955cc81a43f7efbe1f5942dd20317592bdca5361c5a7826229adb59"; + sha512 = "eaed8385e18fe63b481e2a4cd8bad587cbd77187aa5979b6153ff444554aa3ab844181b651344f111854c7cd605006ce2c43b124f75dc7ca30698adfd222f8b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/uk/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/uk/firefox-67.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "470937d1ab37eae1ae90d681f6ae98652c54053a421aa46b0e387bafe83d98a32cfcff800f4088f536fdaad95e938492dcb1fd8926181e3b85a38b9b144674ab"; + sha512 = "674c50f7ce0b29dbca906db85acec63a57a313b3057971f9927ab8a08af346e4f4375b55c3711d59bf77507a3e713b497e78fd98737c3520f56ed918d2a417f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/ur/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/ur/firefox-67.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "430e16b904c1ad84e481c198425bce51d5f5f54774773366046f0ef504db598d9a66c394f615d01a5b3df4c2320938fd25e0e23dea6148c5bfaa67f5df53b950"; + sha512 = "4a5ae461d3f43ca4596ce3e82d56ba6558c971b32e3bb7ca035fc6e4871097c09f3341b27e2e4bf2eb06df31b3b2eb53f82d7b807225611288be05333db07870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/uz/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/uz/firefox-67.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "51c299130ec6daccd66c157834642f8bcb5d59ce2478300e37d6a8b3b9529c9de44478fc001a353ee70da022170237443fb08a87c1c10abe411a1dded0ba298d"; + sha512 = "236f58c13709566f9cdaae2b8b03742f85616a917fbbe6c75cfe662f19d10cd60ad16bee8e454a8e9233f3b80184e4a037a91850763d9572935af56572db6c44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/vi/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/vi/firefox-67.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3955e7b943e32b3070f573bcedddbaa143dfeca7ff036c862b4f4bb223b82d92dfb7aa6f80db981d63e72c75a360e1d8c1d4e5e7c7816162d1041c0a8c2d7a40"; + sha512 = "1969f62165a73c88004dda2e173732c9b7d133edcfc313e1713d9b5c24cb6a5db19bb287d693a1f77cfc9fc28bd3c7ff8449051df09392f00d023add981d4529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/xh/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/xh/firefox-67.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "c6124558b6a2aa5e485c84e1c55dba99bf01f133da17156a5720a98eb37ef2995a7420d3924d2735dd786e99a9f031e88fa7e01376ecf57ee4b883a743e887f5"; + sha512 = "b4406d3c5ba0ff5088f91a8df30087a3029eb0f36a659e08666cbb55dfe1461b69501d2c95d22dcbb534551c7df0d8330d226883d24c3458e3bbe5e2c481d27b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/zh-CN/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/zh-CN/firefox-67.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "962a638db5ad2c3d4030ebed38aed546f623ab72f126c4b52a71e1a5125a443c12284904de4c0f6993b55dfbaca1fd89e502a76bb327345ecebdeabf6e5271eb"; + sha512 = "0c0a4d87d4b973a79da290692375358a6cfc06758be48a84b0c56f39875d3488e845f6473ce432b2e2841023d6cd7655551d13d0a464b533b3bde7efa96e912f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b16/linux-i686/zh-TW/firefox-67.0b16.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b17/linux-i686/zh-TW/firefox-67.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c682f65cf07890c0435fae0a04a9a42916ee3fdd8a1b37735bf1884f1106f1b1c88fd54226cff970844b560067578cd37f7874a389dd4b98bca3a258976c7820"; + sha512 = "46539cc0cdae004ea69c792aa7f9f158994fbbf3a28f2db43efc5a6a9337f59d6a0507fa94db3a6e4bf451ceb4234841c9e3417b21b399eada809b9ca4511489"; } ]; } -- cgit 1.4.1 From cf5ed1d004a3b0eac1cc0242ccd9324a78b4d577 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 7 May 2019 07:12:55 +0100 Subject: nix-review: 2.0.0 -> 2.0.1 --- pkgs/tools/package-management/nix-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 367405f552fb8..43e261b106bf7 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0"; + sha256 = "19x0wbb8annmzi67r79112j9kjzz99n3qd6adh80iqx2dh47pk5g"; }; makeWrapperArgs = [ -- cgit 1.4.1 From a3f8a25ab30578bc851049ee8d468da09d21dff2 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 7 May 2019 07:32:41 +0100 Subject: python.pkgs.imread: inherit native libs on callsite this avoids potential namespace collisions between python libs and packages from all-packags.nix: https://github.com/NixOS/nixpkgs/pull/61033#issuecomment-489926103 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ae7784c64099..9af4ca1d01cd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2028,7 +2028,9 @@ in { immutables = callPackage ../development/python-modules/immutables {}; - imread = callPackage ../development/python-modules/imread { }; + imread = callPackage ../development/python-modules/imread { + inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; + }; imaplib2 = callPackage ../development/python-modules/imaplib2 { }; -- cgit 1.4.1 From 501c2c28a453b5d1732c92ea6b5d1f75d8878092 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 May 2019 09:39:23 +0200 Subject: tor-browser-bundle-bin: 8.0.8 -> 8.0.9 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f37677b05213b..03bfbcb25cb48 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.8"; + version = "8.0.9"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi"; + sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a"; + sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv"; }; }; in -- cgit 1.4.1 From 7defc47944fe6d1da4c3a08c60c8332ca660a680 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 May 2019 09:39:33 +0200 Subject: tor-browser-bundle-bin: meta.homepage is a regular string --- .../applications/networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 03bfbcb25cb48..177b3c6e925a2 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -389,7 +389,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tor Browser Bundle built by torproject.org"; longDescription = tor-browser-bundle.meta.longDescription; - homepage = https://www.torproject.org/; + homepage = "https://www.torproject.org/"; platforms = attrNames srcs; maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; hydraPlatforms = []; -- cgit 1.4.1 From 1d754bbe941dd048df00c28d08682b8c82319852 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 7 May 2019 03:43:13 +0900 Subject: qscintilla: fix dylib names on Darwin On Darwin dylibs are intended to have their install names set to their absolute path. Without an absolute path, applications using these libraries will have invalid references embedded, and will be unable to locate the libraries at runtime. --- pkgs/development/libraries/qscintilla/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index bc3b444130542..2c63f893a2cc3 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, unzip , qt4 ? null, qmake4Hook ? null , withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null +, fixDarwinDylibNames }: # Fix Xcode 8 compilation problem @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ (if withQt5 then qtbase else qt4) ] ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; nativeBuildInputs = [ unzip ] - ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; -- cgit 1.4.1 From af46c07eaf03ea421ff861bb54ffafcafa0bce62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 18:40:09 -0700 Subject: python37Packages.lark-parser: 0.6.6 -> 0.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-lark-parser/versions --- pkgs/development/python-modules/lark-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 3dedc3b06d88b..5d114fcab9ca9 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.6.6"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0kaiw8zzzcp92p6mzm9zkyhv578p0x4lzjsyl8b4rnsafplmbscs"; + sha256 = "1zynj09w361yvbxr4hir681dfnlq1hzniws9dzgmlkvd6jnhjgx3"; }; checkPhase = '' -- cgit 1.4.1 From 87bc514620998a3e64278a3eadbe660c51bafabe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 May 2019 11:08:36 +0200 Subject: hardened-config: enable the SafeSetID LSM The purpose of this LSM is to allow processes to drop to a less privileged user id without having to grant them full CAP_SETUID (or use file caps). The LSM allows configuring a whitelist policy of permitted from:to uid transitions. The policy is enforced upon calls to setuid(2) and related syscalls. Policies are configured through securityfs by writing to - safesetid/add_whitelist_policy ; and - safesetid/flush_whitelist_policies A process attempting a transition not permitted by current policy is killed (to avoid accidentally running with higher privileges than intended). A uid that has a configured policy is prevented from obtaining auxiliary setuid privileges (e.g., setting up user namespaces). See also: https://www.kernel.org/doc/html/latest/admin-guide/LSM/SafeSetID.html --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index f1f18c64130c1..79ee27c52b50a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -91,6 +91,9 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { PAGE_POISONING_NO_SANITY = yes; PAGE_POISONING_ZERO = yes; + # Enable the SafeSetId LSM + SECURITY_SAFESETID = whenAtLeast "5.1" yes; + # Reboot devices immediately if kernel experiences an Oops. PANIC_ON_OOPS = yes; PANIC_TIMEOUT = freeform "-1"; -- cgit 1.4.1 From 6104102c247ce6b19ab56b860ee28d00c50ef2bd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 May 2019 07:48:46 -0400 Subject: oh-my-zsh: 2019-05-05 -> 2019-05-06 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index adbc0e7e0ba68..c58539bd788bb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-05"; + version = "2019-05-06"; name = "oh-my-zsh-${version}"; - rev = "d4a3e0645bef49bfd1808aa263ecf916f79f9040"; + rev = "6da59ff046d7a81483345d0e16333a69eb96ccc6"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "06i5b7akcdq16ifiv2mvvm2vjnnk1hvb7hhdim4admv4h9068mn6"; + sha256 = "032smh1sahsr62wr0n4s9jmmyjq1iybdgvl388kh8d2hdkaj94r3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit 1.4.1 From 84ebd401a7614fd2c09ccb42aadbd9c0d9f26705 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Tue, 7 May 2019 17:26:10 +0200 Subject: termshark: init at 1.0.0 (#60417) --- pkgs/tools/networking/termshark/default.nix | 35 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/termshark/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix new file mode 100644 index 0000000000000..3361127afede7 --- /dev/null +++ b/pkgs/tools/networking/termshark/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: + +buildGoModule rec { + pname = "termshark"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "gcla"; + repo = "termshark"; + rev = "v${version}"; + sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ wireshark-cli ]; + + modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g"; + + postFixup = '' + wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} + ''; + + buildFlagsArray = '' + -ldflags= + -X github.com/gcla/termshark.Version=${version} + ''; + + meta = with stdenv.lib; { + homepage = https://termshark.io/; + description = "A terminal UI for wireshark-cli, inspired by Wireshark"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa8a08cab7a3..56acf99693143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17673,6 +17673,8 @@ in wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; }; + termshark = callPackage ../tools/networking/termshark { }; + fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { }; -- cgit 1.4.1