From 198dfac8bbabccc02466541c8b18759471048a05 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 26 Dec 2017 11:07:28 +0100 Subject: [PATCH 001/185] vdrift: fix build, allow parallel building VDrift previously failed to build on gcc 6. This isn't fixed in any released version (I don't think the last released version being from 2014 helps), but the latest git version at least builds. --- pkgs/games/vdrift/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 27eef261426..0170912dbaf 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -2,14 +2,14 @@ bullet, curl, gettext }: stdenv.mkDerivation rec { - version = "2014-10-20"; + version = "git"; name = "vdrift-${version}"; src = fetchFromGitHub { - owner = "VDrift"; + owner = "vdrift"; repo = "vdrift"; - rev = version; - sha256 = "09yny5qzdrpffq3xhqwfymsracwsxwmdd5xa8bxx9a56hhxbak2l"; + rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; + sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; }; data = fetchsvn { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { chmod -R +w data sed -i -e s,/usr/local,$out, SConstruct export CXXFLAGS="$(pkg-config --cflags SDL2_image)" - scons + scons -j$NIX_BUILD_CORES ''; installPhase = "scons install"; From 607f36fd8923ca5d12dbabf561939037369637b7 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 26 Dec 2017 11:11:49 +0100 Subject: [PATCH 002/185] vdrift: add self to maintainers --- pkgs/games/vdrift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 0170912dbaf..92b823eee33 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Car racing game"; homepage = http://vdrift.net/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric lheckemann]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; From 298409f4ab9ac0e1d67ea73c3dd4692f933523a5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 5 Jan 2018 22:06:15 +0100 Subject: [PATCH 003/185] vdrift: split data into separate derivation This allows vdrift to be built on hydra without taking up a large amount of space. --- ...Ignore-missing-data-for-installation.patch | 27 ++++++ pkgs/games/vdrift/default.nix | 83 ++++++++++++------- pkgs/top-level/all-packages.nix | 3 + 3 files changed, 81 insertions(+), 32 deletions(-) create mode 100644 pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch new file mode 100644 index 00000000000..6794e8018af --- /dev/null +++ b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch @@ -0,0 +1,27 @@ +From 7ebe252a8488a63675d1c50c0faa1bdc5ff97889 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann +Date: Fri, 5 Jan 2018 21:27:28 +0100 +Subject: [PATCH] Ignore missing data for installation + +This is for packaging vdrift separately from its data in nixpkgs. +--- + SConstruct | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4394de0b..beef29a4 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -511,9 +511,6 @@ env.Alias(target = 'bin-package', source = bin_archive) + #----------------# + Export(['env', 'version', 'src_dir', 'bin_dir']) + if 'install' in COMMAND_LINE_TARGETS: +- if not os.path.isfile('data/SConscript'): +- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' +- SConscript('data/SConscript') + # desktop appdata installation + install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop') + install_appdata = env.Install(env['destdir'] + env['prefix'] + '/share/appdata', 'vdrift.appdata.xml') +-- +2.15.0 + diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 92b823eee33..81b95ddb9e1 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,41 +1,60 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image, libvorbis, - bullet, curl, gettext }: +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image +, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin -stdenv.mkDerivation rec { - version = "git"; - name = "vdrift-${version}"; - - src = fetchFromGitHub { - owner = "vdrift"; - repo = "vdrift"; - rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; - sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; - }; - - data = fetchsvn { +, data ? fetchsvn { url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data"; rev = 1386; sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1"; + } +}: +let + version = "git"; + bin = stdenv.mkDerivation { + name = "vdrift-${version}"; + + src = fetchFromGitHub { + owner = "vdrift"; + repo = "vdrift"; + rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; + sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + + patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; + + buildPhase = '' + sed -i -e s,/usr/local,$out, SConstruct + export CXXFLAGS="$(pkg-config --cflags SDL2_image)" + scons -j$NIX_BUILD_CORES + ''; + installPhase = "scons install"; + + meta = { + description = "Car racing game"; + homepage = http://vdrift.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = stdenv.lib.platforms.linux; + }; }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; - - buildPhase = '' - cp -r --reflink=auto $data data - chmod -R +w data - sed -i -e s,/usr/local,$out, SConstruct - export CXXFLAGS="$(pkg-config --cflags SDL2_image)" - scons -j$NIX_BUILD_CORES + wrappedName = "vdrift-${version}-with-data-${toString data.rev}"; +in writeTextFile { + name = wrappedName; + text = '' + export VDRIFT_DATA_DIRECTORY="${data}" + exec ${bin}/bin/vdrift "$@" ''; - installPhase = "scons install"; - - meta = { - description = "Car racing game"; - homepage = http://vdrift.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric lheckemann]; - platforms = stdenv.lib.platforms.linux; + destination = "/bin/vdrift"; + executable = true; + checkPhase = '' + ${stdenv.shell} -n $out/bin/vdrift + ''; +} // { + meta = bin.meta // { hydraPlatforms = []; }; + unwrapped = bin; + inherit bin data; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0572fbc0293..90b622d9ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18533,6 +18533,9 @@ with pkgs; vdrift = callPackage ../games/vdrift { }; + # To ensure vdrift's code is built on hydra + vdrift-bin = vdrift.bin; + vectoroids = callPackage ../games/vectoroids { }; vessel = callPackage_i686 ../games/vessel { }; From 438452f07a6df2b93e0e186cea51f059a54dd5cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jan 2018 09:15:47 -0500 Subject: [PATCH 004/185] docker-edge: 17.12.0 -> 18.01.0 --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf..ed7741b5522 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -215,4 +215,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_18_01 = dockerGen rec { + version = "18.01.0-ce"; + rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit + sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910afc8ac69..f2e565032e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14523,10 +14523,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_12; + docker_17_12 + docker_18_01; docker = docker_17_12; - docker-edge = docker_17_12; + docker-edge = docker_18_01; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 41d252d7a4be12db7cec5a47468cee1024525eca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Oct 2017 05:40:39 +0200 Subject: [PATCH 005/185] nixos/nginx: allow using existing ACME certificate When a domain has a lot of subdomains, it is quite easy to hit the rate limit: https://letsencrypt.org/docs/rate-limits/ Instead you can define the certificate manually in `security.acme.certs` and list the subdomains in the `extraDomains` option. --- .../services/web-servers/nginx/default.nix | 19 +++++++++++++++---- .../web-servers/nginx/vhost-options.nix | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 2951e63e863..100fabf902f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -15,6 +15,9 @@ let } // (optionalAttrs vhostConfig.enableACME { sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem"; sslCertificateKey = "/var/lib/acme/${serverName}/key.pem"; + }) // (optionalAttrs (vhostConfig.useACMEHost != null) { + sslCertificate = "/var/lib/acme/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificateKey = "/var/lib/acme/${vhostConfig.useACMEHost}/key.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -174,7 +177,7 @@ let redirectListen = filter (x: !x.ssl) defaultListen; - acmeLocation = '' + acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) '' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} root ${vhost.acmeRoot}; @@ -194,7 +197,7 @@ let ${concatMapStringsSep "\n" listenString redirectListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; - ${optionalString vhost.enableACME acmeLocation} + ${acmeLocation} location / { return 301 https://$host$request_uri; } @@ -204,7 +207,7 @@ let server { ${concatMapStringsSep "\n" listenString hostListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; - ${optionalString vhost.enableACME acmeLocation} + ${acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; @@ -555,6 +558,14 @@ in are mutually exclusive. ''; } + + { + assertion = all (conf: !(conf.enableACME && conf.useACMEHost != null)) (attrValues virtualHosts); + message = '' + Options services.nginx.service.virtualHosts..enableACME and + services.nginx.virtualHosts..useACMEHost are mutually exclusive. + ''; + } ]; systemd.services.nginx = { @@ -580,7 +591,7 @@ in security.acme.certs = filterAttrs (n: v: v != {}) ( let vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; - acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME) vhostsConfigs; + acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs; acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = { user = cfg.user; group = lib.mkDefault cfg.group; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 29f08cc4f30..bf18108a1a3 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -48,7 +48,21 @@ with lib; enableACME = mkOption { type = types.bool; default = false; - description = "Whether to ask Let's Encrypt to sign a certificate for this vhost."; + description = '' + Whether to ask Let's Encrypt to sign a certificate for this vhost. + Alternately, you can use an existing certificate through . + ''; + }; + + useACMEHost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A host of an existing Let's Encrypt certificate to use. + This is useful if you have many subdomains and want to avoid hitting the + rate limit. + Alternately, you can generate a certificate through . + ''; }; acmeRoot = mkOption { From fb1d09467282f5404f278b4fc5bfa615c2487f92 Mon Sep 17 00:00:00 2001 From: tilpner Date: Mon, 15 Jan 2018 06:20:03 +0100 Subject: [PATCH 006/185] goxel: init at 0.7.2 --- lib/maintainers.nix | 1 + pkgs/applications/graphics/goxel/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/applications/graphics/goxel/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d335f7f3b93..b854702ece6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -672,6 +672,7 @@ ThomasMader = "Thomas Mader "; thoughtpolice = "Austin Seipp "; thpham = "Thomas Pham "; + tilpner = "Till Höppner "; timbertson = "Tim Cuthbertson "; timokau = "Timo Kaufmann "; tiramiseb = "Sébastien Maccagnoni "; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix new file mode 100644 index 00000000000..6fb7182035b --- /dev/null +++ b/pkgs/applications/graphics/goxel/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +, glfw3, gtk3, libpng12 }: + +stdenv.mkDerivation rec { + name = "goxel-${version}"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "guillaumechereau"; + repo = "goxel"; + rev = "v${version}"; + sha256 = "1d6waj8zz9iq3ddbi9wbpcnh200ajjy9x53xrj5bij01pb8jwskv"; + }; + + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + buildInputs = [ glfw3 gtk3 libpng12 ]; + + buildPhase = '' + make release + ''; + + installPhase = '' + install -D ./goxel $out/bin/goxel + ''; + + meta = with stdenv.lib; { + description = "Open Source 3D voxel editor"; + homepage = https://guillaumechereau.github.io/goxel/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad77d0f98a..9034dbf145f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15008,6 +15008,8 @@ with pkgs; gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; + goxel = callPackage ../applications/graphics/goxel { }; + gpa = callPackage ../applications/misc/gpa { }; gpicview = callPackage ../applications/graphics/gpicview { From f08394436a4a187ff3aa4837ce88e946438b419a Mon Sep 17 00:00:00 2001 From: Peter Schuller Date: Sat, 20 Jan 2018 22:47:57 -0800 Subject: [PATCH 007/185] flameshot: init at 0.5.0 --- lib/maintainers.nix | 1 + pkgs/tools/misc/flameshot/default.nix | 39 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/flameshot/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f839d025129..b186742fcdf 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -607,6 +607,7 @@ schmitthenner = "Fabian Schmitthenner "; schneefux = "schneefux "; schristo = "Scott Christopher "; + scode = "Peter Schuller "; scolobb = "Sergiu Ivanov "; sdll = "Sasha Illarionov "; SeanZicari = "Sean Zicari "; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix new file mode 100644 index 00000000000..55aa146d301 --- /dev/null +++ b/pkgs/tools/misc/flameshot/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, qtbase, qmake, qttools }: + +stdenv.mkDerivation rec { + name = "flameshot-${version}"; + version = "0.5.0"; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ + # flameshot.pro assumes qmake is being run in a git checkout and uses it + # to determine the version being built. Let's replace that. + "VERSION=${version}" + "PREFIX=/" + ]; + patchPhase = '' + sed -i 's/VERSION =/#VERSION =/g' flameshot.pro + sed -i 's,USRPATH = /usr/local,USRPATH = /,g' flameshot.pro + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + src = fetchFromGitHub { + owner = "lupoDharkael"; + repo = "flameshot"; + rev = "v${version}"; + sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Powerful yet simple to use screenshot software"; + homepage = https://github.com/lupoDharkael/flameshot; + maintainers = [ maintainers.scode ]; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db63bcd3c7..09cd5378bfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15197,6 +15197,8 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { debug = config.flashplayer.debug or false; }; From f9238bf19fd4d6321b4e947837bebb67bd5b6f52 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 24 Jan 2018 10:36:50 -0600 Subject: [PATCH 008/185] ipvsadm: init at 1.29 Fixes #34226. --- pkgs/os-specific/linux/ipvsadm/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/os-specific/linux/ipvsadm/default.nix diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix new file mode 100644 index 00000000000..0e99dd976c7 --- /dev/null +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: + +stdenv.mkDerivation rec { + name = "ipvsadm-${version}"; + version = "1.29"; + + src = fetchurl { + url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; + sha256 = "c3de4a21d90a02c621f0c72ee36a7aa27374b6f29fd4178f33fbf71b4c66c149"; + }; + + postPatch = '' + substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)" + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnl popt ]; + + preBuild = '' + makeFlagsArray+=( + INCLUDE=$(pkg-config --cflags libnl-genl-3.0) + BUILD_ROOT=$out + MANDIR=share/man + ) + ''; + + postInstall = '' + sed -i -e "s|^PATH=.*|PATH=$out/bin:${gnugrep}/bin|" $out/sbin/ipvsadm-{restore,save} + ''; + + meta = with stdenv.lib; { + description = "Linux Virtual Server support programs"; + homepage = http://www.linuxvirtualserver.org/software/ipvs.html; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b24c98499c..3b46a7776ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1225,6 +1225,8 @@ with pkgs; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; + ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; + lynis = callPackage ../tools/security/lynis { }; mathics = pythonPackages.mathics; From 0bbde0f026931a74b6c15487a0e6c24e13336a18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Nov 2017 20:56:10 +0100 Subject: [PATCH 009/185] pythonPackages.syncthing-gtk: move to pkgs/applications/networking --- .../networking/syncthing-gtk/default.nix | 41 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 42 +------------------ 3 files changed, 45 insertions(+), 40 deletions(-) create mode 100644 pkgs/applications/networking/syncthing-gtk/default.nix diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix new file mode 100644 index 00000000000..f47fd2d0fd6 --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, python2Packages }: + +python2Packages.buildPythonApplication rec { + version = "0.9.2.3"; + name = "syncthing-gtk-${version}"; + + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42"; + }; + + propagatedBuildInputs = with python2Packages; [ + syncthing dateutil pyinotify libnotify + (librsvg.override { withGTK = true; }) + psmisc pygobject3 gtk3 + ]; + + preFixup = '' + wrapProgram $out/bin/syncthing-gtk \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; + + patchPhase = '' + substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" + substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" + ''; + + meta = with stdenv.lib; { + description = " GTK3 & python based GUI for Syncthing "; + maintainers = with maintainers; [ ]; + platforms = syncthing.meta.platforms; + homepage = "https://github.com/syncthing/syncthing-gtk"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48f43fc9ff..d86bc398230 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17189,6 +17189,8 @@ with pkgs; syncthing013 = callPackage ../applications/networking/syncthing013 { }; + syncthing-gtk = callPackage ../applications/networking/syncthing-gtk { }; + syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45418fba46..4e55bfceecb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17329,46 +17329,8 @@ in { sybil = callPackage ../development/python-modules/sybil { }; - syncthing-gtk = buildPythonPackage rec { - version = "0.9.2.3"; - name = "syncthing-gtk-${version}"; - src = pkgs.fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-gtk"; - rev = "v${version}"; - sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ pkgs.syncthing dateutil pyinotify - pkgs.libnotify - (pkgs.librsvg.override { withGTK = true; }) - pkgs.psmisc pygobject3 pkgs.gtk3 - ]; - - preFixup = '' - wrapProgram $out/bin/syncthing-gtk \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - - patchPhase = '' - substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" - substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" - ''; - - meta = { - description = " GTK3 & python based GUI for Syncthing "; - maintainers = with maintainers; [ ]; - platforms = pkgs.syncthing.meta.platforms; - homepage = "https://github.com/syncthing/syncthing-gtk"; - license = licenses.gpl2; - }; - }; + # legacy alias + syncthing-gtk = pkgs.syncthing-gtk; systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; From 58e50b8d588ce5330f7927b5ec50fb28b7f349ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Nov 2017 22:52:57 +0100 Subject: [PATCH 010/185] syncthing-gtk: clean-up --- .../networking/syncthing-gtk/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index f47fd2d0fd6..d4e34be36dd 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, python2Packages }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, wrapGAppsHook, gnome3, python2Packages }: python2Packages.buildPythonApplication rec { version = "0.9.2.3"; @@ -11,17 +11,18 @@ python2Packages.buildPythonApplication rec { sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42"; }; - propagatedBuildInputs = with python2Packages; [ - syncthing dateutil pyinotify libnotify - (librsvg.override { withGTK = true; }) - psmisc pygobject3 gtk3 + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ + gtk3 (librsvg.override { enableIntrospection = true; }) + libnotify psmisc + # Schemas with proxy configuration + gnome3.gsettings_desktop_schemas ]; - preFixup = '' - wrapProgram $out/bin/syncthing-gtk \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; + propagatedBuildInputs = with python2Packages; [ + syncthing dateutil pyinotify pygobject3 + ]; patchPhase = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" From 3169cfd7824a81a2b9d593ddffa88c9141af21e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Nov 2017 01:33:24 +0100 Subject: [PATCH 011/185] syncthing-gtk: fix syncthing path --- .../networking/syncthing-gtk/default.nix | 12 ++- ...sable-syncthing-binary-configuration.patch | 77 +++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index d4e34be36dd..ba0666e3618 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -17,17 +17,23 @@ python2Packages.buildPythonApplication rec { gtk3 (librsvg.override { enableIntrospection = true; }) libnotify psmisc # Schemas with proxy configuration - gnome3.gsettings_desktop_schemas + syncthing gnome3.gsettings_desktop_schemas ]; propagatedBuildInputs = with python2Packages; [ - syncthing dateutil pyinotify pygobject3 + dateutil pyinotify pygobject3 ]; - patchPhase = '' + patches = [ + ./disable-syncthing-binary-configuration.patch + ]; + + postPatch = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/configuration.py --replace "/usr/bin/syncthing" "${syncthing}/bin/syncthing" + substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share" substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" ''; diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch new file mode 100644 index 00000000000..12ea6bb4f2e --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -0,0 +1,77 @@ +--- a/find-daemon.glade ++++ b/find-daemon.glade +@@ -112,6 +112,7 @@ + + True + True ++ False + 20 + + +@@ -126,6 +127,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +--- a/syncthing_gtk/configuration.py ++++ b/syncthing_gtk/configuration.py +@@ -166,6 +166,8 @@ + yield k + + def get(self, key): ++ if key == "syncthing_binary": ++ return self.REQUIRED_KEYS[key][1] + return self.values[key] + + def set(self, key, value): +--- a/syncthing_gtk/finddaemondialog.py ++++ b/syncthing_gtk/finddaemondialog.py +@@ -163,7 +163,7 @@ + self["lblDownloadProgress"].set_markup(_("Download failed.")) + self["btDownload"].set_visible(True) + self["pbDownload"].set_visible(False) +- self["vsyncthing_binary"].set_sensitive(True) ++ self["vsyncthing_binary"].set_sensitive(False) + self["btBrowse"].set_sensitive(True) + self["btSave"].set_sensitive(True) + +@@ -179,7 +179,7 @@ + + def cb_extract_finished(self, downloader, *a): + """ Called after extraction is finished """ +- self["vsyncthing_binary"].set_sensitive(True) ++ self["vsyncthing_binary"].set_sensitive(False) + self["btBrowse"].set_sensitive(True) + self["vsyncthing_binary"].set_text(downloader.get_target()) + self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "") +--- a/syncthing_gtk/wizard.py ++++ b/syncthing_gtk/wizard.py +@@ -58,7 +58,6 @@ + self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) + # Pages + self.add_page(IntroPage()) +- self.add_page(FindDaemonPage()) + self.add_page(GenerateKeysPage()) + self.add_page(HttpSettingsPage()) + self.add_page(SaveSettingsPage()) +--- a/ui-settings.glade ++++ b/ui-settings.glade +@@ -943,6 +943,7 @@ + _Browse... + True + True ++ False + True + True + 0.51999998092651367 +@@ -974,6 +975,7 @@ + + True + True ++ False + True + + From a140a0e1dee2f0efacc612e3cfda17e5fa63470e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Nov 2017 01:35:50 +0100 Subject: [PATCH 012/185] =?UTF-8?q?syncthing-gtk:=200.9.2.3=20=E2=86=92=20?= =?UTF-8?q?0.9.2.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/syncthing-gtk/default.nix | 6 +++--- .../disable-syncthing-binary-configuration.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ba0666e3618..89415b02a07 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, wrapGAppsHook, gnome3, python2Packages }: python2Packages.buildPythonApplication rec { - version = "0.9.2.3"; + version = "0.9.2.7"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "0chl0f0kp6z0z00d1f3xjlicjfr9rzabw39wmjr66fwb5w5hcc42"; + sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python2Packages; [ - dateutil pyinotify pygobject3 + dateutil pyinotify pygobject3 bcrypt ]; patches = [ diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch index 12ea6bb4f2e..6c516e98acb 100644 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -18,7 +18,7 @@ 0.51999998092651367 --- a/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py -@@ -166,6 +166,8 @@ +@@ -168,6 +168,8 @@ yield k def get(self, key): @@ -49,10 +49,10 @@ self["lblDownloadProgress"].set_markup("" + _("Download finished.") + "") --- a/syncthing_gtk/wizard.py +++ b/syncthing_gtk/wizard.py -@@ -58,7 +58,6 @@ +@@ -60,7 +60,6 @@ self.quit_button.connect("clicked", lambda *a : self.emit("cancel")) # Pages - self.add_page(IntroPage()) + self.add_page(IntroPage(self)) - self.add_page(FindDaemonPage()) self.add_page(GenerateKeysPage()) self.add_page(HttpSettingsPage()) From 33bfe21e6d5594985b60ac93345e52ba3ba32186 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 26 Jan 2018 06:10:54 +0100 Subject: [PATCH 013/185] syncthing-gtk: another clean-up --- .../networking/syncthing-gtk/default.nix | 16 +++++++++----- .../networking/syncthing-gtk/paths.patch | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/syncthing-gtk/paths.patch diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 89415b02a07..a8fced65209 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, syncthing, wrapGAppsHook, gnome3, python2Packages }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, python2Packages }: python2Packages.buildPythonApplication rec { version = "0.9.2.7"; @@ -15,9 +15,9 @@ python2Packages.buildPythonApplication rec { buildInputs = [ gtk3 (librsvg.override { enableIntrospection = true; }) - libnotify psmisc + libnotify # Schemas with proxy configuration - syncthing gnome3.gsettings_desktop_schemas + gnome3.gsettings_desktop_schemas ]; propagatedBuildInputs = with python2Packages; [ @@ -26,23 +26,27 @@ python2Packages.buildPythonApplication rec { patches = [ ./disable-syncthing-binary-configuration.patch + (substituteAll { + src = ./paths.patch; + killall = "${psmisc}/bin/killall"; + syncthing = "${syncthing}/bin/syncthing"; + }) ]; postPatch = '' substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" - substituteInPlace syncthing_gtk/configuration.py --replace "/usr/bin/syncthing" "${syncthing}/bin/syncthing" substituteInPlace syncthing_gtk/uisettingsdialog.py --replace "/usr/share" "$out/share" substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" ''; meta = with stdenv.lib; { - description = " GTK3 & python based GUI for Syncthing "; + description = "GTK3 & python based GUI for Syncthing"; maintainers = with maintainers; [ ]; platforms = syncthing.meta.platforms; - homepage = "https://github.com/syncthing/syncthing-gtk"; + homepage = https://github.com/syncthing/syncthing-gtk; license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch new file mode 100644 index 00000000000..0ba5a4f2db8 --- /dev/null +++ b/pkgs/applications/networking/syncthing-gtk/paths.patch @@ -0,0 +1,22 @@ +--- a/syncthing_gtk/configuration.py ++++ b/syncthing_gtk/configuration.py +@@ -30,7 +30,7 @@ + "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask + "daemon_priority" : (int, 0), # uses nice values + "max_cpus" : (int, 0), # 0 for all cpus +- "syncthing_binary" : (str, "/usr/bin/syncthing"), ++ "syncthing_binary" : (str, "@syncthing@"), + "syncthing_arguments" : (str, ""), + "minimize_on_start" : (bool, False), + "folder_as_path" : (bool, True), +--- a/syncthing_gtk/tools.py ++++ b/syncthing_gtk/tools.py +@@ -303,7 +303,7 @@ + return False + # signal 0 doesn't kill anything, but killall exits with 1 if + # named process is not found +- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) ++ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) + p.communicate() + return p.returncode == 0 + else: From a1555c022c26eb157133de634dba6a80a1cfef60 Mon Sep 17 00:00:00 2001 From: Benjamin Mellor Date: Fri, 26 Jan 2018 06:21:18 +0100 Subject: [PATCH 014/185] syncthing-gtk: explicitly depend on gobjectIntrospection --- pkgs/applications/networking/syncthing-gtk/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index a8fced65209..9760ed22025 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, python2Packages }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, python2Packages, gobjectIntrospection }: python2Packages.buildPythonApplication rec { version = "0.9.2.7"; @@ -11,7 +11,11 @@ python2Packages.buildPythonApplication rec { sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + wrapGAppsHook + # For setup hook populating GI_TYPELIB_PATH + gobjectIntrospection + ]; buildInputs = [ gtk3 (librsvg.override { enableIntrospection = true; }) From b02bf83a5223a947f8002504fb9db9dd7e76f3ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 26 Jan 2018 06:24:48 +0100 Subject: [PATCH 015/185] syncthing-gtk: clean up --- pkgs/applications/networking/syncthing-gtk/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 9760ed22025..5e4f9738d44 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, python2Packages, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: -python2Packages.buildPythonApplication rec { +buildPythonApplication rec { version = "0.9.2.7"; name = "syncthing-gtk-${version}"; @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { gnome3.gsettings_desktop_schemas ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ dateutil pyinotify pygobject3 bcrypt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d86bc398230..9d1a3691793 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17189,7 +17189,7 @@ with pkgs; syncthing013 = callPackage ../applications/networking/syncthing013 { }; - syncthing-gtk = callPackage ../applications/networking/syncthing-gtk { }; + syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; From 9abc4a550f105db6fdf1ddfc6928eba3f5f2171c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 25 Jan 2018 14:28:56 +0100 Subject: [PATCH 016/185] hplip: Fixes runtime errors The following errors are fixed: - pyqt4 not found - hpasio for sane not found --- pkgs/misc/drivers/hplip/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9897345b88a..f8f8d16d142 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -78,12 +78,12 @@ pythonPackages.buildPythonApplication { prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ - -e s,/etc/hp,$out/etc/hp, \ - -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ - -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ - -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ - -e s,/var/lib/hp,$out/var/lib/hp, \ + -e s,/etc/hp,$out/etc/hp,g \ + -e s,/etc/sane.d,$out/etc/sane.d,g \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ + -e s,/var/lib/hp,$out/var/lib/hp,g \ {} + ''; @@ -96,6 +96,8 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + --disable-qt4 + ${stdenv.lib.optionals withQt5 "--enable-qt5"} " export makeFlags=" @@ -140,9 +142,6 @@ pythonPackages.buildPythonApplication { mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state - mkdir -p $out/etc/sane.d/dll.d - mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf - rm $out/etc/udev/rules.d/56-hpmud.rules ''; From 9d196ef641b9d5c83972021eca90b05d57ef395e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jan 2018 03:33:19 +0100 Subject: [PATCH 017/185] pythonPackages.colorlog: 2.6.1 -> 3.1.2 --- .../python-modules/colorlog/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/colorlog/default.nix diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix new file mode 100644 index 00000000000..e737b884897 --- /dev/null +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "colorlog"; + version = "3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test -p no:logging + ''; + + meta = with stdenv.lib; { + description = "Log formatting with colors"; + homepage = https://github.com/borntyping/python-colorlog; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45418fba46..e6d825030cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1397,24 +1397,7 @@ in { }; }; - colorlog = buildPythonPackage rec { - name = "colorlog-${version}"; - version = "2.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorlog/${name}.tar.gz"; - sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l"; - }; - - # No tests included - doCheck = false; - - meta = { - description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; - license = licenses.free; # BSD-like - }; - }; + colorlog = callPackage ../development/python-modules/colorlog { }; colour = buildPythonPackage rec { name = "${pname}-${version}"; From 93d7267a77f91da4475b39cc2e03044d5006870c Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 26 Jan 2018 15:45:22 +0100 Subject: [PATCH 018/185] bombono: add symphorien as maintainer --- pkgs/applications/video/bombono/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 40d9aa2f228..0d55b35c6eb 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "a DVD authoring program for personal computers"; homepage = "http://www.bombono.org/"; license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ symphorien ]; }; } From cf3d2663419055cbb2935a1848d228a4f5bdc788 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 26 Jan 2018 15:45:54 +0100 Subject: [PATCH 019/185] bombono: enable parallel builds --- pkgs/applications/video/bombono/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 0d55b35c6eb..d135e75f29f 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -20,9 +20,11 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - scons PREFIX=$out + scons PREFIX=$out -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; + enableParallelBuilding = true; + installPhase = '' scons install ''; From f59ea00c802f6fcb2784591c2016892577cd672f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 21 Jan 2018 23:27:45 +0100 Subject: [PATCH 020/185] magnetophonDSP: remove workarounds for: https://bitbucket.org/agraef/faust-lv2/issues/10/tabs-break-lv2s https://bitbucket.org/agraef/faust-lv2/issues/7/scale-log-breaks-plugins --- .../audio/magnetophonDSP/CharacterCompressor/default.nix | 1 - pkgs/applications/audio/magnetophonDSP/CompBus/default.nix | 2 -- .../audio/magnetophonDSP/ConstantDetuneChorus/default.nix | 1 - .../applications/audio/magnetophonDSP/LazyLimiter/default.nix | 1 - .../audio/magnetophonDSP/MBdistortion/default.nix | 1 - .../applications/audio/magnetophonDSP/RhythmDelay/default.nix | 1 - .../audio/magnetophonDSP/faustCompressors/default.nix | 4 +--- .../applications/audio/magnetophonDSP/pluginUtils/default.nix | 1 - .../audio/magnetophonDSP/shelfMultiBand/default.nix | 1 - 9 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 206754a5195..f355c540f30 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 467e11daaf6..90e4eabeef0 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { faust2jaqt -time -vec -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" - for f in *.dsp; do faust2lv2 -time -vec -double -gui -t 99999 $f diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index b452d91426e..73dd7b48e9c 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index d1959ec3ceb..39065db6ede 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 LazyLimiter.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 6216ba55593..362451988d3 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 MBdistortion.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 0bb2034fc46..3f809aa7847 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 RhythmDelay.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index e526e40a1e3..fece392ab1c 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { faust2jaqt -time -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" - for f in *.dsp; do - echo "compiling plugin from" $f + echo "Compiling plugin from" $f faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index daa23baa966..6237628e600 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { do echo "Building jack standalone for $f" faust2jaqt -vec -time -t 99999 "$f" - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" echo "Building lv2 for $f" faust2lv2 -vec -time -gui -t 99999 "$f" done diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 422aabb2829..cb9247fd3d0 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp ''; From 50c23666fcaaba338f0fdb8356952e120540e4e1 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 26 Jan 2018 22:08:28 +0100 Subject: [PATCH 021/185] dmd: 2.078.0 -> 2.078.1 --- pkgs/development/compilers/dmd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index e8e6b5224de..de3544a3a63 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -3,10 +3,10 @@ , curl, tzdata, gdb, darwin , callPackage , bootstrapVersion ? false -, version ? "2.078.0" -, dmdSha256 ? "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr" -, druntimeSha256 ? "0inyvcjc5qn8277d1zlfvgdgiss86rkjg9mhkw5l31hix8yan372" -, phobosSha256 ? "1vb5xnysja9l8hvv9gy4c05vihmblz7ga005761jbazxkmlfirj4" +, version ? "2.078.1" +, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2" +, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr" +, phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8" }: let From 820d78492d15487e197760287dba00e82671372f Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 26 Jan 2018 22:18:48 +0100 Subject: [PATCH 022/185] dtools: 2.078.0 -> 2.078.1 --- pkgs/development/tools/dtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index b6774fe2416..daa25de9508 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.078.0"; + version = "2.078.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr"; + sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"; name = "dmd"; }) (fetchFromGitHub { From 462f34c44ad779be7d142c4ee2287327862de888 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 26 Jan 2018 02:18:23 +0100 Subject: [PATCH 023/185] zncModules: backlog init at 2017-06-13 --- pkgs/applications/networking/znc/modules.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 2923a30b2ef..4b68285c3f1 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -15,6 +15,26 @@ let in rec { + backlog = zncDerivation rec { + name = "znc-backlog-${version}"; + version = "git-2017-06-13"; + module_name = "backlog"; + + src = fetchFromGitHub { + owner = "FruitieX"; + repo = "znc-backlog"; + rev = "42e8f439808882d2dae60f2a161eabead14e4b0d"; + sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6"; + }; + + meta = with stdenv.lib; { + description = "Request backlog for IRC channels."; + homepage = https://github.com/fruitiex/znc-backlog/; + license = licenses.asl20; + maintainers = with maintainers; [ infinisil ]; + }; + }; + clientbuffer = zncDerivation rec { name = "znc-clientbuffer-${version}"; version = "git-2015-08-27"; From 3883d12fdfc90b5572c61d5d48512cb6960accb1 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Sat, 27 Jan 2018 21:30:58 +1100 Subject: [PATCH 024/185] gradio: 7.0-> 7.1 --- pkgs/applications/audio/gradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 4b552301dd3..8c2987352fb 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -17,7 +17,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "7.0"; + version = "7.1"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9"; + sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx"; }; nativeBuildInputs = [ From 2474e6e212accb9901e8d08bd90681a18183eff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2018 09:33:18 +0100 Subject: [PATCH 025/185] pythonPackages.transitions: init at 0.6.4 --- .../python-modules/transitions/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/transitions/default.nix diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix new file mode 100644 index 00000000000..edf13782b07 --- /dev/null +++ b/pkgs/development/python-modules/transitions/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, mock, dill, pycodestyle }: + +buildPythonPackage rec { + pname = "transitions"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "dill<0.2.7" dill + ''; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose mock dill pycodestyle ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pytransitions/transitions; + description = "A lightweight, object-oriented finite state machine implementation in Python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..88ca182e192 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17533,6 +17533,8 @@ in { traitlets = callPackage ../development/python-modules/traitlets { }; + transitions = callPackage ../development/python-modules/transitions { }; + python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; version = "0.1.4"; From f2a5b2fd65ddc75d979522f281889291bc08b45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2018 09:45:34 +0100 Subject: [PATCH 026/185] pythonPackages.hbmqtt: init at 0.9.1 --- .../python-modules/hbmqtt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/hbmqtt/default.nix diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix new file mode 100644 index 00000000000..379aa1c3cf4 --- /dev/null +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, transitions, websockets, passlib, docopt, pyyaml, nose }: + +buildPythonPackage rec { + pname = "hbmqtt"; + version = "0.9.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx"; + }; + + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e test_connect_tcp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/beerfactory/hbmqtt; + description = "MQTT client/broker using Python asynchronous I/O"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88ca182e192..f80d941da91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5090,6 +5090,8 @@ in { then callPackage ../development/python-modules/gurobipy/linux.nix {} else throw "gurobipy not yet supported on ${stdenv.system}"; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + helper = buildPythonPackage rec { pname = "helper"; version = "2.4.1"; From 4b0dc51d1114d32326b65649bf27de3ef1222d4c Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 26 Jan 2018 15:46:15 +0100 Subject: [PATCH 027/185] bombono: import patches from AUR to fix gcc7 build --- pkgs/applications/video/bombono/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index d135e75f29f..e3ba331e437 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,7 +1,12 @@ { stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, -enca, pkgconfig }: +enca, pkgconfig, fetchpatch }: +let fetchPatchFromAur = {name, sha256}: +fetchpatch { + inherit name sha256; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c"; +}; in stdenv.mkDerivation rec { name = "bombono-${version}"; version = "1.2.4"; @@ -12,6 +17,17 @@ stdenv.mkDerivation rec { sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; }; + patches = map fetchPatchFromAur [ + {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} + {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} + {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} + {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} + {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} + {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} + {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} + {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + ]; + nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ From 43b72ba4c5964b6f1e8c40da2e73d5d1a4494eed Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 10 Nov 2017 16:40:19 +0100 Subject: [PATCH 028/185] Add Renato Alves (unode) to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ba5ee757a7c..87799ab1874 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -698,6 +698,7 @@ tvorog = "Marsel Zaripov "; tweber = "Thorsten Weber "; twey = "James ‘Twey’ Kay "; + unode = "Renato Alves "; uralbash = "Svintsov Dmitry "; utdemir = "Utku Demir "; #urkud = "Yury G. Kudryashov "; inactive since 2012 From cd8d6ef9e48642c1dddcc52b01a42beea3e5ff74 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Sat, 27 Jan 2018 19:00:54 +0100 Subject: [PATCH 029/185] =?UTF-8?q?hubstaff:=201.2.15=20=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/hubstaff/default.nix | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 6c3f317707d..bd4a891a329 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext -, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib -, gtk3, libappindicator-gtk3, curl }: +{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE +, libXext , freetype, libXrender, fontconfig, libXft, libXinerama +, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 +, curl }: let - version = "1.2.15-590e8bc"; + version = "1.3.0-9b2ba62"; rpath = stdenv.lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 - curl ]; + curl libXfixes libXScrnSaver ]; in @@ -18,14 +19,14 @@ stdenv.mkDerivation { src = fetchurl { url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; - sha256 = "142q8xvwn5gdmpv5x25py2lindr74jqncf8vvw22yb9nj5aqqsi6"; + sha256 = "1dxzyl3yxbfmbw1pv8k3vhqzbmyyf16zkgrhzsbm866nmbgnqk1s"; }; nativeBuildInputs = [ unzip makeWrapper ]; unpackCmd = '' # MojoSetups have a ZIP file at the end. ZIP’s magic string is - # most often PK\x03\x04. This *should* work for future updates, + # most often PK\x03\x04. This has worked for all past updates, # but feel free to come up with something more reasonable. dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1) dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null @@ -38,17 +39,18 @@ stdenv.mkDerivation { installPhase = '' # TODO: handle 32-bit arch? rm -r x86 + rm -r x86_64/lib64 opt=$out/opt/hubstaff mkdir -p $out/bin $opt cp -r . $opt/ - prog=$opt/x86_64/HubstaffClient.bin.x86_64 + for f in "$opt/x86_64/"*.bin.x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $f + wrapProgram $f --prefix LD_LIBRARY_PATH : ${rpath} + done - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog - wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath} - - ln -s $prog $out/bin/HubstaffClient + ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources From a43f0dd1372b50016b94f63ff1835cf383a1c131 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sat, 27 Jan 2018 15:14:09 -0500 Subject: [PATCH 030/185] gitolite: 3.6.3 -> 3.6.7 --- .../version-management/gitolite/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 5e1feacd83d..78b59f59e94 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, git, nettools, perl }: +{ stdenv, fetchFromGitHub, git, nettools, perl }: stdenv.mkDerivation rec { name = "gitolite-${version}"; - version = "3.6.3"; + version = "3.6.7"; - src = fetchurl { - url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; - sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v"; + src = fetchFromGitHub { + owner = "sitaramc"; + repo = "gitolite"; + rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac"; + sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"; }; buildInputs = [ git nettools perl ]; @@ -26,6 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin perl ./install -to $out/bin + echo ${version} > $out/bin/VERSION ''; meta = with stdenv.lib; { @@ -33,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://gitolite.com/gitolite/index.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.lassulus ]; + maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ]; }; } From 32925f082b1fed774f7b860eb58a12d89a808d10 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Jan 2018 21:58:21 +0100 Subject: [PATCH 031/185] lispPackages: deduplicate dynamical library search path --- pkgs/development/lisp-modules/define-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 0224bf16ab7..b13ddf8357f 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let test -n "$LD_LIBRARY_PATH" && echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' From e23e13102581a7996dbd4a06af491531c30fceff Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 27 Jan 2018 22:10:07 +0100 Subject: [PATCH 032/185] mutt: 1.9.2 -> 1.9.3 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index d28bfb647e5..90fbe18f0bc 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2"; + sha256 = "1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3"; }; patches = optional smimeSupport (fetchpatch { From d71c8da8da526c0d8eea57d54c44cb5965c3eb77 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 27 Jan 2018 22:52:33 +0100 Subject: [PATCH 033/185] mariadb: fix connector-c library install_name on darwin --- pkgs/servers/sql/mariadb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 91d288c6a9e..88d2ae3d68a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -180,6 +180,11 @@ connector-c = stdenv.mkDerivation rec { "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" ]; + # The cmake setup-hook uses $out/lib by default, this is not the case here. + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb") + ''; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ openssl zlib ]; buildInputs = [ libiconv ]; From 366136806b7ca3d3205b5789bea953b9dc3ea1fa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 27 Jan 2018 01:42:18 +0100 Subject: [PATCH 034/185] hyx: init at 0.1.4 --- pkgs/tools/text/hyx/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/hyx/default.nix diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix new file mode 100644 index 00000000000..1ba3534e3f8 --- /dev/null +++ b/pkgs/tools/text/hyx/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "hyx-0.1.4"; + + src = fetchurl { + url = "https://yx7.cc/code/hyx/${name}.tar.xz"; + sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; + }; + + installPhase = '' + install -vD hyx $out/bin/hyx + ''; + + meta = with lib; { + description = "minimalistic but powerful Linux console hex editor"; + homepage = https://yx7.cc/code/; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72b213d1bb7..0b84f7cea22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1205,6 +1205,8 @@ with pkgs; hr = callPackage ../applications/misc/hr { }; + hyx = callPackage ../tools/text/hyx { }; + icdiff = callPackage ../tools/text/icdiff {}; interlock = callPackage ../servers/interlock {}; From 5ba11ca00e0db937ef12c1af146ed41a7a8329c8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 27 Jan 2018 21:33:31 +0000 Subject: [PATCH 035/185] pmidi: init at 1.7.1 --- pkgs/applications/audio/pmidi/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/pmidi/default.nix diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix new file mode 100644 index 00000000000..9f51d300825 --- /dev/null +++ b/pkgs/applications/audio/pmidi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib +, version ? "1.7.1" +, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" +}: +stdenv.mkDerivation { + name = "pmidi-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; + sha256 = sourceSha256; + }; + + buildInputs = [ alsaLib ]; + + meta = with stdenv.lib; { + homepage = http://www.parabola.me.uk/alsa/pmidi.html; + description = "A straightforward command line program to play midi files through the ALSA sequencer"; + maintainers = with maintainers; [ lheckemann ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9302ba1af86..00abdb249bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17070,6 +17070,8 @@ with pkgs; peru = callPackage ../applications/version-management/peru {}; + pmidi = callPackage ../applications/audio/pmidi { }; + printrun = callPackage ../applications/misc/printrun { }; sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; From 74ebb70f89fa8857e05f974016cd76e8a40398fd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:04:05 +0800 Subject: [PATCH 036/185] cryfs: 0.9.7 -> 0.9.8 --- pkgs/tools/filesystems/cryfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0469ad54eb1..7bbfafef819 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w"; + sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k"; }; prePatch = '' From 92d790117d89d8a417e9ce4e1a3414c89f53a259 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:08:15 +0800 Subject: [PATCH 037/185] ccache: 3.3.4 -> 3.3.5 --- .../development/tools/misc/ccache/default.nix | 4 +-- .../misc/ccache/skip-fs-dependent-test.patch | 31 +++++-------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 88556d7395d..ff4ad83b642 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,10 +2,10 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; + sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; url = "mirror://samba/ccache/${name}.tar.xz"; }; diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index ecd3c4c9a74..3bc3a95e420 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,9 +1,9 @@ ---- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 -+++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 -@@ -2631,23 +2631,23 @@ +--- a/test.sh ++++ b/test.sh +@@ -2669,23 +2669,6 @@ SUITE_cleanup() { + $CCACHE -F 0 -M 256K >/dev/null - $CCACHE -c >/dev/null - # floor(0.8 * 4) = 3 + CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null - expect_file_count 3 '*.o' $CCACHE_DIR - expect_file_count 3 '*.d' $CCACHE_DIR - expect_file_count 3 '*.stderr' $CCACHE_DIR @@ -21,23 +21,6 @@ - test_failed "File $file not removed when it should" - fi - done -+ #expect_file_count 3 '*.o' $CCACHE_DIR -+ #expect_file_count 3 '*.d' $CCACHE_DIR -+ #expect_file_count 3 '*.stderr' $CCACHE_DIR -+ #expect_stat 'files in cache' 9 -+ #expect_stat 'cleanups performed' 1 -+ #for i in 3 4 5; do -+ # file=$CCACHE_DIR/a/result$i-4017.o -+ # if [ ! -f $file ]; then -+ # test_failed "File $file removed when it shouldn't" -+ # fi -+ #done -+ #for i in 0 1 2 6 7 8 9; do -+ # file=$CCACHE_DIR/a/result$i-4017.o -+ # if [ -f $file ]; then -+ # test_failed "File $file not removed when it should" -+ # fi -+ #done - + # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup" + TEST "Automatic cache cleanup, limit_multiple 0.9" From 1ca9fb108582a30688df994d5370bd7e356f049e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:10:56 +0800 Subject: [PATCH 038/185] cadvisor: 0.26.1 -> 0.28.3 --- pkgs/servers/monitoring/cadvisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index cb9e43a5c88..695e5aa4558 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.26.1"; + version = "0.28.3"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg"; + sha256 = "1rdw09cbhs4il63lv1f92dw8pav9rjnkbrqx37lqij8x6xmv01gy"; }; - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; buildPhase = '' mkdir -p Godeps/_workspace/src/github.com/google/ From 5056931ff18d364a0c6e01e7f13033fdff897c11 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:13:25 +0800 Subject: [PATCH 039/185] debianutils: 4.8.2 -> 4.8.4 --- pkgs/tools/misc/debianutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 6575c19391c..d93cc479a80 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.2"; + version = "4.8.4"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd"; + sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0"; }; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { longDescription = '' This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. - The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which + The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; downloadPage = https://packages.debian.org/sid/debianutils; license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ]; From 792a3d97b5445f747afc1d5747b7b41a56f094b5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:19:55 +0800 Subject: [PATCH 040/185] electricsheep: 2.7b33-2017-02-04 -> 2.7b33-2017-10-20 --- pkgs/misc/screensavers/electricsheep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 72fb7b41c69..4a51facb4aa 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "electricsheep"; - version = "2.7b33-2017-02-04"; + version = "2.7b33-2017-10-20"; src = fetchFromGitHub { owner = "scottdraves"; repo = pname; - rev = "12420cd40dfad8c32fb70b88f3d680d84f795c63"; - sha256 = "1zqry25h6p0y0rg2h8xxda007hx1xdvsgzmjg13xkc8l4zsp5wah"; + rev = "c02c19b9364733fc73826e105fc983a89a8b4f40"; + sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 64d9a928f4d61bb3bca9e3ba17e36ff32fe9ac72 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:20:51 +0800 Subject: [PATCH 041/185] fail2ban: 0.10.1 -> 0.10.2 --- pkgs/tools/security/fail2ban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index ca9cdcc8d6c..a8de8742dd5 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.10.1"; in +let version = "0.10.2"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "05ngnjxrwvfdd233s5n2wd8w4ndkpgrgymlfzn6i2fjlwf4hdikj"; + sha256 = "1asn9gp0ybz6fak991vki9vln4ijramvr13rbwpxyj5wfmnh05r5"; }; propagatedBuildInputs = [ gamin ] From 70a03faa4895eb0549c07678cd78c8fc4c360950 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 18:27:50 +0800 Subject: [PATCH 042/185] graylog: 2.4.0 -> 2.4.1 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5c868ae5e2f..d4acc063b4d 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "12ipp1bji0ss0d20dpqx8d6x3p3h38qdfdy98qy37mjy0fi22vpq"; + sha256 = "1dps1vvv8b154ayamhjxdgiq101qs4w0nk79j3zb41pdyn2fji4j"; }; dontBuild = true; From 41af33a0399eb8a91249beac6ae7dd89897a1d45 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 19:21:49 +0800 Subject: [PATCH 043/185] mypy: 0.540 -> 0.560 --- pkgs/development/tools/mypy/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 6dc57afb51e..f06f9c6828c 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }: +{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "mypy"; - version = "0.540"; + version = "0.560"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec"; + sha256 = "1jja0xlwqajxzab8sabiycax8060zikg89dnl9a7lkqcrwprl35x"; }; - propagatedBuildInputs = [ lxml typed-ast ]; + propagatedBuildInputs = [ lxml typed-ast psutil ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b84f7cea22..b3aabc5f7e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8038,9 +8038,7 @@ with pkgs; grabserial = callPackage ../development/tools/grabserial { }; - mypy = callPackage ../development/tools/mypy { - inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; - }; + mypy = python3Packages.callPackage ../development/tools/mypy { }; ### DEVELOPMENT / LIBRARIES From 27e4499f6a248bc8c1f3440f659b23d569f774fd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 19:22:47 +0800 Subject: [PATCH 044/185] libdivecomputer: 0.5.0 -> 0.6.0 --- pkgs/development/libraries/libdivecomputer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 23ab36fe09f..a09e48dcc1d 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdivecomputer-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; - sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y"; + sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; enableParallelBuilding = true; From c2dcf10b27bf68185bf14803b4deb42fd4a90f7d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 19:32:55 +0800 Subject: [PATCH 045/185] krita: 3.3.2 -> 3.3.3 --- pkgs/applications/graphics/krita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index a9c238ead3c..791cd7be2d0 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz; - sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"; + url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 740b16eda2c8e860fc218445c2c031390a266c69 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 19:36:16 +0800 Subject: [PATCH 046/185] offlineimap: 7.1.4 -> 7.1.5 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 4295151516d..86a029bcb3d 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.4"; + version = "7.1.5"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "04y2bsgmxykkhcjh3540y2a43xrwfkzd7wks1wvl6av0vjaqa5gm"; + sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; }; postPatch = '' From 1f80e7384ef03f6c9c29080254b9ea6d38f69f1f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 19:40:23 +0800 Subject: [PATCH 047/185] redis: 4.0.6 -> 4.0.7 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 354b4d57960..745376f61e4 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.6"; + version = "4.0.7"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1ypnwmxwm49l0b8i9swcbjdxnc6f0r9zyqm2h423wz13xilmv6vn"; + sha256 = "1lgcc5k6bg7f34lxbfx0xv74nj66khd5x8g1igyy2h7v8inm9fhv"; }; buildInputs = [ lua ]; From 405e53ab711cb7abf96332a458082478f3d03836 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 20:03:09 +0800 Subject: [PATCH 048/185] networkmanager: 1.10.0 -> 1.10.2 --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- pkgs/tools/networking/network-manager/iodine.nix | 3 +++ pkgs/tools/networking/network-manager/strongswan.nix | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 6005314ea97..b6201e308d9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; major = "1.10"; - version = "${major}.0"; + version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "1ph45rqpl8p9k4rirhss0hpf104clm8fp322p6kh6q75y06ddfwa"; + sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix index 154b54952f2..0cfc8bbba7d 100644 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + configureFlags = [ "${if withGnome then "--with-gnome" else "--without-gnome"}" "--disable-static" diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index f2657187464..365aec88a7d 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + preConfigure = '' substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/bin/sysctl" From 8227d87aa6df3d08e535c5da3d0372f4de12e129 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 20:04:15 +0800 Subject: [PATCH 049/185] mkvtoolnix: 19.0.0 -> 20.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 867dacc213e..9324b08efd7 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt +, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true }: @@ -10,20 +10,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "19.0.0"; + version = "20.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9"; + sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac + libvorbis flac cmark ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; From c721cd83cebdb009df1fd0219afa792c8910cce5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 20:38:31 +0800 Subject: [PATCH 050/185] mesos: 1.4.0 -> 1.4.1 --- pkgs/applications/networking/cluster/mesos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6654ee89c80..68c66d78de1 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -23,7 +23,7 @@ let }); in stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys"; + sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; }; patches = [ From 9c33aa8465989bce3725c0130758851a8afbb619 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sat, 27 Jan 2018 15:47:43 -0800 Subject: [PATCH 051/185] vagrant: Make bsdtar available to extract boxes --- pkgs/development/tools/vagrant/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 714935513f7..5d967ba8127 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby }: +{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let version = "2.0.1"; @@ -36,9 +36,12 @@ in buildRubyGem rec { ./unofficial-installation-nowarn.patch ]; + # PATH additions: + # - libarchive: Make `bsdtar` available for extracting downloaded boxes postInstall = '' wrapProgram "$out/bin/vagrant" \ - --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" + --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ + --prefix PATH ':' "${lib.getBin libarchive}/bin" ''; passthru = { From 15aa4fcf753994c8a22f3ff09bb98d0934c5f288 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 Dec 2017 14:07:46 -0600 Subject: [PATCH 052/185] networkmanagerapplet: 1.8.2 -> 1.8.6 https://git.gnome.org/browse/network-manager-applet/tree/NEWS?h=1.8.6 --- pkgs/tools/networking/network-manager-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d0881c5ac5e..f2c0bb13afe 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; major = "1.8"; - minor = "2"; + minor = "6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry"; + sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01"; }; configureFlags = [ From b07f0f9eece7619366fefaecf68421e88f346173 Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 26 Jan 2018 22:14:52 +0100 Subject: [PATCH 053/185] dub: 1.6.0 -> 1.7.1 --- .../tools/build-managers/dub/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 15e801c1dff..8af11f05738 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.6.0"; + version = "1.7.1"; enableParallelBuilding = true; @@ -12,9 +12,17 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk"; + sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv"; }; + patches = [ + # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch"; + sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah"; + }) + ]; + postPatch = '' # Avoid that the version file is overwritten substituteInPlace build.sh \ @@ -59,6 +67,8 @@ let outputHash = builtins.hashString "sha256" inputString; src = dubBuild.src; + + patches = dubBuild.patches; postPatch = dubBuild.postPatch; From 8ed3a90cdfe99722aee1d158a7d9f9bfd63ce275 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 28 Jan 2018 09:38:45 +0100 Subject: [PATCH 054/185] nixos/powerManagement: set `cpuFreqGovernor` with `mkOptionDefault` `nixos-generate-config` detects the `cpuFreqGovernor` suited best for my machine, e.g. `powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";`. However the `powerManagement` module sets a sensitive default for `cpuFreqGovernor` using `mkDefault` to avoid breackage with older setups. Since 140ac2f1 the `hardware-configuration.nix` sets the gorvernor with `mkDefault` as well which causes evaluation errors if the powermanagement module is enabled: ``` error: The unique option `powerManagement.cpuFreqGovernor' is defined multiple times, in `/home/ma27/Projects/nixos-config/hardware-configuration.nix' and `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/config/power-management.nix'. ``` Using `mkOptionDefault` rather than `mkDefault` in the powermanagement module fixes this issue as it decreases the priority of the module and prefers the value set in `hardware-configuration.nix`. I have confirmed the change using the following VM declaration: ``` { cpuFreq = { lib, ... }: { powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.enable = true; }; } ``` --- nixos/modules/config/power-management.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index a4a4d6e1a6a..7a5ce6ee5b9 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -70,7 +70,7 @@ in config = mkIf cfg.enable { # Leftover for old setups, should be set by nixos-generate-config now - powerManagement.cpuFreqGovernor = mkDefault "ondemand"; + powerManagement.cpuFreqGovernor = mkOptionDefault "ondemand"; systemd.targets.post-resume = { description = "Post-Resume Actions"; From 2f39b19535c7da9ccfc0a7dcc5acfbb97e60afb4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 27 Jan 2018 22:22:52 +0200 Subject: [PATCH 055/185] mdadm: Make 4.0 the default 4.0 has been out for a year without another upstream release, so presumably 4.x's quite stable enough (and already in Arch & Debian Buster for instance). --- pkgs/os-specific/linux/mdadm/4.nix | 43 ------------------------ pkgs/os-specific/linux/mdadm/default.nix | 7 ++-- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 pkgs/os-specific/linux/mdadm/4.nix diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix deleted file mode 100644 index f9c2a5e09af..00000000000 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchurl, groff -, buildPlatform, hostPlatform -}: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "mdadm-4.0"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; - }; - - # This is to avoid self-references, which causes the initrd to explode - # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.glibc.out ]; - - patches = [ ./no-self-references.patch ]; - - makeFlags = [ - "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" - "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" - "STRIP=" - ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - nativeBuildInputs = [ groff ]; - - preConfigure = '' - sed -e 's@/lib/udev@''${out}/lib/udev@' \ - -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile - ''; - - meta = { - description = "Programs for managing RAID arrays under Linux"; - homepage = http://neil.brown.name/blog/mdadm; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 31dd0cbf18d..85a65b8f824 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "mdadm-3.3.4"; + name = "mdadm-4.0"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca"; + sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; }; # This is to avoid self-references, which causes the initrd to explode @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; - # Attempt removing if building with gcc5 when updating - NIX_CFLAGS_COMPILE = "-std=gnu89"; - preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3aabc5f7e3..6f4c6cfb105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13200,8 +13200,8 @@ with pkgs; mbpfan = callPackage ../os-specific/linux/mbpfan { }; - mdadm = callPackage ../os-specific/linux/mdadm { }; - mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { }; + mdadm = mdadm4; + mdadm4 = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; From b22e4976cbd64f868fc1e2fbd93de309b6d224e6 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sat, 27 Jan 2018 17:14:39 +0100 Subject: [PATCH 056/185] muscle: init at 3.8.31 --- .../science/biology/muscle/default.nix | 35 +++++++++++++++++++ .../muscle/muscle-3.8.31-no-static.patch | 21 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/biology/muscle/default.nix create mode 100644 pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix new file mode 100644 index 00000000000..9cbabc7ab37 --- /dev/null +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + _name = "muscle"; + name = "${_name}-${version}"; + version = "3.8.31"; + + src = fetchurl { + url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; + sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; + }; + + patches = [ + ./muscle-3.8.31-no-static.patch + ]; + + preBuild = '' + cd ./src/ + patchShebangs mk + ''; + + installPhase = '' + install -vD muscle $out/bin/muscle + ''; + + meta = with stdenv.lib; { + description = "A multiple sequence alignment method with reduced time and space complexity"; + license = licenses.publicDomain; + homepage = https://www.drive5.com/muscle/; + maintainers = [ maintainers.unode ]; + # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. + # Anyone with access to these platforms is welcome to give it a try + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch new file mode 100644 index 00000000000..7f4b2129518 --- /dev/null +++ b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch @@ -0,0 +1,21 @@ +--- a/src/mk 2010-05-02 01:15:42.000000000 +0200 ++++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 +@@ -5,14 +5,14 @@ + rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt + for CPPName in $CPPNames + do +- echo $CPPName >> /dev/tty ++ echo $CPPName + g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + done + + LINK_OPTS= +-if [ `uname -s` == Linux ] ; then +- LINK_OPTS=-static +-fi ++#if [ `uname -s` == Linux ] ; then ++# LINK_OPTS=-static ++#fi + g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + tail muscle.make.stderr.txt + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0db748b4d2..31d2f02be7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18962,6 +18962,8 @@ with pkgs; kallisto = callPackage ../applications/science/biology/kallisto { }; + muscle = callPackage ../applications/science/biology/muscle/default.nix { }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; From 9d8d6df50cedf30c2014d122e346d4083e8c5031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Jan 2018 14:08:30 +0100 Subject: [PATCH 057/185] python3Packages.multidict: 4.0.0 -> 4.1.0 --- .../python-modules/multidict/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 5ce6969da75..7eaa0962b44 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -6,15 +6,13 @@ , isPy3k }: -let - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "multidict"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0y0pg3r9hlknny0zwg906wz81h8in6lgvnpbmzvl911bmnrqc95p"; + sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v"; }; buildInputs = [ cython ]; @@ -22,9 +20,10 @@ in buildPythonPackage rec { disabled = !isPy3k; - meta = { + meta = with lib; { description = "Multidict implementation"; homepage = https://github.com/aio-libs/multidict/; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } From bef69925e3cddc4ac350ffc5167ec732e70d133e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 30 Dec 2017 07:18:14 +0900 Subject: [PATCH 058/185] fcitx-libpinyin: 0.3.93 -> 0.5.3 Previously optional dependencies are now made mandatory like qtwebbrowser.dev . In order to find these libraries, I used libsForQt5.callPackage. --- .../development/libraries/libpinyin/default.nix | 8 ++++---- .../fcitx-engines/fcitx-libpinyin/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 15d14199041..7bb2fbc81c8 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -2,14 +2,14 @@ let modelData = fetchurl { - url = "mirror://sourceforge/libpinyin/models/model12.text.tar.gz"; - sha256 = "1fijhhnjgj8bj1xr5pp7c4qxf11cqybgfqg7v36l3x780d84hfnd"; + url = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz"; + sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq"; }; in stdenv.mkDerivation rec { name = "libpinyin-${version}"; - version = "1.6.0"; + version = "2.1.91"; nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "libpinyin"; repo = "libpinyin"; rev = version; - sha256 = "0k40a7wfp8zj9d426afv0am5sr3m2i2p309fq0vf8qrb050hj17f"; + sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 6022bcebc3b..f2610efd2eb 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }: stdenv.mkDerivation rec { name = "fcitx-libpinyin-${version}"; - version = "0.3.91"; + version = "0.5.3"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz"; - sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn"; + sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake fcitx gettext libpinyin glib pcre dbus qt4 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ]; preInstall = '' substituteInPlace src/cmake_install.cmake \ @@ -24,13 +24,14 @@ stdenv.mkDerivation rec { ''; preBuild = let + ZHUYIN_DATA_FILE_NAME = "model.text.20161206.tar.gz"; store_path = fetchurl { - url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz; - sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5"; + url = "https://download.fcitx-im.org/data/${ZHUYIN_DATA_FILE_NAME}"; + sha256 = "017p11si1b7bkwx36xaybq5a9icq1pd7x1jbymqw92akfgjj8w2w"; }; in '' - cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz + cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME} ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9302ba1af86..82f817d8dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2105,7 +2105,7 @@ with pkgs; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; - libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; + libpinyin = libsForQt5.callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; skk = callPackage ../tools/inputmethods/fcitx-engines/fcitx-skk { }; }; From be7c4c1d7e7f0010de38a47892b07598f0f5d0b4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 30 Dec 2017 07:18:42 +0900 Subject: [PATCH 059/185] libpinyin: 1.6.0 -> 2.1.91 --- pkgs/development/libraries/libpinyin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 7bb2fbc81c8..26694eb3777 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -6,7 +6,6 @@ let sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq"; }; in - stdenv.mkDerivation rec { name = "libpinyin-${version}"; version = "2.1.91"; From d14d82389c59caf4a754f8c67a9dfe70da8368b5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 30 Dec 2017 07:19:13 +0900 Subject: [PATCH 060/185] fcitx-qt5: 1.1.0 -> 1.2.1 --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index b0da0034ef9..7617d544d29 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "0r8c5k0qin3mz2p1mdciip6my0x58662sx5z50zs4c5pkdg21qwv"; + sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; }; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace platforminputcontext/cmake_install.cmake \ --replace ${qtbase.out} $out + substituteInPlace quickphrase-editor/cmake_install.cmake \ + --replace ${fcitx} $out ''; meta = with stdenv.lib; { - homepage = "https://github.com/fcitx/fcitx-qt5"; + homepage = http://github.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; From bee66be64a5c7d2af09ecf62919d849e52a510f6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 30 Dec 2017 07:21:07 +0900 Subject: [PATCH 061/185] fcitx: 4.2.9.1 -> 4.2.9.5 fcitx now relies on xkeyboard_config. --- pkgs/tools/inputmethods/fcitx/unwrapped.nix | 71 ++++++++++++++++++--- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index c489b3e4ed7..27eb35ce6ae 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,27 +2,75 @@ , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules +, xkeyboard_config, pcre, libuuid, curl, cacert +, withPinyin ? true +, fetchFromGitHub }: +let + # releases at http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz + # contains all data but if we want to compile from source, we need to + # fetch them ourselves + # to update the urls and where to unpack these, look into the + # src/module/*/data/CMakeLists.txt files + # fcitx_download tgt_name url output) + dicts = let SPELL_EN_DICT_VER="20121020"; in fetchurl { + url = "http://download.fcitx-im.org/data/en_dict-${SPELL_EN_DICT_VER}.tar.gz"; + sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; + }; + table = fetchurl { + url = http://download.fcitx-im.org/data/table.tar.gz; + sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; + }; + pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl { + url = "http://download.fcitx-im.org/data/py_stroke-${PY_STROKE_VER}.tar.gz"; + sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf"; + }; + pytable-data = let PY_TABLE_VER="20121124"; in fetchurl { + url = "http://download.fcitx-im.org/data/py_table-${PY_TABLE_VER}.tar.gz"; + sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; + }; + pinyin-data = fetchurl { + url = http://download.fcitx-im.org/data/pinyin.tar.gz; + sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q"; + }; +in stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.9.1"; + version = "4.2.9.5"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; - sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk"; + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx"; + rev = version; + sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r"; }; + # put data at the correct locations else cmake tries to fetch them, + # which fails in sandboxed mode + prePatch = '' + cp ${dicts} src/module/spell/dict/$(stripHash ${dicts}) + cp ${table} src/im/table/data/$(stripHash ${table}) + '' + + stdenv.lib.optionalString withPinyin '' + cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data}) + cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data}) + cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data}) + '' + ; + postPatch = '' substituteInPlace src/frontend/qt/CMakeLists.txt \ --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins + + patchShebangs cmake/ ''; - nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ]; + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; buildInputs = [ - enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile - libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 + xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile + libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid ]; cmakeFlags = '' @@ -33,10 +81,15 @@ stdenv.mkDerivation rec { -DENABLE_OPENCC=OFF -DENABLE_PRESAGE=OFF -DENABLE_XDGAUTOSTART=OFF - ''; + -DENABLE_PINYIN=${if withPinyin then "ON" else "OFF"} + -DENABLE_TABLE=ON + -DENABLE_SPELL=ON + -DENABLE_QT_GUI=ON + -DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml' + ''; meta = with stdenv.lib; { - homepage = "https://github.com/fcitx/fcitx"; + homepage = http://github.com/fcitx/fcitx; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; From 5de50ec00219382d1864271829e42a11ccd6a341 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 29 Jan 2018 02:05:20 +0900 Subject: [PATCH 062/185] ibus-libpinyin: 1.8.0 -> 1.9.2 --- .../inputmethods/ibus-engines/ibus-libpinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 6293fa30d7a..85399bffd3f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz"; + sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb"; }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; From 2b270c1596f48ffb7ddb5ef88a4374bf1d8331ac Mon Sep 17 00:00:00 2001 From: Jesper Date: Sun, 28 Jan 2018 15:42:15 +0100 Subject: [PATCH 063/185] nixos/containers: Enable use of the network.useHostResolvConf option (#34354) --- nixos/modules/virtualisation/container-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index b4f9d8b6fc1..5e368acd6d8 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -11,7 +11,7 @@ with lib; services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; - networking.useHostResolvConf = true; + networking.useHostResolvConf = mkDefault true; # Containers should be light-weight, so start sshd on demand. services.openssh.startWhenNeeded = mkDefault true; From bba83033cc52037a91a0edd06dec1d5396951738 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 28 Jan 2018 16:54:37 +0200 Subject: [PATCH 064/185] gpxsee: 4.14 -> 4.19 --- pkgs/applications/misc/gpxsee/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 00735624ad9..d87ac459d02 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "4.14"; + version = "4.19"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb"; + sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l"; }; nativeBuildInputs = [ qmake qttools ]; @@ -26,11 +26,14 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://tumic.wz.cz/gpxsee; + homepage = http://www.gpxsee.org/; description = "GPX viewer and analyzer"; + longDescription = '' + GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, + TCX, KML, FIT, IGC and NMEA files. + ''; license = licenses.gpl3; maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; }; - } From 3979a20d7489efb7f12b2f477e92d4596b9bab31 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 26 Jan 2018 23:17:38 +0100 Subject: [PATCH 065/185] monero: build libmonero-wallet --- .../altcoins/monero/build-wallet-rpc.patch | 78 +++++++++++++++++++ pkgs/applications/altcoins/monero/default.nix | 46 +++++++++++ pkgs/applications/misc/monero/default.nix | 44 ----------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 125 insertions(+), 45 deletions(-) create mode 100644 pkgs/applications/altcoins/monero/build-wallet-rpc.patch create mode 100644 pkgs/applications/altcoins/monero/default.nix delete mode 100644 pkgs/applications/misc/monero/default.nix diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch new file mode 100644 index 00000000000..5436332db80 --- /dev/null +++ b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch @@ -0,0 +1,78 @@ +diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt +index 63908005..f6656d5c 100644 +--- a/src/wallet/CMakeLists.txt ++++ b/src/wallet/CMakeLists.txt +@@ -86,43 +86,40 @@ target_link_libraries(wallet + ${EXTRA_LIBRARIES}) + add_dependencies(wallet version) + +-if (NOT BUILD_GUI_DEPS) +- set(wallet_rpc_sources +- wallet_rpc_server.cpp) ++set(wallet_rpc_sources ++ wallet_rpc_server.cpp) + +- set(wallet_rpc_headers) ++set(wallet_rpc_headers) + +- set(wallet_rpc_private_headers +- wallet_rpc_server.h) ++set(wallet_rpc_private_headers ++ wallet_rpc_server.h) + +- monero_private_headers(wallet_rpc_server +- ${wallet_rpc_private_headers}) +- monero_add_executable(wallet_rpc_server +- ${wallet_rpc_sources} +- ${wallet_rpc_headers} +- ${wallet_rpc_private_headers}) +- +- target_link_libraries(wallet_rpc_server +- PRIVATE +- wallet +- epee +- rpc +- cryptonote_core +- cncrypto +- common +- ${Boost_CHRONO_LIBRARY} +- ${Boost_PROGRAM_OPTIONS_LIBRARY} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_THREAD_LIBRARY} +- ${CMAKE_THREAD_LIBS_INIT} +- ${EXTRA_LIBRARIES}) +- add_dependencies(wallet_rpc_server version) +- set_property(TARGET wallet_rpc_server +- PROPERTY +- OUTPUT_NAME "monero-wallet-rpc") +- install(TARGETS wallet_rpc_server DESTINATION bin) +-endif() ++monero_private_headers(wallet_rpc_server ++ ${wallet_rpc_private_headers}) ++monero_add_executable(wallet_rpc_server ++ ${wallet_rpc_sources} ++ ${wallet_rpc_headers} ++ ${wallet_rpc_private_headers}) + ++target_link_libraries(wallet_rpc_server ++ PRIVATE ++ wallet ++ epee ++ rpc ++ cryptonote_core ++ cncrypto ++ common ++ ${Boost_CHRONO_LIBRARY} ++ ${Boost_PROGRAM_OPTIONS_LIBRARY} ++ ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_THREAD_LIBRARY} ++ ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LIBRARIES}) ++add_dependencies(wallet_rpc_server version) ++set_property(TARGET wallet_rpc_server ++ PROPERTY ++ OUTPUT_NAME "monero-wallet-rpc") ++install(TARGETS wallet_rpc_server DESTINATION bin) + + # build and install libwallet_merged only if we building for GUI + if (BUILD_GUI_DEPS) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix new file mode 100644 index 00000000000..4b1e9cd4ea3 --- /dev/null +++ b/pkgs/applications/altcoins/monero/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchpatch, fetchFromGitHub, cmake +, boost, miniupnpc, openssl, pkgconfig, unbound +}: + +stdenv.mkDerivation rec { + name = "monero-${version}"; + version = "0.11.1.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero"; + rev = "v${version}"; + sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ boost miniupnpc openssl unbound ]; + + patches = [ + ./build-wallet-rpc.patch # fixed in next release + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_GUI_DEPS=ON" + ]; + + doCheck = false; + + installPhase = '' + make install + install -Dt "$out/bin/" \ + bin/monero-blockchain-export \ + bin/monero-blockchain-import \ + bin/monero-wallet-rpc + ''; + + meta = with stdenv.lib; { + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix deleted file mode 100644 index ed2049ee5ab..00000000000 --- a/pkgs/applications/misc/monero/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }: - -let - version = "0.11.1.0"; -in -stdenv.mkDerivation { - name = "monero-${version}"; - - src = fetchFromGitHub { - owner = "monero-project"; - repo = "monero"; - rev = "v${version}"; - sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ boost miniupnpc openssl unbound ]; - - # these tests take a long time and don't - # always complete in the build environment - postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - doCheck = false; - - installPhase = '' - install -Dt "$out/bin/" \ - bin/monerod \ - bin/monero-blockchain-export \ - bin/monero-blockchain-import \ - bin/monero-wallet-cli \ - bin/monero-wallet-rpc - ''; - - meta = with stdenv.lib; { - description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; - license = licenses.bsd3; - maintainers = [ maintainers.ehmry ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7775e511361..ecd3f937c07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16118,7 +16118,7 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/misc/monero { }; + monero = callPackage ../applications/altcoins/monero { }; xmr-stak = callPackage ../applications/misc/xmr-stak { hwloc = hwloc-nox; From 05cb4dca11cd3971c0a2a33ac90fd0f871a24a39 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Jan 2018 00:07:07 +0100 Subject: [PATCH 066/185] monero-gui: init at 0.11.1.0 --- .../altcoins/monero-gui/default.nix | 89 +++++++++++++++++++ .../altcoins/monero-gui/move-log-file.patch | 42 +++++++++ .../monero-gui/move-translations-dir.patch | 14 +++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 147 insertions(+) create mode 100644 pkgs/applications/altcoins/monero-gui/default.nix create mode 100644 pkgs/applications/altcoins/monero-gui/move-log-file.patch create mode 100644 pkgs/applications/altcoins/monero-gui/move-translations-dir.patch diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix new file mode 100644 index 00000000000..0d2899b2e64 --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchFromGitHub +, makeWrapper, makeDesktopItem +, qtbase, qmake, qtmultimedia, qttools +, qtgraphicaleffects, qtdeclarative +, qtlocation, qtquickcontrols, qtwebchannel +, qtwebengine, qtx11extras, qtxmlpatterns +, monero, unbound, readline, boost, libunwind +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "monero-gui-${version}"; + version = "0.11.1.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero-gui"; + rev = "v${version}"; + sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq"; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ + qtbase qtmultimedia qtgraphicaleffects + qtdeclarative qtlocation qtquickcontrols + qtwebchannel qtwebengine qtx11extras + qtxmlpatterns monero unbound readline + boost libunwind makeWrapper + ]; + + patches = [ + ./move-log-file.patch + ./move-translations-dir.patch + ]; + + postPatch = '' + echo ' + var GUI_VERSION = "${version}"; + var GUI_MONERO_VERSION = "${getVersion monero}"; + ' > version.js + substituteInPlace monero-wallet-gui.pro \ + --replace '$$[QT_INSTALL_BINS]/lrelease' '${getDev qttools}/bin/lrelease' + substituteInPlace src/daemon/DaemonManager.cpp \ + --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' + ''; + + makeFlags = [ "INSTALL_ROOT=$(out)" ]; + + preBuild = '' + sed -i s#/opt/monero-wallet-gui##g Makefile + make -C src/zxcvbn-c + ''; + + desktopItem = makeDesktopItem { + name = "monero-wallet-gui"; + exec = "monero-wallet-gui"; + icon = "monero"; + desktopName = "Monero Wallet"; + genericName = "Wallet"; + categories = "Application;Network;Utility;"; + }; + + postInstall = '' + # install desktop entry + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + # install translations + cp -r release/bin/translations $out/share/ + + # install icons + for n in 16 24 32 48 64 96 128 256; do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + cp $src/images/appicons/$size.png \ + $out/share/icons/hicolor/$size/apps/monero.png + done; + ''; + + meta = { + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch new file mode 100644 index 00000000000..928fb32911f --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -0,0 +1,42 @@ +diff --git a/main.cpp b/main.cpp +index 1a9a979..2316929 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -74,10 +74,6 @@ int main(int argc, char *argv[]) + // qDebug() << "High DPI auto scaling - enabled"; + //#endif + +- // Log settings +- Monero::Wallet::init(argv[0], "monero-wallet-gui"); +-// qInstallMessageHandler(messageHandler); +- + MainApp app(argc, argv); + + qDebug() << "app startd"; +@@ -86,6 +82,13 @@ int main(int argc, char *argv[]) + app.setOrganizationDomain("getmonero.org"); + app.setOrganizationName("monero-project"); + ++ // Log settings ++ QString logfile = ++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) ++ + "/monero-wallet-gui.log"; ++ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); ++ ++ + filter *eventFilter = new filter; + app.installEventFilter(eventFilter); + +diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp +index 8525bf3..6967b24 100644 +--- a/src/libwalletqt/Wallet.cpp ++++ b/src/libwalletqt/Wallet.cpp +@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const + + QString Wallet::getWalletLogPath() const + { +- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log"; ++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log"; + } + + Wallet::Wallet(Monero::Wallet *w, QObject *parent) diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch new file mode 100644 index 00000000000..29bb5630154 --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch @@ -0,0 +1,14 @@ +diff --git a/TranslationManager.cpp b/TranslationManager.cpp +index fa39d35..5a410f7 100644 +--- a/TranslationManager.cpp ++++ b/TranslationManager.cpp +@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language) + #ifdef Q_OS_MACX + QString dir = qApp->applicationDirPath() + "/../Resources/translations"; + #else +- QString dir = qApp->applicationDirPath() + "/translations"; ++ QString dir = qApp->applicationDirPath() + "/../share/translations"; + #endif + + QString filename = "monero-core_" + language; + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecd3f937c07..bffcba0951e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16120,6 +16120,8 @@ with pkgs; monero = callPackage ../applications/altcoins/monero { }; + monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { }; + xmr-stak = callPackage ../applications/misc/xmr-stak { hwloc = hwloc-nox; }; From bce1355a5f6d434031966bbc4743f15c53244470 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 28 Jan 2018 16:56:30 +0000 Subject: [PATCH 067/185] pythonPackages.supervise_api: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/supervise_api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 99c6dfaf939..f1631013152 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.2.0"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b"; + sha256 = "13gy2m14zh6lbdm45b40ffjnw8y3dapz9hvzpwk8vyvbxj4f1vaf"; }; propagatedBuildInputs = [ From 9c6a17c5243d785c345a681ada4f0a4e9227953d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:10:07 +0100 Subject: [PATCH 068/185] uhd: fix build due to boost upgrade --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffcba0951e..e089f199854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7961,7 +7961,9 @@ with pkgs; tweak = callPackage ../applications/editors/tweak { }; - uhd = callPackage ../development/tools/misc/uhd { }; + uhd = callPackage ../development/tools/misc/uhd { + boost = boost165; + }; uisp = callPackage ../development/tools/misc/uisp { }; From b5737de99097c01b04d4787d6ef07736db485288 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:15:59 +0100 Subject: [PATCH 069/185] lldpd: 0.9.8 -> 0.9.9 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 1ce9f7cb323..20e65c5ea3c 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y"; + sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy"; }; configureFlags = [ From ae939c29ccc7ed63248f54cf220cd7b5fa567aaa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:19:26 +0100 Subject: [PATCH 070/185] sslh: 1.18 -> 1.19 --- pkgs/servers/sslh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 7b98ded5dc1..c8ac6ed9db0 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers }: +{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }: stdenv.mkDerivation rec { name = "sslh-${version}"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n"; + sha256 = "17362d3srrr49c3vvyg69maynpxac92wvi5j0nvlnh6sjs1v377g"; }; postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libconfig perl tcp_wrappers ]; + buildInputs = [ libcap libconfig perl tcp_wrappers pcre ]; makeFlags = "USELIBCAP=1 USELIBWRAP=1"; From b2cfca7e980cc31ecdfc35da803e5ee9e707fe5d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:23:37 +0100 Subject: [PATCH 071/185] ncmpc: 0.28 -> 0.29 --- pkgs/applications/audio/ncmpc/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ca147ffc735..1b865642178 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,20 +3,18 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; + sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; }; buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; From 25ddd39725fa16c07f320d4b78644ee366d0d195 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:44:52 +0100 Subject: [PATCH 072/185] openttd: 1.7.1 -> 1.7.2 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2ecff1c835e..d0a8469dd1d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1"; + sha256 = "1m29s6shnp7c9qh7pzdbvhy7i5awyzn1hr39xkinrpwgvsxa0lgy"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From c13ff49c4ceae772b15d6013b3cb971b19a56ee0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 01:45:16 +0100 Subject: [PATCH 073/185] kea: 1.2.0 -> 1.3.0 --- pkgs/tools/networking/kea/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index f33fe7a7105..67428664556 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92"; + sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e089f199854..6531c4542c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3208,7 +3208,9 @@ with pkgs; npm2nix = nodePackages.npm2nix; - kea = callPackage ../tools/networking/kea { }; + kea = callPackage ../tools/networking/kea { + boost = boost165; + }; kindlegen = callPackage ../tools/typesetting/kindlegen { }; From b1a4e239db258e306e68a226e5f03fb5e716f6da Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:03:32 +0100 Subject: [PATCH 074/185] mpd: 0.20.10 -> 0.20.15 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index a323cd4802c..da192f70bfe 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "10"; + minor = "15"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0i170kfn68x683fsm5rba0zbpjfr1r7s6a8nvdbva2yl0aizfzhs"; + sha256 = "0idlz9y7gn1yqk5x4igp060wvspzsf446b6ybhbb0swi035qpd2x"; }; patches = [ ./x86.patch ]; From 61b9ecc51df39bb9d90691edcdd185e4f24c24a9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:10:04 +0100 Subject: [PATCH 075/185] mbedtls: 2.6.0 -> 2.6.1 --- pkgs/development/libraries/mbedtls/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 8195ba2d4d6..82d867fedf0 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.6.0"; + name = "mbedtls-2.6.1"; - src = fetchurl { - url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9"; + src = fetchFromGitHub { + owner = "ARMmbed"; + repo = "mbedtls"; + rev = name; + sha256 = "0d421w9bz4p1nw6kza3licv2w97y1364mcpb4fxvpgdqz48rc1vg"; }; nativeBuildInputs = [ perl ]; From 5319630e57dbd31512aee9a8c3ef97fc6478a0f4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:12:19 +0100 Subject: [PATCH 076/185] libite: 1.9.2 -> 2.0.1 --- pkgs/development/libraries/libite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 479deb7593d..51a7ab4851c 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libite-${version}"; - version = "1.9.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr"; + sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 2defac9295617f9cc1a9fc992c18e44cd8a3a744 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:13:12 +0100 Subject: [PATCH 077/185] inadyn: 2.2.1 -> 2.3 --- pkgs/tools/networking/inadyn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 219a993b8a2..99997eb927f 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "troglobit"; From cc98976b472f1892586fbf07957689c17507117f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:15:03 +0100 Subject: [PATCH 078/185] wireless-regdb: 2017.03.07 -> 2017.12.23 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index c714dc6cf1b..70f217f1b7e 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2017.03.07"; + version = "2017.12.23"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip"; + sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf"; }; dontBuild = true; From e3fbefd6788c7375d7c44007b105858769b547b2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:25:38 +0100 Subject: [PATCH 079/185] jenkins: 2.101 -> 2.103 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 399fc62bd17..642a6a97bc0 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.101"; + version = "2.103"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0ragl8hhdlx2zpjzrx3xsvr5i0fvgshgbkqx0h48hgm73pf99227"; + sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; }; buildCommand = '' From 708f2ca55f70c52c6d71788bbc623b5d3081ef06 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:31:06 +0100 Subject: [PATCH 080/185] gqrx: 2.8 -> 2.10 --- pkgs/applications/misc/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 27bda1e2092..f6d9f4edb62 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.8"; + version = "2.10"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c"; + sha256 = "1qc944sn1kjdnhdhcsdc39764vqcryk86808xxl49vy8sznqr0mf"; }; nativeBuildInputs = [ cmake ]; From 943e32abb7999e50d0cb6f2548965ea1bd7368b3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:35:19 +0100 Subject: [PATCH 081/185] conky: 1.10.6 -> 1.10.7 --- pkgs/os-specific/linux/conky/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index b7a8dc23a78..93681b2e18c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -64,25 +64,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; + sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7"; }; - patches = [ - # Patch to fix compilation on gcc-7 from conky PR - # https://github.com/brndnmtthws/conky/pull/402 - (fetchpatch { - name = "gcc7.patch"; - url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch"; - sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7"; - }) - ]; - postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake @@ -95,8 +85,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib cmake libXinerama ] + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper From 8d856121ca02700d3218c4312bd51d26084511ce Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:37:10 +0100 Subject: [PATCH 082/185] darktable: 2.4.0 -> 2.4.1 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 5fd636ff7c5..787ddc72ec9 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx"; + sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; buildInputs = From 0d915183244e7132c0c539f2441df46cb397d9b1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 02:37:31 +0100 Subject: [PATCH 083/185] graphicsmagick: 1.3.27 -> 1.3.28 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 11a2b3a8c8b..f086a8f5ba6 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.27"; in +let version = "1.3.28"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh"; + sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; }; patches = [ From dfdb17d10d440e5ae704fcca7093d223730ec527 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 03:14:32 +0100 Subject: [PATCH 084/185] geoip: 1.6.2 -> 1.6.12 --- pkgs/development/libraries/geoip/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 60d40b10aa4..d93430ac1f5 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,17 +1,22 @@ # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP # e.g. geolite-legacy -{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: +{ stdenv, fetchFromGitHub, autoreconfHook +, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: -let version = "1.6.2"; +let version = "1.6.12"; dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in stdenv.mkDerivation { name = "${drvName}-${version}"; - src = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; - sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; + src = fetchFromGitHub { + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; + sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; From 052234ff9140c918dee23b7e63392c0f475bc5af Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 03:20:44 +0100 Subject: [PATCH 085/185] iperf2: 2.0.9 -> 2.0.10 --- pkgs/tools/networking/iperf/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6f2ca96d120..94be3c25d1f 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.9"; + name = "iperf-2.0.10"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv"; + sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z"; }; hardeningDisable = [ "format" ]; From dee9914ee095f00638bc6a6796f5d1fb927d3eb3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 03:58:29 +0100 Subject: [PATCH 086/185] mediainfo: 17.10 -> 17.12 --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index e6175356348..7b4b8f0d780 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 = "17.10"; + version = "17.12"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From cf41d8784db4ba434f8ff00f93882350f126c596 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 03:58:46 +0100 Subject: [PATCH 087/185] libsodium: 1.0.15 -> 1.0.16 --- pkgs/development/libraries/libsodium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 5d4535676e7..0b341b38917 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.15"; + name = "libsodium-1.0.16"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv"; + sha256 = "0cq5pn7qcib7q70mm1lgjwj75xdxix27v0xl1xl0kvxww7hwgbgf"; }; outputs = [ "out" "dev" ]; From 565ba97fae3582392ec398170060181adca79402 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:00:57 +0100 Subject: [PATCH 088/185] irssi: 1.0.6 -> 1.1.0 --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 0e8c4849f3c..c543825c9f2 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.1.0"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0iiz0x698bdlpssbj357ln5f7ccjwc1m1550xzy1g7kwcvdpp4mb"; + sha256 = "0y362v6ncgs77q5axv7vgjm6vcxiaj5chsxj1ha07jaxsr1z7285"; }; nativeBuildInputs = [ pkgconfig ]; From ba7be3488f6f3e6a66bbf9e6039efd0e066fe4de Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:01:28 +0100 Subject: [PATCH 089/185] freeciv: 2.5.9 -> 2.5.10 --- pkgs/games/freeciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index d60c4c7d0de..82d573e47a2 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,7 +12,7 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.9"; + version = "2.5.10"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "0a2rjw6065psh14bkk6ar4i19dcicn9lz63rffr9h278b9c76g5q"; + sha256 = "00mkzhfcbc27d8m7hj644h8lyc9mb8nhqfcngc52zkidarb438f8"; }; nativeBuildInputs = [ pkgconfig ]; From 80a9c4c8e680a201dc66088eaacb3aa864769b3a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:04:14 +0100 Subject: [PATCH 090/185] flashrom: 0.9.9 -> 1.0 --- pkgs/tools/misc/flashrom/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 2047b77144a..b1e09312658 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }: +{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: -let version = "0.9.9"; in +let version = "1.0"; in stdenv.mkDerivation rec { name = "flashrom-${version}"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { preConfigure = "export PREFIX=$out"; - meta = { + meta = with lib; { homepage = http://www.flashrom.org; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.funfunctor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ funfunctor fpletz ]; + platforms = with platforms; linux; }; } From a122bf8e9b79159ea073e86306feefd3abb23091 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:07:28 +0100 Subject: [PATCH 091/185] minetest: 0.4.15 -> 0.4.16 --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index b40083bedba..49750997a90 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -4,19 +4,19 @@ }: let - version = "0.4.15"; + version = "0.4.16"; sources = { src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; rev = "${version}"; - sha256 = "0bn4102d0hq774bn6hqhrs6qzl4sancrs4j15w4318bqdndk4676"; + sha256 = "048m8as01bw4pnwfxx04wfnyljxq7ivk88l214zi18prrrkfamj3"; }; data = fetchFromGitHub { owner = "minetest"; repo = "minetest_game"; rev = "${version}"; - sha256 = "1mjj40slfiw0khg9nrq8yfmnay237z5jm1cg9hrsiq2fkjrr8w2m"; + sha256 = "0alikzyjvj9hd8s3dd6ghpz0y982w2j0yd2zgd7a047mxw21hrcn"; }; }; in stdenv.mkDerivation { From f8968a2a7943d5e923d3b577579f808511c31a9b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:35:14 +0100 Subject: [PATCH 092/185] libstemmer: init at 2017-03-02 --- .../libraries/libstemmer/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libstemmer/default.nix diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix new file mode 100644 index 00000000000..67d6d8d42ea --- /dev/null +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "libstemmer-2017-03-02"; + + src = fetchFromGitHub { + owner = "zvelo"; + repo = "libstemmer"; + rev = "78c149a3a6f262a35c7f7351d3f77b725fc646cf"; + sha256 = "06md6n6h1f2zvnjrpfrq7ng46l1x12c14cacbrzmh5n0j98crpq7"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Snowball Stemming Algorithms"; + homepage = "http://snowball.tartarus.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6531c4542c6..1a4eb7584a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9901,6 +9901,8 @@ with pkgs; libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libstemmer = callPackage ../development/libraries/libstemmer { }; + libstroke = callPackage ../development/libraries/libstroke { }; libstrophe = callPackage ../development/libraries/libstrophe { }; From 646a2e9a6f91c038b9cdb8ed93e5fd99f1edd381 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:37:29 +0100 Subject: [PATCH 093/185] dovecot: 2.2.33.2 -> 2.3.0 --- pkgs/servers/mail/dovecot/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e2d1f448b32..e995763a4a2 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl -, bzip2, zlib, inotify-tools, pam, libcap -, clucene_core_2, icu, openldap +, bzip2, zlib, lz4, inotify-tools, pam, libcap +, clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules , withMySQL ? false, mysql , withPgSQL ? false, postgresql @@ -8,18 +8,19 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.33.2"; + name = "dovecot-2.3.0"; nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] + buildInputs = + [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py"; + url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; + sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; }; preConfigure = '' @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { "--with-ssl=openssl" "--with-zlib" "--with-bzlib" + "--with-lz4" "--with-ldap" "--with-lucene" "--with-icu" @@ -68,9 +70,9 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite "--with-sqlite"; meta = { - homepage = http://dovecot.org/; + homepage = https://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; + maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ]; platforms = stdenv.lib.platforms.unix; }; } From 1c8075321d4f85194589d6bf4defea30465b0086 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:45:30 +0100 Subject: [PATCH 094/185] libargon2: 20161029 -> 20171227 --- pkgs/development/libraries/libargon2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 79cbf09317c..94e8ea05e66 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libargon2-${version}"; - version = "20161029"; + version = "20171227"; src = fetchFromGitHub { owner = "P-H-C"; repo = "phc-winner-argon2"; rev = "${version}"; - sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5"; + sha256 = "0sc9zca1anqk41017vjpas4kxi4cbn0zvicv8vj8p2sb2gy94bh8"; }; installPhase = '' From 10dd50d46bb04bc92aac2e6ab87d5012280331af Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 04:51:50 +0100 Subject: [PATCH 095/185] augeas: 1.8.1 -> 1.10.0 --- pkgs/tools/system/augeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index fb1806b850e..dca6d37d9af 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5"; + sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; From 0cecf0b54876a5ca02d2eb32724b3df5fe0a5e9a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 05:01:05 +0100 Subject: [PATCH 096/185] virt-viewer: 5.0 -> 6.0 --- pkgs/applications/virtualization/virt-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 68ee06953a3..2f5a6192c86 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "5.0"; + version = "6.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"; + sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 74f33cb263bf89acafd64c04007c4d2afcf026da Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:12:07 +0100 Subject: [PATCH 097/185] xcalib: 0.8 -> 0.10 --- pkgs/tools/X11/xcalib/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 65868a3b6b0..2f925b11ba5 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, libX11, libXxf86vm, libXext }: +{ stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }: stdenv.mkDerivation rec { - name = "xcalib-0.8"; + name = "xcalib-0.10"; - src = fetchurl { - url = "mirror://sourceforge/xcalib/xcalib-source-0.8.tar.gz"; - sha256 = "8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6"; + src = fetchFromGitHub { + owner = "OpenICC"; + repo = "xcalib"; + rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d"; + sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr"; }; - buildInputs = [ libX11 libXxf86vm libXext ]; + buildInputs = [ libX11 libXxf86vm libXext libXrandr ]; installPhase = '' mkdir -p $out/bin @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xcalib.sourceforge.net/; + inherit (src.meta) homepage; description = "A tiny monitor calibration loader for X and MS-Windows"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; From 1e4ebccde49544c1dfece6a5b6e157fce341c456 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:19:03 +0100 Subject: [PATCH 098/185] xcbutilxrm: 1.0 -> 1.2 --- pkgs/servers/x11/xorg/xcb-util-xrm.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index dfc90feeb33..c38d4e80143 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.2"; name = "xcb-util-xrm-${version}"; src = fetchurl { url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; + sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ m4 libxcb xcbutil ] + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ libxcb xcbutil ] ++ stdenv.lib.optional doCheck libX11; doCheck = true; From 60fa8e9d10b329a7583baf33254276f6a5c5a2d3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:21:34 +0100 Subject: [PATCH 099/185] libxmp: 4.3.12 -> 4.4.1 --- pkgs/development/libraries/libxmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 28584d14a87..ca4d7edbf32 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.3.12"; + name = "libxmp-4.4.1"; meta = with stdenv.lib; { description = "Extended module player library"; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; - sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm"; + sha256 = "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m"; }; } From 56b199fc63527a2b38343f42cc97cca5f52710c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:21:53 +0100 Subject: [PATCH 100/185] xmp: 4.0.10 -> 4.1.0 --- pkgs/applications/audio/xmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 9aa24738c37..d234f6b6b8c 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.0.10"; + name = "xmp-4.1.0"; meta = with stdenv.lib; { description = "Extended module player"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; - sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; + sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; nativeBuildInputs = [ pkgconfig ]; From ef7db09435abc5fdfbee01b69c2903535eb07958 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:25:35 +0100 Subject: [PATCH 101/185] yara: 3.7.0 -> 3.7.1 --- pkgs/tools/security/yara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index ee1b9d84470..166f20dd7d6 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.7.1"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1giq5677j0vh5vw0nsv5qcqddcif6jckqaxyqg13j0j54n1p6xyj"; + sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz"; }; # FIXME: this is probably not the right way to make it work From cd10be1e241604db025f3e75a897b857cb230ead Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:27:36 +0100 Subject: [PATCH 102/185] youtubeDL: 2018.01.21 -> 2017.01.27 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0080c073fd1..c4595a1a94e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2018.01.21"; + version = "2018.01.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "14ggjxnhc2sxc93h7d5k3z4n35n5q3ffsif97np0ar93x5z3zgn5"; + sha256 = "14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9"; }; nativeBuildInputs = [ makeWrapper ]; From 6c4d92b7f700dd35cc06a9052498c370bfe64294 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:29:42 +0100 Subject: [PATCH 103/185] xvidcore: 1.3.4 -> 1.3.5 --- pkgs/development/libraries/xvidcore/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 057be97ce96..17d7320cb64 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "xvidcore-${version}"; - version = "1.3.4"; - + version = "1.3.5"; + src = fetchurl { url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; - sha256 = "1xwbmp9wqshc0ckm970zdpi0yvgqxlqg0s8bkz98mnr8p2067bsz"; + sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w"; }; preConfigure = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (!stdenv.isDarwin) '' rm $out/lib/*.a ''; - + meta = { description = "MPEG-4 video codec for PC"; homepage = https://www.xvid.com/; From 687415a579da61723f60f95b42da1d4df7a44d9e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:32:34 +0100 Subject: [PATCH 104/185] openscad: 2015.03-1 -> 2015.03-3 --- pkgs/applications/graphics/openscad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e7a05c522ca..06a1a946cdf 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2015.03-1"; + version = "2015.03-3"; name = "openscad-${version}"; src = fetchurl { url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279"; + sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://openscad.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin the-kenny ]; }; } From aba04db6833130de6bc6478eb5653a71805b6293 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:36:58 +0100 Subject: [PATCH 105/185] gnupg1orig: 1.4.21 -> 1.4.22 --- pkgs/tools/security/gnupg/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 6acaacd1467..fa4555dcafb 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.21"; + name = "gnupg-1.4.22"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0xi2mshq8f6zbarb5f61c9w2qzwrdbjm4q8fqsrwlzc51h8a6ivb"; + sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m"; }; buildInputs = [ readline bzip2 ]; From 23b4baac4d9782d7d80c410cd2e12cde76698734 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 15:54:22 +0100 Subject: [PATCH 106/185] libass: 0.13.7 -> 0.14.0 --- pkgs/development/libraries/libass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 058839f70f8..d7ebf781a04 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -19,11 +19,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.13.7"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh"; + sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; }; configureFlags = [ From 05cc916ad326041a27535050130195f3a8d1edcc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:00:48 +0100 Subject: [PATCH 107/185] libbluray: 1.0.0 -> 1.0.2 --- pkgs/development/libraries/libbluray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8b67d52b875..fea4744a075 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp"; + sha256 = "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; configureFlags = with stdenv.lib; - optional (! withJava) "--disable-bdjava" + optional (! withJava) "--disable-bdjava-jar" ++ optional (! withMetadata) "--without-libxml2" ++ optional (! withFonts) "--without-freetype" ; From c587a817c02eba557b9e65a321db75125b2811b1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:05:03 +0100 Subject: [PATCH 108/185] libmikmod: 3.3.11 -> 3.3.11.1 --- pkgs/development/libraries/libmikmod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 8071d386db0..c509fcd2b4f 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -4,10 +4,10 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { - name = "libmikmod-3.3.11"; + name = "libmikmod-3.3.11.1"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni"; + sha256 = "06bdnhb0l81srdzg6gn2v2ydhhaazza7rshrcj3q8dpqr3gn97dd"; }; buildInputs = [ texinfo ] From cbd7b6cf9cc5cb4781eaa31912abb4c0b3621b34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:07:41 +0100 Subject: [PATCH 109/185] libowfat: 0.29 -> 0.31 --- pkgs/development/libraries/libowfat/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index aaa1abacab8..1304aff9e3b 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.29"; + name = "libowfat-0.31"; src = fetchurl { - url = "http://dl.fefe.de/${name}.tar.bz2"; - sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab"; + url = "https://www.fefe.de/libowfat/${name}.tar.xz"; + sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i"; }; makeFlags = "prefix=$(out)"; - + meta = with stdenv.lib; { homepage = http://www.fefe.de/libowfat/; license = licenses.gpl2; platforms = platforms.linux; }; -} \ No newline at end of file +} From 3fc95ac6f3ae746cb4a9391a880fd4b4ed09a821 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:09:15 +0100 Subject: [PATCH 110/185] libraw: 0.18.5 -> 0.18.7 --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 0b88cd02df7..c1df11aa544 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.5"; + version = "0.18.7"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps"; + sha256 = "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 662e6c519309d429a59f6238257df8f14e1c1707 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:11:19 +0100 Subject: [PATCH 111/185] librsync: 2.0.0 -> 2.0.1 --- pkgs/development/libraries/librsync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 3409948f59e..0f2ca371297 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librsync-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6"; + sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x"; }; nativeBuildInputs = [ cmake ]; From 5e58708cdb07580d4f8ad920d742ef0d4c14f289 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:12:35 +0100 Subject: [PATCH 112/185] libsass: 3.4.5 -> 3.4.8 --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 75bc9668fca..0ad02c190c1 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.4.5"; + version = "3.4.8"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"; + sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13"; }; patchPhase = '' From c92c2fe7c0778b6295a3784d5104a00a98be39d0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:19:52 +0100 Subject: [PATCH 113/185] lxc: 2.1.0 -> 2.1.1 --- pkgs/os-specific/linux/lxc/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 2660f299262..2e2ef610de6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r"; + sha256 = "1xpghrinxhm2072fwmn42pxhjwh7qx6cbsipw4s6g38a8mkklrk8"; }; nativeBuildInputs = [ @@ -29,12 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - # Fix build error against glibc 2.26 - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/" - + "180c477a326ce85632249ff16990e8c29db1b6fa.patch"; - sha256 = "05jkiiixxk9ibj1fwzmy56rkkign28bd9mrmgiz12g92r2qahm2z"; - }) ]; postPatch = '' From 0db64ad70991f390e956c580f6b5ab7aaf34bcb9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:23:59 +0100 Subject: [PATCH 114/185] man-pages: 4.12 -> 4.14 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f292ef4d52d..0e6a0450bb4 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.12"; + version = "4.14"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; + sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; From 49f2f5fa2b537fca5ab30e83850bd61d23c4af09 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:34:24 +0100 Subject: [PATCH 115/185] i3lock: 2.9.1 -> 2.10 --- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 20df6566b23..4d572e8c040 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "i3lock-${version}"; - version = "2.9.1"; + version = "2.10"; src = fetchurl { url = "https://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh"; + sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9"; }; nativeBuildInputs = [ pkgconfig ]; From 139c0f160ece244ac25d3c7fcf693ffc54d4dcd7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:34:44 +0100 Subject: [PATCH 116/185] libast: 0.7 -> 0.7.1 --- pkgs/development/libraries/libast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 900bcac4156..bcfee044475 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "libast-${version}"; - version = "0.7"; - + version = "0.7.1"; + src = fetchurl { url = "http://www.eterm.org/download/${name}.tar.gz"; sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; From 6fa9d1d8a1203c9fb32ddf818be80d170cd84996 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:38:58 +0100 Subject: [PATCH 117/185] mpg123: 1.25.7 -> 1.25.8 --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 1e0b46826cf..1b30399ae0a 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.7"; + name = "mpg123-1.25.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i"; + sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; From f43ca1cc21fd20ae4725607ac60fd0ab59cf2d41 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:40:25 +0100 Subject: [PATCH 118/185] cgal: 4.9 -> 4.11 --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e4eb8d3ab2e..46cdf3a47c6 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.9"; + version = "4.11"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5"; + sha256 = "126r06aba5h8l73xmm5mwmxkir7sy122jn2j18cd4gz3z9p23npr"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 0deb24d8d98db0de54370b620fb8e1b2901f9674 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:16:56 +0100 Subject: [PATCH 119/185] ngrep: 1.45 -> 1.47 --- pkgs/tools/networking/ngrep/default.nix | 44 +++++++++++-------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index dcc0e8596e9..ca5e0b7c4f5 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,39 +1,35 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, gnumake3, pcre }: stdenv.mkDerivation rec { - name = "ngrep-1.45"; + name = "ngrep-${version}"; + version = "1.47"; - src = fetchurl { - url = "mirror://sourceforge/ngrep/${name}.tar.bz2"; - sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; + src = fetchFromGitHub { + owner = "jpr5"; + repo = "ngrep"; + rev = "V${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1x2fyd7wdqlj1r76ilal06cl2wmbz0ws6i3ys204sbjh1cj6dcl7"; }; patches = [ (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14"; - sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14"; - sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14"; - sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14"; - sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76"; + url = "https://patch-diff.githubusercontent.com/raw/jpr5/ngrep/pull/11.patch"; + sha256 = "0k5qzvj8j3r1409qwwvzp7m3clgs2g7hs4q68bhrqbrsvvb2h5dh"; }) ]; - buildInputs = [ gnumake3 libpcap pcre ]; + nativeBuildInputs = [ autoreconfHook gnumake3 ]; + buildInputs = [ libpcap pcre ]; + + configureFlags = [ + "--enable-ipv6" + "--enable-pcre" + "--disable-pcap-restart" + "--with-pcap-includes=${libpcap}/include" + ]; preConfigure = '' - # Fix broken test for BPF header file sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure - - configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include" ''; meta = with stdenv.lib; { @@ -47,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = http://ngrep.sourceforge.net/; + homepage = https://github.com/jpr5/ngrep/; # /doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. From b36a9d405dd64a702104d25c8afb8036ece7f8c0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:27:57 +0100 Subject: [PATCH 120/185] libcdr: 0.1.1 -> 0.1.4 --- pkgs/development/libraries/libcdr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 670484f0ae6..6d8cafcfaa6 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { - name = "libcdr-0.1.1"; + name = "libcdr-0.1.4"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; - sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj"; + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; }; - buildInputs = [ libwpg libwpd lcms librevenge icu boost ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; nativeBuildInputs = [ pkgconfig ]; From c9f94405ed5cd4381cee34de1a43ccbe1711c958 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:48:45 +0100 Subject: [PATCH 121/185] imagemagick7: 7.0.7-21 -> 7.0.7-22 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 6aa2ba118d6..0cb95d75fcf 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-21"; - sha256 = "0680dbg77gcyb3g4n22z5mp7c8mg0jpkqb0g4nj7d7r78nl869rv"; + version = "7.0.7-22"; + sha256 = "12c48cfhc2a3zvhgxdywrfy8b4m2vx85vn2qj69iyni5x849xpj9"; patches = []; }; in From d18299edcb8536b7cf5be9c8caed12d25e7badcc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:49:33 +0100 Subject: [PATCH 122/185] imagemagick: 6.9.9-33 -> 6.9.9-34 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index bb6b8c89a2f..be3a369c28b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-33"; - sha256 = "05931wfhllrb1c2g2nwnwaf1wazn60y5f70gd11qcqp46rif7z21"; + version = "6.9.9-34"; + sha256 = "0sqrgyfi7i7x1akna95c1qhk9sxxswzm3pkssfi4w6v7bn24g25g"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From 024fb7e9b33c179740d2e9d7ef42aa910d20a2ec Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:51:45 +0100 Subject: [PATCH 123/185] netcdfcxx4: 4.2.1 -> 4.3.0 --- pkgs/development/libraries/netcdf-cxx4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index d67fdc110f0..a57884912ba 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl }: stdenv.mkDerivation rec { name = "netcdf-cxx4-${version}"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz"; - sha256 = "1g0fsmz59dnjib4a7r899lm99j3z6yxsw10c0wlihclzr6znmmds"; + sha256 = "13zi8cbk18gggx1c12a580wdsbl714lw68a1wg7c86x0sybirni5"; }; buildInputs = [ netcdf hdf5 curl ]; From ef8f08dd4c7dad0a5e1359e8f32d46928e63414f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 17:52:39 +0100 Subject: [PATCH 124/185] netcdf: 4.4.1.1 -> 4.6.0 --- pkgs/development/libraries/netcdf/default.nix | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index e7c64b9a76d..696df48bfbc 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -9,27 +9,30 @@ let mpiSupport = hdf5.mpiSupport; mpi = hdf5.mpi; in stdenv.mkDerivation rec { - name = "netcdf-4.4.1.1"; - src = fetchurl { - url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d"; - }; + name = "netcdf-4.6.0"; - buildInputs = [ hdf5 m4 curl mpi]; + src = fetchurl { + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; + sha256 = "099qmdjj059wkj5za13zqnz0lcziqkcvyfdf894j4n6qq4c5iw2b"; + }; - passthru = { - mpiSupport = mpiSupport; - inherit mpi; - }; + nativeBuildInputs = [ m4 ]; + buildInputs = [ hdf5 curl mpi ]; - configureFlags = [ - "--enable-netcdf-4" - "--enable-dap" - "--enable-shared" - ] - ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + passthru = { + mpiSupport = mpiSupport; + inherit mpi; + }; - meta = { - platforms = stdenv.lib.platforms.unix; - }; + configureFlags = [ + "--enable-netcdf-4" + "--enable-dap" + "--enable-shared" + ] + ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + + meta = { + platforms = stdenv.lib.platforms.unix; + homepage = https://www.unidata.ucar.edu/software/netcdf/; + }; } From 29be965b788d0067389ff376976ee97703f46621 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 18:34:05 +0100 Subject: [PATCH 125/185] npth: 1.3 -> 1.5 --- pkgs/development/libraries/npth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 8ebf62cfdf0..dc4f4926e9d 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.3"; + name = "npth-1.5"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2"; - sha256 = "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w"; + sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9"; }; meta = with stdenv.lib; { From b77b0d1b046edbcba3d2e36eb7f8287830333718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= Date: Sat, 27 Jan 2018 12:02:17 +0100 Subject: [PATCH 126/185] tmuxinator: 0.10.0 -> 0.10.1 --- pkgs/tools/misc/tmuxinator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 35bdcf1b823..938092c2387 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.10.0"; - source.sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; + version = "0.10.1"; + source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi"; erubis = buildRubyGem rec { inherit ruby; @@ -23,8 +23,8 @@ buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; - version = "0.19.1"; - source.sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + version = "0.20.0"; + source.sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; }; xdg = buildRubyGem rec { From 5031b5e0c8731f9e94b4d709290895e524aeee05 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:12:08 +0100 Subject: [PATCH 127/185] optipng: 0.7.6 -> 0.7.7 --- pkgs/tools/graphics/optipng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index f9b82a38344..fd0b0caea4c 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.6"; + name = "optipng-0.7.7"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28"; + sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; }; buildInputs = [ libpng ]; From 4db7cac9e3dfb1941e3cf6804378de9f549130ae Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:14:09 +0100 Subject: [PATCH 128/185] pngcrush: 1.8.1 -> 1.8.13 --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 3bcbc5d5ead..fce1f3f913c 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.8.1"; + name = "pngcrush-1.8.13"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1h3sibmmiq4ynvf8hrpksfrbcmszxh4bqpkqy5c0m8828c7drpr9"; + sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat From 332f701568d399f9b407a889a3c721245e207b5e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:24:25 +0100 Subject: [PATCH 129/185] testdisk: 7.0 -> 7.1 --- pkgs/tools/misc/testdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index b428205fcd0..80cbf3661da 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }: stdenv.mkDerivation { - name = "testdisk-7.0"; + name = "testdisk-7.1"; src = fetchurl { url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2; - sha256 = "00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d"; + sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; }; buildInputs = [ ncurses libjpeg zlib openssl libuuid ] From f7f11b81a130d53bbdb36b561034a749bb6cb2ea Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:25:00 +0100 Subject: [PATCH 130/185] sudo: 1.8.21p2 -> 1.8.22 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 1238a920760..5192f57582c 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.21p2"; + name = "sudo-1.8.22"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0s33szq6q59v5s377l4v6ybsdy7pfq6sz7y364j4x09ssdn79ibl"; + sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"; }; prePatch = '' From 36d6df8d60352bbe8a4e8c7cce80e1b4b60d65d4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:25:26 +0100 Subject: [PATCH 131/185] talloc: 2.1.8 -> 2.1.11 --- pkgs/development/libraries/talloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 1e7448b6605..8b06e3f2e09 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.8"; + name = "talloc-2.1.11"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; + sha256 = "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3"; }; nativeBuildInputs = [ pkgconfig ]; From bf9c40dc617f83fc92b2b9d8717e0a42dbed642a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:28:04 +0100 Subject: [PATCH 132/185] units: 2.14 -> 2.16 --- pkgs/tools/misc/units/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 90758e909e5..f66f6c3642e 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.14"; + version = "2.16"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8"; + sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw"; }; buildInputs = [ readline ]; From f38136760383e74f2197824c2c09a7070b28c02b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:59:03 +0100 Subject: [PATCH 133/185] opusfile: 0.8 -> 0.10 --- pkgs/applications/audio/opusfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 8a7ab8889a6..d864d5972bc 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.8"; + name = "opusfile-0.10"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc"; + sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28"; }; nativeBuildInputs = [ pkgconfig ]; From 69b5ff8b6e66348109e46b96fbc0c98a61bd6484 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 28 Jan 2018 21:32:24 +0100 Subject: [PATCH 134/185] racket: 6.11 -> 6.12 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f949e16321d..2397cce97ea 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.11"; + version = "6.12"; src = fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; + sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; }; FONTCONFIG_FILE = fontsConf; From 84176497e87a2fd2722f26468dc4e6d2f23abafa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 21:42:11 +0100 Subject: [PATCH 135/185] hwloc: 1.11.8 -> 1.11.9 --- pkgs/development/libraries/hwloc/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 4d6af866990..c0745cb9e68 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -6,15 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.8"; + name = "hwloc-1.11.9"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc"; + sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr"; }; - hardeningDisable = [ "format" ]; - configureFlags = [ "--localstatedir=/var" ]; @@ -75,8 +73,8 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; + homepage = https://www.open-mpi.org/projects/hwloc/; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; }; } From 36103e9863cfabf660c07f7230fc5d2162f85b92 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 21:50:45 +0100 Subject: [PATCH 136/185] nixos/powerManagement: remove duplicate definition When not set just use the kernel default. `nixos-generate-config` will pick a reasonable default. cc #34350 --- nixos/modules/config/power-management.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index 7a5ce6ee5b9..4c37e8a6208 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -69,9 +69,6 @@ in config = mkIf cfg.enable { - # Leftover for old setups, should be set by nixos-generate-config now - powerManagement.cpuFreqGovernor = mkOptionDefault "ondemand"; - systemd.targets.post-resume = { description = "Post-Resume Actions"; requires = [ "post-resume.service" ]; From 103cf020376d63e7b4aad3035dc1b196de1c7fc0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 22:19:23 +0100 Subject: [PATCH 137/185] libewf: 20140608 -> 20171104 --- .../libraries/libewf/04-fix-FTBFS-GCC5.patch | 20 ------------------- pkgs/development/libraries/libewf/default.nix | 10 +++++----- .../libraries/libewf/default.upstream | 7 ------- 3 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch delete mode 100644 pkgs/development/libraries/libewf/default.upstream diff --git a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch b/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch deleted file mode 100644 index 54878303589..00000000000 --- a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch from Debian: -https://sources.debian.net/data/main/libe/libewf/20140608-6/debian/patches/04-fix-FTBFS-GCC5.patch - -Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto for - the first fix (see #777938). This patch closes #777945. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-07-02 -Index: libewf-20140608/libuna/Makefile.am -=================================================================== ---- libewf-20140608.orig/libuna/Makefile.am -+++ libewf-20140608/libuna/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ - @LIBCSTRING_CPPFLAGS@ \ -- @LIBCERROR_CPPFLAGS@ -+ @LIBCERROR_CPPFLAGS@ -std=gnu89 - - noinst_LTLIBRARIES = libuna.la - diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index ec53b50b5af..b1a6238a378 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "20140608"; + version = "20171104"; name = "libewf-${version}"; + src = fetchurl { - url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz"; - sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i"; + url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; + sha256 = "0h7036gpj5cryvh17aq6i2cpnbpwg5yswmfydxbbwvd9yfxd6dng"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libuuid ]; - patches = [ ./04-fix-FTBFS-GCC5.patch ]; meta = { description = "Library for support of the Expert Witness Compression Format"; diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream deleted file mode 100644 index a071132463f..00000000000 --- a/pkgs/development/libraries/libewf/default.upstream +++ /dev/null @@ -1,7 +0,0 @@ -url https://code.google.com/p/libewf/ -version_link 'googledrive[.]com' -version_link '[.]tar[.]' -do_overwrite () { - do_overwrite_just_version - set_var_value url "$CURRENT_URL" -} From 5f57b61f275a04539a19847f1c3d0b875deb29cc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 22:19:54 +0100 Subject: [PATCH 138/185] sleuthkit: 4.2.0 -> 4.5.0 --- pkgs/tools/system/sleuthkit/default.nix | 18 +++++++++++++----- pkgs/tools/system/sleuthkit/default.upstream | 5 ----- 2 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 pkgs/tools/system/sleuthkit/default.upstream diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index b63d60633c3..c4347da4460 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, libewf, afflib, openssl, zlib }: +{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.5.0"; name = "sleuthkit-${version}"; - src = fetchurl { - url = "mirror://sourceforge/sleuthkit/${name}.tar.gz"; - sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli"; + src = fetchFromGitHub { + owner = "sleuthkit"; + repo = "sleuthkit"; + rev = name; + sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9"; }; + postPatch = '' + substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset + ''; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libewf afflib openssl zlib ]; # Hack to fix the RPATH. @@ -18,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; + homepage = https://www.sleuthkit.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.ipl10; diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream deleted file mode 100644 index f8ffe9352ed..00000000000 --- a/pkgs/tools/system/sleuthkit/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/ -SF_version_dir -SF_version_tarball -SF_redirect -minimize_overwrite From 0cc73f2524738613422b28e0b322180e445b090b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 28 Jan 2018 20:18:53 +0100 Subject: [PATCH 139/185] ranger: 1.8.1 -> 1.9.0 --- pkgs/applications/misc/ranger/default.nix | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index f3198085b9a..ce1c790614e 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, file, less +{ stdenv, fetchFromGitHub, pythonPackages, file, less , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; @@ -6,18 +6,14 @@ with stdenv.lib; assert imagePreviewSupport -> w3m != null; pythonPackages.buildPythonApplication rec { - name = "ranger-1.8.1"; + name = "ranger-v${version}"; + version = "1.9.0"; - meta = { - description = "File manager with minimalistic curses interface"; - homepage = http://ranger.nongnu.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - }; - - src = fetchurl { - url = "http://ranger.nongnu.org/${name}.tar.gz"; - sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql"; + src = fetchFromGitHub { + owner = "ranger"; + repo = "ranger"; + rev = "v${version}"; + sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6"; }; checkInputs = with pythonPackages; [ pytest ]; @@ -50,4 +46,11 @@ pythonPackages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" \ ''; + meta = with stdenv.lib; { + description = "File manager with minimalistic curses interface"; + homepage = http://ranger.github.io/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.magnetophon ]; + }; } From a232dd66ee0b390dc4d82858af7e15713bd60327 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Mon, 25 Dec 2017 14:51:40 -0800 Subject: [PATCH 140/185] openssh: Build with Kerberos by default This can be disabled with the `withKerberos` flag if desired. Make the relevant assertions lazy, so that if an overlay is used to set kerberos to null, a later override can explicitly set `withKerberos` to false. Don't build with GSSAPI by default; the patchset is large and a bit hairy, and it is reasonable to follow upstream who has not merged it in not enabling it by default. --- nixos/modules/misc/nixpkgs.nix | 1 - pkgs/tools/networking/openssh/default.nix | 14 +++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..6eb42494124 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,7 +69,6 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; - withKerberos = true; kerberos = self.libkrb5; }; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 663e7be7e5f..1c135cd36f4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? false +, withKerberos ? true , withGssapiPatches ? false , kerberos , linkOpenssl? true }: -assert withKerberos -> kerberos != null; -assert withGssapiPatches -> withKerberos; - let # **please** update this patch when you update to a new openssh release. @@ -23,8 +20,6 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - # Please ensure that openssh_with_kerberos still builds when - # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiPatch; + ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = # On Hydra this makes installation fail (sometimes?), @@ -59,7 +54,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook; + ++ optional hpnSupport autoreconfHook + ; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -78,7 +74,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos "--with-kerberos5=${kerberos}" + ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef49fceab72..7d371881f94 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,6 +142,7 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 + openssh_with_kerberos = openssh; # added 2018-01-28 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a4eb7584a5..aae60d8e0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3886,15 +3886,12 @@ with pkgs; openssh = callPackage ../tools/networking/openssh { hpnSupport = false; - withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); - openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); - opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; From f596aa0f4a35f613422f85a4486e32ea20ca7739 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 28 Jan 2018 16:32:52 -0500 Subject: [PATCH 141/185] Revert "openssh: Build with Kerberos by default" This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327. Moving to staging --- nixos/modules/misc/nixpkgs.nix | 1 + pkgs/tools/networking/openssh/default.nix | 14 +++++++++----- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 6eb42494124..1793c1447d6 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,6 +69,7 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; + withKerberos = true; kerberos = self.libkrb5; }; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c135cd36f4..663e7be7e5f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? true +, withKerberos ? false , withGssapiPatches ? false , kerberos , linkOpenssl? true }: +assert withKerberos -> kerberos != null; +assert withGssapiPatches -> withKerberos; + let # **please** update this patch when you update to a new openssh release. @@ -20,6 +23,8 @@ let in with stdenv.lib; stdenv.mkDerivation rec { + # Please ensure that openssh_with_kerberos still builds when + # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -42,7 +47,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); + ++ optional withGssapiPatches gssapiPatch; postPatch = # On Hydra this makes installation fail (sometimes?), @@ -54,8 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook - ; + ++ optional hpnSupport autoreconfHook; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos "--with-kerberos5=${kerberos}" ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d371881f94..ef49fceab72 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,7 +142,6 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 - openssh_with_kerberos = openssh; # added 2018-01-28 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aae60d8e0bb..1a4eb7584a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3886,12 +3886,15 @@ with pkgs; openssh = callPackage ../tools/networking/openssh { hpnSupport = false; + withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); + opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; From 8853d4408b7b0bdd844908d4ac0d5e90070428df Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 29 Jan 2018 00:57:05 +0100 Subject: [PATCH 142/185] pdns-recursor: 4.0.8 -> 4.1.1 --- pkgs/servers/dns/pdns-recursor/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index ae023649bc3..25b333a4618 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,28 +1,25 @@ { stdenv, fetchurl, pkgconfig, boost , openssl, systemd, lua, luajit, protobuf -, enableLua ? false , enableProtoBuf ? false }: - -assert enableLua -> lua != null && luajit != null; assert enableProtoBuf -> protobuf != null; with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.0.8"; + version = "4.1.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "04v5y6mfdhn8ikigqmm3k5k0zz5l8d3k1a7ih464n1161q7z0vww"; + sha256 = "0srrw726qpwg69v75dwbxab9hk73x1wia4rcnmf7g5qr2k3h7swg"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost openssl systemd - ] ++ optional enableLua [ lua luajit ] - ++ optional enableProtoBuf protobuf; + lua luajit + ] ++ optional enableProtoBuf protobuf; configureFlags = [ "--enable-reproducible" From bf3b8a45bdebd91c97ef6b2573193c7eba0adc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jan 2018 02:46:26 +0100 Subject: [PATCH 143/185] postfix: 3.2.4 -> 3.2.5 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bf1a1e782a5..bf1c16acfeb 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1xn782bvzbrdwkz04smkq8ns89wbnqz11vnmz0m7jr545amfnmgc"; + sha256 = "0xpky04a5xnzbcizqj4y1gyxqjrzvpjlvk1g757wdrs678fq82vx"; }; nativeBuildInputs = [ makeWrapper ]; From 147f3d4d819762fdba3b1e136b1d658294085493 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 29 Jan 2018 11:00:12 +0800 Subject: [PATCH 144/185] qutebrowser: 1.1.0 -> 1.1.1 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b7d34379096..9142ecde859 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.1.0"; + version = "1.1.1"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1w02z5akr1v2517rbqrnv65vfsqvgw310g2nhanbwdg606crzr94"; + sha256 = "09fa77rg1yrl8cksavxmgm9z2246s4d8wjbkl5jm1gsam345f7mz"; }; # Needs tox From e58adb9238ef9a768c3f63e5b02255b7f0daf42b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 13 Jan 2018 14:59:49 -0800 Subject: [PATCH 145/185] myEnvFun: fix sed script edit --- pkgs/misc/my-env/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 2d210ca0098..d0b7458bf57 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -79,7 +79,7 @@ mkDerivation { mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" s="$out/nix-support/setup-new-modified" # shut some warning up.., do not use set -e - sed -e 's@set -e@@' \ + sed -e 's@set -eu@@' \ -e 's@assertEnvExists\s\+NIX_STORE@:@' \ -e 's@trap.*@@' \ -e '1i initialPath="${toString initialPath}"' \ From c945f64454492065727408d42c53eac8088013ee Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 29 Jan 2018 09:15:23 +0100 Subject: [PATCH 146/185] urlwatch: 2.7 -> 2.8 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 6a322f649ac..0c37043de9b 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; + sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; }; propagatedBuildInputs = with python3Packages; [ From f8c4ccd89b710522b72069868f80e078f101ca67 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 29 Jan 2018 10:22:50 +0100 Subject: [PATCH 147/185] ws: Init at 0.2.1 --- pkgs/development/tools/ws/default.nix | 26 ++++++++++++++++++++++++++ pkgs/development/tools/ws/deps.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/ws/default.nix create mode 100644 pkgs/development/tools/ws/deps.nix diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix new file mode 100644 index 00000000000..b99780d4138 --- /dev/null +++ b/pkgs/development/tools/ws/default.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "ws-${version}"; + version = "0.2.1"; + rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; + + goPackagePath = "github.com/hashrocket/ws"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashrocket/ws"; + sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "websocket command line tool"; + homepage = https://github.com/hashrocket/ws; + license = licenses.mit; + maintainers = [ maintainers.the-kenny ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/ws/deps.nix b/pkgs/development/tools/ws/deps.nix new file mode 100644 index 00000000000..82988437145 --- /dev/null +++ b/pkgs/development/tools/ws/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; + sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2790304c0f..d89405433a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11674,6 +11674,8 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + ws = callPackage ../development/tools/ws { }; + ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); From eaaca14c30ff539f02354b7524da8d0df491d728 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 10:54:20 +0100 Subject: [PATCH 148/185] p7zip: add patch to fix CVE-2017-17969 --- pkgs/tools/archivers/p7zip/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3550b7d7de3..886ed817909 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d"; sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; }) + (fetchpatch rec { + name = "CVE-2017-17969.patch"; + url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5"; + sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional From 329ebdf0d0a99fdfb40954543fdf3ee6867dcfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Jan 2018 10:40:19 +0000 Subject: [PATCH 149/185] firefox-beta-bin: 59.0b3 -> 59.0b5 --- .../browsers/firefox-bin/beta_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index cea631345d4..f359cfbf79b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b3"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "386221d445cc70cbe108c9d40bc4354d5a902f8fb9861936f251a45513704a8e26517a3daf630d654db46ff41907e98cd6b4c9823afbca5d44183fdfd177423e"; + sha512 = "8378bf22714f1e687a52dd12637a566cf5239f8413cb7508259b58d557e7d8babfbf3c4251a82d3554d812c74791a4b99290a14497ebf69d91db9d8d3c5e0043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ec2f8daae66eda23344723a6936933a97927067dd28c8577e56f6b5d5fe8b2c557dd309cecd3cac085b91a5cff3a7dbc80fc572760dc82b0f2964ee8eeb26d05"; + sha512 = "6df91af8a37c092c36decf7b8278674ce32d6840ef92cf658ca2803fb3744e38dc246115028af86e5e36b7ec17aba4a9b0b9d219a540b328ac9cb7753bb58262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "929b4d6a26ee8103d1128c07f661f4cd1a8aab086d5031bbb6bed8f776b2bc7be1a7d23bdec6779754d13df73fe535aebd78b61a3bb0d29bf0fecf5cc7ddfe31"; + sha512 = "09e53bfcd586eac946b372673d4c37641aae81473386d52e1b0060023760c09e5fa22c3b69484be66c6cfe51a99585c957f088eb7c04f7330622ba2f1a5e51d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "31075ff8c7962c4a87dfb39d959538f2f362dc0a3bd50ed1e81acd898bfb25612fb34f63ef01210474ee9ba8e65964037485b6f2d581cfca166cb5cb55dde871"; + sha512 = "96d84c9139bfc4518e452045cf94e4e61ebca6e7a43085d18d9475dc163c8955a7995935d430d0da386ac268979b6765bccdfd1493a15606225055e7622990fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a7e2e7f37a22a6a36b9659c803a01a38e7048ba6e3be0eaf7c5a93ea1c799725d4a6646af35ef31493798d5fe082a75d85b02ded48daf45639a2b92e9327d953"; + sha512 = "13daffa3b652455957aed912c9e5f86121d99c25daef470d4b2fe1140fc04b0085a3e8f317f9b36f8c26f207ae412a8dd71f2ef7cf233c15c0552682eadf14cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b55e4344d6b05ffddfd5cee2d63d28e3f6b0f7c231625af76e83898a042bf7ff1a9b9614666659cd648d86c549d18894dae92278dfcbbb4354a7fb77c4684fd3"; + sha512 = "b9d9e21fc2bdc3054a86c993be82c1e04c086db9ce8c64b40bafff75b967a7c30817aaf924fdd5464c64e05aff7004efd8607a123699ae58e163fbc3c1c3530a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "10c48fb227944a639cf2143b56c2ab6a61ac31b7903a13a233815c5a8d552d3ebad7ff7e9bbb1807045409f9491613db5163c5c1692e921d7792f15da0b0ee6e"; + sha512 = "5f0bb5796e4ee6ba8f08b18a19254b51b04b60aad93cccac21eec0e10ef1e280ebb0d4a66d053b7f3f875b4cce34b90f58cadfa7705f89f26f96e5b94316cf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "38fe9cc7d0337e1bf28df71aec7061475cc2abeceecd9bd1a40469c3d26dce3e4ff0772862dc1aaddb5914185ba36e223e7ba7d58c37baa58ea01c41569d79ab"; + sha512 = "736e5e0c81969107b6bc83d9212a30f027f84d646c896eaa61374c0464942bb74b3e22f94d8254cd17e0c5e9f6431a5b9b910f2b9bb6132f10f336d7e952af09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a1eb32c13c0825f5df6b319b17c960743b3853fa60dfa3c8864351e6babfbc78b10673a7cdfe70d1a1976300cefd81bd05234cf2ab77661b1c0488c845aaa42b"; + sha512 = "b2dc4f280897b5806077e4ae527cffe8961910c114456244153edee182db969507722d1c30e5abee9f9b9034c58e22a2b54bbfb00b3e8198569892b87e84df50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a103237c49c7d6ecf9545b32b3541a9c2daa7ecebccf2bbc8bb5fe444bd0a1d376062ed8b3ffefe18f28dfe6c243039d05728b21ce9ab2087676c83fcf74e6c0"; + sha512 = "0546005b584f504378799f359eecb11347f16a9d364deaf72a8f1094b2c6030749dbf4eb5bba1224d91965617b2d919b873fbdf4c5c3ca9996286d281af51df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "aa3eb81a794d995cd14424d39e9b13fe8e396e6ed2815d3b9a0e15f450d4658c31a6b34a7676e07438dc5f7d91a9273bf6391b3eb3568ffc00fc37bd251e6bed"; + sha512 = "cece516f3c46b1f98dd837d17533a7607401452d95b3e7611d4352f88699008bc38a95e6abea5c2c69d145e934a34116fe00bdee2b9ad404c26a20e35c5b16d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "368211a73669f3e341338904c69ebbb69babfe50b777b14a89b964bdba3470631487837ab35b8a92ba263da17fe9d7f2fb31b5d722e20dfd3e297c5c09f6e23d"; + sha512 = "5aaa92650ff188d457fa9d8b7e33198b847e41b9ddb068d1bcf7015792352757e02e5b1deb36e0c20ad1ef214f523003ebdbb70273d153f4194f50514c876aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "77973d2a5d193f88ddf54bdf3bfd60f43d818ab637cd0992033ed89efbb57d48b2057f79ea8fa2431d2dde1b4345554ce32893ea5c46e13a8a904503d76a50d9"; + sha512 = "1ccf76aaac7d2ff4e4a8c09e7431ef8f0d5a55cfb5bd9aed032e147e87b6d86391a927d76251b6ca1b3c21a57832f050ee818b43a5513c49d75652e62e5eaa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d55f8594b1e157779f8a6c67b82500bf2c2a29de8505906b5825feb7194f84a1aa8f823e270a98e6abcf0879292e06e27981cd54d4e8b71406c4911d1da8d5b0"; + sha512 = "9b3d4b0abd19ff7ddb51ce1925e2f8929621b215be80f124dbcaed7b34320914c9593645bd6b1b406fabf7693016816fd27a9b66d0d577e72c659a28ecb86fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "183dee44d7e7dc976af12a1dfade5760dcb6580d9a8fbba8d3ff3b5d420b8446c3db915add99d0d5d2112a42d80ac14e71426f1f67298c5f2781c5f6610713b1"; + sha512 = "fac861443276137842c0b7ca0620d0714bd4ed391abe28ee9a377686261670301d5cd62c105ca31379d9ea97a42aba3bea0edc284bf3058da1748dfb3456cef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "6829647082ea1e130f84eb98ffa7c66757f4d06a6024d86bba49e1e50280e067c41b3a6c1e877b3124fe54b30d2946f9326f88faa00803f72c9b08d08c426b24"; + sha512 = "3de6a8c71d2befe5ae58d1968420c72ef52eefc6f0ad2330c817baa3ce9a2160d5e332846d00cbd1b8504f806620787fd967c1970f9bea7964ea1a6000c70c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "57735aae71924ffca87a20bc69d75cc2683088dcb95476d67b7163e289c58c894d5c4b3a5cb85963ba0a6e567aba1a610c304bbaadb42fb7c21eb31fbe7c0719"; + sha512 = "71e9af6aee3e9d22a51274d8987a296b2906e8c3b1c85d3f4e0469db5c11a22f93948e78b76d1d8d12ebe22e8987781147ea5e028b97803da5f21755c5721a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5b0383097ebf1cab5952bb223269f003d571843723a706d39a57e2ef79da3a9c58532aaa5b8f2e7847789f3f3b8e876ec8109e896183a4e37c0bc0f4fcc9767d"; + sha512 = "40d1325baad0050524df5a397e4d78d6f78d53a9ac34bd57188febdf8c6e291e723186c596cb634df18b5b8809d52401cca2f733de95015d658710e38fa8cb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c299a3b3b1ea4ec98a5db63962295396b26232837e3c2d09a0d7ed7f3ea85d02b91e110c07d63c7a1a6fb7e4e39612073f8e47b9654b74552f411b6b71765118"; + sha512 = "4b1971ef58f68c2d2d8e37c2759bae6a0ddccdc14e4ab125712508885dbf7490323d568aff70702a056cdcb64c80b85cf67d2013c4efc9cb2f0063ade13ee1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d38d279da194f2f375e2d9c9c007919d9d373bc570fe94d51f8fd67d46684abb0e347153fcd188743961120ec7bca69c8b0395292a607346131b197be16a728"; + sha512 = "78e9f74125d27c37067a52fe33503979a998fe0e0f84e3859b75d4544ac70cd387e76088cf28b520ac6185bf0884508c399077dbe8ad74b87b4a5d01c4e1a557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d0d310456561925d6984674c2406c1a6d05b8507d8b405d59f8787fc92fffa23ecd6d68e0fd07e7c709eac684d86c80b65f69f7cdbbb1684121bfec0e44d9fbd"; + sha512 = "18d2bf64feb0a89f715ac8add7b46e296422c130d6afaf35edf1b4cb2a46ad5a77ed4e7c3131d0fc19750e3cd9b53e2bab835abc375daaed2a69195bf60781a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5e9887b56665f2d376287d73f4adf0ca707d4aa8f4e41c6150c6f15315e89d5ebe6c051ca3d33bbc105537d0ff5625af3ea25ef90e9af628bf9fca5660538fa4"; + sha512 = "2aaa98402c21153f1419d3319db5cc0db71cf23e02be560ad8051384fb8465049500d8a3b1b7c327916435ae4da61043492ff3a51a8da65699d6b9be368aaa36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ca0960db604d3471d17aae37d218da99d4523b021f80cb4beeda6c6ce0dc4bf9e95c69d596f8865e1d51d6096cd1eb8f027c1460c47a503521114dcd5e202b1a"; + sha512 = "5e281d84456a7c4cad57b13af5f77d2e9ce903be0993c752e995e0b3df7c1b2453a45f322833cf1bac872d1fe4bd9209a29dd5fc9c7571baab3665b3eca874f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "d019da53e07e13c976a0f7cd7b4fe5c81ed2363fd1ea2fc4a1bc0d9b66b0f5aa520ad674f25348f81d4013fe4bbddad07985cb723ac46b1be1b1cf83ef0d3988"; + sha512 = "c431628654fe39e59036ab1567749ff4f931bcf00b6b55a11a240823905a7ca6c5ccf0e1184f8f7495f3650bf0976fe2e3da2e09b0a5abbc6735235dbf4bc6cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8c4f18911e99d3a8a5ed172a8c7db9928a11b45533c5daaeb5f4a05c053f106cde27f3c1e909663688ee8e338d288ec3822d2f9ca7d4b88bafc4d1aff3876d09"; + sha512 = "b3b0307e5d9db7a12a7a0fcfa75cb179a1ce91d0760ef6196ecf734ebd0aa3cbe701f3c8610dfa6faf2b5e4d8c9b73d51b526bceae7d905b17dd76224c3ed15d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0f9c6f908d42e1d61fbd877b50b9a6fd58f57b7d44e008a1feadca33426c0a8b7e98fb1ca60a27bb4da28bd68af7da8482693c2c2727efb0d5e20527cc407b49"; + sha512 = "57baa3cdc360129bc68ebccdfc51d1cecd239aef84cf5043003cf2911e2f3ba4f13302acc096aee96c603e21f4df8e7dc81521bf5de5f8c70abdb9026ece189a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "28625436fdf96abb496112ca443013f77428f8184dfc19f0b654829049c552bd9778f56c5bda6b2639e5133efa85f2d62590df1bd5340458de2b2c41cf29e5f0"; + sha512 = "b385405596093d1a2fd25b290e0825110744bb702239be615809522595bbf34a1ed25e7b7abe17b078020a755a28a603823b7014a11967793e1d4597a3d6ba04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "db3fe78a866977dcdb32a13ddf263f3b9b8eb6846a751f632948185dc03389513f8515897c38049f454fdd6e22db9030590e0917ef682f573a2611726d462680"; + sha512 = "f3921d502ed19c3c131f7aad613ccab775c173b4767f4bdbddd4aa98601ee7810254cb6f0c588809b9e0a61dacdd74a1662e83184d380830f35b7cbe326e116e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "302d416f2b1b96c65b76b89cf669b17d996d5d24f6cd38b4069de09a0eaca3d2c4c6778fcc593e23c674913350d1d9270cd9644290b230e3a131d51a1bcae268"; + sha512 = "da072c427f2a232be0a84cb23897bfb6a93b92326b180dda491b2c9afb68afa7e798f1451a6ef5dd36f13f473fd9b667fcad96a0124490d0c89c0c5ff3887f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c999bc5730113f5a6dc334540272322596d980775cbdfd5679478051acd2a503ba90353597b7c98d8925fbc7302e316a666f01d1f99ac406fecd836e233182f8"; + sha512 = "e8a72113b7df9193d6044fd6e6120087422c7f2d4456d5dd24881723c77039607ce8025f5f3547b80b671409b0a2017368fff376c9ae581eef285201661cd719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f996b3cb4066a56e8482f1c448f18a8b27b3d08325379bbb689b60d728c753a3dc1a956d298a7b9405eb15e30e7db5874f3a6c37560ed857286f968f683e3d7"; + sha512 = "dfc9ff76c8e76fef732a89f29ff4d821af9190c45a02d0a56ecff9f6199b674aa6445817765eb01468b16b253aba9d4507d8750228bce74658f84f3c4daa64a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "aa263c9fedb87c063cffc7a41afe471dd4b79765918e1ea5c3799e20fdac23c57a31030e6b9ad5ee305cba157c9ca8d79630ae1be88c2e359ce0f6ff9d69c9a1"; + sha512 = "a5d1ec23f3b7ae46b9aebbfd2e6d2f5df959a34c2df0660e3bd17fd45fdbfc696936e9fc921a783304a3bdafa548ae616c910a5e2e150fb2bf98739d52deeaeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "85ae69e9f3d7e7316cbe7e3632019996f0c9eaac51c4a7d6468a57425d6b36d57948b1a73a434d64dece54b5aea32fd1271b42d2388de411cc180a0a60ee7b85"; + sha512 = "2a70a2255a029db0222098304d5fd5a0e204764f1900705dc3de97c768aa1b729610c968cf73f885c05ff6bcc95c51329c752f5d58da07ecbd9bf1fb5d7f0e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "611ef9e776d78afd1182a0a4d3fb11551e545139c36d9309663dfd50994ed77dd13f3051bf17615172b0f3fe802c64a073f8dbeae49d657af652a3305f02c69d"; + sha512 = "c346c7e849928fde63fbae05ac91030653dbd43779ea3042f9fb202f028063f98a6060ae36b0ec394ffd5d5956d6d87af99d85ed89b9d08fe06c1c34207f20d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "cc2c4d74052391b98fd03ea487018fccbe8aef85140a939b1a8a6a323a2b0ce8dc2b0a9701efc61e7b1e7e92347bda4112b58a650941fd72c53a5949220afd5d"; + sha512 = "3e54e6687bae4b9c62a63d2d3749d47132939febec5be09f3e7cbb3633d2cb0662bef0c86e4df7cd678c6f6e8391548cf01d27b8eaec9d9a45434584038c76f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4c8f291e85c0c2a22a9fa9e12e1e0c8f65b031365a155d3bd6705b4a08b8ce3b3563a8d571f7b73a8ceeca099c346033053f8c833c66ef7417e735bc88e5c8e9"; + sha512 = "47e2fb7fbea44595e9e70c7739cd7666e9ddd02c822cfdab932974bebdfe542ef560a02f4708866a33828b1427a3e71c71645974481a3c7fa327af53f43c0cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8e69918a52854999a88ff15b7c8d99171bc497416ae9e34ce153e59308d6a3513a130c93409d4ef0a2f81a6e5994b31ea4a78620bd3363c68bf68badd7562b1b"; + sha512 = "3132195d3f304fccb1df185d331b5cc883b9e3017e6165c5e87e4cbdbb35bb5bf8a7341d4fc36595fc33493a63741a32a35a2bdb8ed3f5525d8216f467fdffdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "cfb2f2d3e97256a1d3396174a4d0c2ea07a88efb10b7e506e782818cb7438b32502b8568a4b5a2c0cfd5eca3a254824157a674d8bbe78621c420ae104622d8c3"; + sha512 = "8d3603b4c237e725ea22aabf4d6cf8c28912d938836ab2b2440c12c3171f2acc27daeb143a8aaeee493471e956cb7a921213427a2302bddd46cd08ac29d73b16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "23b6f56cc48644e8e36db9572b146f054e87f1cec5725b37ce11bea2bc36a9c5fbd4821f0f071d9839a983a5d7e7693f1c6a59a943e62f145b8719adcb6b954c"; + sha512 = "ea4692cfaa6d3cc321ff871e415efa99521ff972c2b317249598268b52355acb8d7f19a9de2ab63a12d5cd8f36565cd7688b62712c828bbbe3b7132d13ef1998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "484b3404e6b625f5565b1d6b34bda016cb6c3aabfae5850077d1177045f95a3b8d590bec3c5ccc0b9b4ce65952f69d4fafd90b1b9dab2f400cd20f9bb0775cf2"; + sha512 = "7e574c7664ef33ca6d922a7cb4cf65bf89e5a63358a8b3c3630aefa0687be675b19bc4aa0516e524a84a25ead6852ce435aec3645894eae8f68e58d5821efb0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2ec16e2a48f2bf04c5377cb2d1a6cb65924de9348ce7de1e334f19ba5282a6091ae619fe0841ad47b22284c5d21473d177d16592ca52a7c158e3b9a5dad243bf"; + sha512 = "b24eed7e1c5d81eb7938b7da957b7f94b735111d37510d13a14bc928477a5868aecf3c3e0b37e3422c8a8bebda6bb30bc56fdf339cc718be0f4a478c13c12eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "02a601620b234206557aa37ab8238cf1ba680e12603bce76af5c01d0a7c86305847d1febe780b1d2253d0d97251da780616ffbfcb238d9bdbe919e3648781097"; + sha512 = "10bd7ba2a8d8cc003428bf3afc710ef3e5a1fa8bbf24542dd764f622f74ba8a4f4e6f1cc0978c907f9bd9104d870f2cc38763d9a6d80b47134318d48fa0af90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6d0e5a3b9d8b8fc0d7be5b8f66657cf426414d38792430de08fcb567b6f1eaa2f27fc3d4b5d18ccd46759b435f9698040ce47aea05c1e1f3dc162c4bebe434a3"; + sha512 = "66c3151b9b2785025c4bb70cea9f4c12d4b2549239c3a2fbd96098c72118d0ac0306458142a1cc2ddb73232620717a03ccf84e27c606769d0725ad29c2a871d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "91a25d4660f45f854cfe033a19e913d9d324cd911c0c899168e8a91df4ce9ccdce5c541c27ed501fa3d29d21119faa554d0d2891b556a8bb6568febf8e696789"; + sha512 = "9abfb9cce29b06b0618d8d5c5ec0a91aec78b875054e1b1af522e5f05546fc861a86493c9fb026fd5e133bd38522ff8583208557ae207b94e338fa8a2b153880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "36246d7eeccae3bc54058c8cf8e2d1277347428c451fc44513abae9536d59d13ffe2cd9a5dbdc7431d6f6c48aebb41995a6d644e8434d86722a330807a019d38"; + sha512 = "65135c16685a448a374e1ef9eddda23e7a11167d72a4d66acb22f6f204112d45c2720d9f61e07bfb37e219b8d9d2264cc1bd80f75c7e3683ab69fb50a617a4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "097847b8e03283e7c8b2f3cebae3d4dbabe0f4630b7db9779419441d7e6f1b7178d951d8aa22d7f2a7e27237046fe3e11a1e9889c1d103623236c11a5bd05105"; + sha512 = "edcf63cd231ca163881d6ffc61cb6b21936b30a0c05286d8bd79e20f3b89cf727832ade1e799ae3067fbc0e84593da60fc0a865233fbbd65a16c887c6f56fb72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aef4ba8acad1d563cecccc33a30fb77e55bd659ac33a2358f941cbeb94235bb269b3148e18a71988b82f5fb9a5d65a7c03a53e1c408f70ddd24814b85b1373d3"; + sha512 = "30c9e552e0f5a369ea072bfa2518643199da84242f233367b2bff23c387ee18bf4b377f4539222b69885cc991410904ed2f725de99009d6c9e25f6cd560ed3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "29745a582e8146bb68e2edc78311a26f654c914478a94e9dd4264fc9d19d39f3297942d189202e226a9303e4ee0af4719519694f10e06debea824d4d0cd0d1c2"; + sha512 = "26ae62912440ffc4fc55799bbde78e2aaad0cb5bdd653fad0f7d2b7d0be479efc89750c5ff1b67f1dfb89540f8cdd16c5b3db446c06bdade2bf27e7d6d605fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c5b0412fa99620f5dcbf9d4aef88f53cbfaa70304afd31e19f6956c0a9d1e301d026d0ef6178eb6e2b62719034ce91feac386622d60b321b0737928c668800f2"; + sha512 = "b0a2c2a60550e478d8cab3e7608464411961ea4b561a9554d174165856104475432e8b2c62cf5e0dd6f9e893241f40d8479ce9bca5bb56bd2ca0206539fe50a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9e1e677b0ce76fb5a97cde4535c76cfce56e9cb964d9686433964050f21ad9b04bbeb5783e3ba1e0116aff3765327ef6b9d7a0ba6fb1aad7d4e9405470169d42"; + sha512 = "63bfc964d60e59349ff1a6e9619ded97be07345cabdd95f372938500cd16ce7729c091e740bee8065f8fe43d3205f6b617d7eb90f2e9e3f956e4af59356dcb39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a87936a0b3f845f2509b9c7a281fe24971910ad77665d802740d1fc97d4e77200524f3cdf19f90bb46eb2bd741dd6a87402972916bdc43da5cb568b6dbe7dd61"; + sha512 = "a9eb83e6b82b13ea962405575f849e9fbfcead7ee704bdc2076ac6578231d075c66273cf164b222ea38ade1412a690080acd297dc58d0e993310173d2afc3e4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e870594ad2427fd230703f05616c265abdd3d9f00327d6dacafb6deff871384bf9e675927fda177cf0d8a578cea06ff377c40dcfcfec258d71027127bdf6e818"; + sha512 = "9241e09e3d13fd270165250413b8ca08e012e7ac6911fd9bca886d9a2d4d95d514f8842b6aef6654bcc1df54b7aec1b02a6a56350b56f2011e885c56540ed706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bcff95e376a93ad3ab181cfc6cf8a4e548af47019e1ffcd511602f11e5a155fdbb2f2630956c632a0b454c28c6fed8eaf0e6c7e0437bc76ea79474620a5de9f7"; + sha512 = "5753301f447753748b26b1ceff617a5e5efdc9723415325d131abfd17f354316345713365a5a0be31bf787c0b34ad12e9d6be0d6aad9a10409ef0c21b45283c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0ff190cd724b03cdf9f76f54a6205b0c4a58635f681c82f51e875e85c8f229fe4640ad91f8e3789ccb1cdaa64cdacb687a3942fdb6b393f90c1b6a11cf1b1bb7"; + sha512 = "67808d90c284355a0df44d9386e902264fa44e36cbf3a043e423c30939d1fb4b7501889ff4a28799a31d5330c858958f4510b77f13ff2b9f7d27e22e903f9b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1286386ceb7f6cf078867cdfba518f3eda08fc0630734d8af75b63813ff2f8c2fc57b9a4cd3994b7c805257dd4c98a9efef897500c79337886ac412223f92918"; + sha512 = "d7cf93cece39a033a541c44093253721de2846c5d5a1864429d009db1c6eee1351b525bdcd997a454dc551b647db6308afd5561ebd585e23c4ac528ebd47afe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d911b71e065825b6ce98941ec9aa222ca2833384ad6b49cf2ed6d3a85c35378182019453e3f306a580d2c2bc63e2ac1ce8458f0a9250a967b3e307595f70305f"; + sha512 = "01b09dbc3bd6308304783c144bad3d75d119ed61a60c30aff821f28de887e05875e4718f30538dd0edba5abdc7f7cf4fe7d0592d29f60baec58d546590b9fff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "34dda00ac8d20c511f3d1e21b617e98bbb72754b95f80afd3104678760a597bd212304358424ba3d8e9dd54186e00e6070634fb220dfee51db2e46672bf00c92"; + sha512 = "d1aed9ef1e98f028a2827abab0f581b3957601301d60f8dbf365429b7dc228942b329f148703581a3d4556cc7b9420065f7c5b8b18b7ef6b65c661dbf7bfc3d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "413865ff7ea50c816dd382f42315196c0afa68ed81fec2af46f9db887feb5e7ec57f6e566712dd44ed57c2fd602dc8753e4bf042d06552b83e42974ec753b113"; + sha512 = "bbf106777b4e8f41fbc84157e25f113e1703f96a1cddd63ab95bf08ad4057614318f3ffd85ab51c8191a20bce6c457d44c8f34db3484341083a8348690447217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8a0072c67976226340034fc4266a852271678465ecbb42dea5975f5ef16c2dd202dba300b5b0bc53988380cfebee6bc328243d35ee13706d7e9b1e6b827b83e3"; + sha512 = "618b7eaa94b81420bccd0216a6b12eebfa0934c06fd3d415bf7f49e042d2a56eb8c90c59ed58f7a459cce985d6bd1b5e1ff19c2dfc86b5824a2e909a81a90360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be2b484af860f4f08971080ed96366ae03a0608c5d5663413633681e3dc1e2588cd793e21dfd48c218baa3527da2fb6e823756e75900fadd90db9e0ccc13eb5c"; + sha512 = "4a00c16b74e07c4b485d348f78b8b369dc1d069ca158ec8ae8cbbab416434b4129bca283c01a9880c19503bf332a12c520f266363a3212ddfb379c5a3aae74ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6f93b2ab0909f14787ad42ec646ef708067a93745c845290df5d450f854f8631f581660e5b79eb4e11de9c9fcafef3eed104a3d6a586b576eba8d1952649e861"; + sha512 = "c2facfdf8862c84ae1d3186d83d653982e9b0e5cbbdffa987ee83c72be8866b64bdad2ea8de7b7c7d2f301d7a3740a9ce6f0ca6facfa7552fb71956586328d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "51ab95bac97bc8f3405c0a333def0a0b4cc8e75ff365e2a9220391bf8a488c9fda58fe0e8eef0466928cd9f8fa2c300bb462c88090814d452efaf960a5b39278"; + sha512 = "0b83cd5d65108e126408dd56124965699daad192b318a085fd5e0af77864b998606e15a21260606785bdd49602e275595ff44c0e72318d37aa0ab129c413c947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3d4a6cf74dbdb72f94a377709b77cdfbb3d535411b45227e3be6f5f957b08981c565baf3b4edcfb8e268082c510c52d0c048cdd1769c2e327e28bbcd52ca2441"; + sha512 = "62cb3e3b9dcb6eb76a1f26a443286b99a5d46f0d492c0ef0c5d93d85d7c0a4659eae448b5458e859ae5a2570f8b8a15fd10c033c49b933e1ce612e5ac7305c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b3c2d8921eba5031423c8fc1516886ed1663adc29df2f4bb4b20110e4d067a0093b15d36eab598862a3186788dc0d895b60ac4afa9cd050819b1b011e6425f46"; + sha512 = "4faf79a4cf834f51a3e0716a523b9f3b1225d32180222e357bb6ad5ab3ee3b858c7822cd5c5c9e468ff216cd5d7969b71bd18e111c89fe83eee95cb1696937bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "25d8c5fcc30ee2c106d16f14f72b10d26c5765f9aa423d7557455813d47d2b0d88dfc92f7ef28650f33327be50e60ecaece9b8f270e060d9b94ce76a2a00fb10"; + sha512 = "608a2efaeed3225c8a3f2609afe4160fcdb5286e3777def703e172864adc9b0a76a87889a7e93cde7f118afd218b5eff38b00dee923222c3cc1a044ba0ce00d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e93f7184cccb2710d7318302068fea4367ff8fa3665481731a7a7cfdb7230a21a0fa7771c1641d127cfa1fb2a691ca56d27357fd8d8cd8b6e5c3a1fb2a1dc763"; + sha512 = "ea717a9bb9a8f644e66b8b0e0f28645460c9ac3a4f49db4c9f2f87b6419901d41e358f1f90a01122a70557bbd5fb4425bceffa8262e04c02759bb15ccff91d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "21aef802f332b2d5a6f20dafc2756ff5a71d744b7305e703452161e504f719ad68add940421b13898e32caab6a85bf6e12eefd262ebf039dec56ca54dd7e8b07"; + sha512 = "71468ad6a258665873122759364af4bd9a9f4b9d4c02d77a02c13512482b044c2b00f4c18332560d78fa77b413e89cf1d7d6625884b4e52f48345c0b4f62d04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4f9ee45afd6fd149999ac71e6fe4b21e0bb8432f04a26902ec22fd5210c0c1643276ee5f47bb6fc27bee5d74f923c2db34a6ca19ede30e6f2735237c27554e9b"; + sha512 = "594054e80f00111076786e322d561cea228e0ef9879d59fcbb9c3346a10314ca35df7466e2e008ab2a866ec627cdaee005deeed8be17d85a1803c35c0c6cc989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "92c5c892a0f4c6745cea04f1fc12622356b83fadf42011ce9b01e4550fb6b592d3b4169f26060f82326262c271a98b711ef703747bf3ddf8bd967a02b4979587"; + sha512 = "2fb3bacfc57f664423af9672ecec7ca8bc68207cfb809423120e894760fa3a4d388fed7398a6d66803707b8e0571a21eeb313b09df6275c8c3f77cdf2a39563d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9d0e28c01d6ddac5ecc45da39a83c28638708cb7aef499069d3f4e129c8c1bce3127c78ad286fc936364a69dde7a9c4135f5a86308fe3c8e0aa6dfb62c2a01a6"; + sha512 = "f1afa644f76b76c88d4607e08de50724e9dcdcd407a98e2dc1de4fe408fc6b1ac7beffd26174d1919bb4a6136c82d12c95d13c0fbdfc2cc4d7b7c5d519a6125e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "459e7883820a99ee8f893ffca1d050f4bf9da58aaf9db876a4264da34c879d631e298ea54c143c625bcc360aa6fcfa26de09dd9d65d14dbbd5234e0e4e37d5f9"; + sha512 = "b9a8a7ae6cb3e91c780a83219281abe84318e17906f0f4b47ca9300720141a90679a55438956050a54cf733320210bc9e60bc903fed4e4b5b6a41e0d6cc46446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ec663495ac17cd24fdf249ce8ca58d904339c62d9d31057d0aed490457549a4864c9c1b62d5067bd9a6863aba6b71d16594f8900153101593493a23c136219ca"; + sha512 = "0b062d8b564442ffcee2617faf0e55ff4d23e56342c3602e6bdedb986542206486e776b701fac5ff31102e3dab3d7c68d6facb348d29476a64cda8aaefed3ba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c59069d48e0149b801de4dc654d9cdd9d53a317542d6348580453703092dd0930fc426dfcaa96ffb90512b2b7ece11232c6e9ebf423b4ee0ed237953a40cd424"; + sha512 = "dd8154289d9d948db4a1d91020968b1f9502dbc6cbf1477d705396fe531a8f06f8d06289c9173c799be033e5e0f44b341b5029e492a8b7c8b0f81e918198d605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "307487c99e3176eef7d4327f1541684bcf34e678d25629487fcc2a61e16823b56c3bd11ba8bc436f62180db0f3ce499e5e6fcadbb2902adad232073c0dc820e3"; + sha512 = "f6cde5bc5bec287feb3882de991a86506f0cbee8f9ed2f02b655911a2e0d69136b615f5a7a0bc782eb3cf6f68d99fefa4ff0a47c7058f344a9a8e9aef94ae4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "58e6c177f3bc891fa01a0347965c55ac8af1048f10e9640e82f71101fde900d7289b8b7113375370a6c1464b7c40a38e4ff727fff2b33f4be30ac23fc9581229"; + sha512 = "978dbbee8f116d9123d121d778c52e19cb95d1b7cc565b538e65e0c24257e568bc01354841ba97c642d4f832c1e5279a844c98044b5a5aee4b44e0641f7f4105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d765deabee2f0111a4620f8fc2a6d7caeb2210b76e075078e751cd9be54dde48283595e4017c40d44e740f5ec010feb30d7b46a5504c706ac426bbe941acf894"; + sha512 = "b634de4ef37db1b8c96a03149aef441844728b25430dcef579edc62798ea54da7d2af50573cfe7963bd19c6c758104fc8f1efe159fc096a8f0479b851239049e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "99909553804905c4c2e677b9120816b0971c32bcd4b5bab2fd9ddb542b08ea4e1a9ee71b2a910d0f72d7b7135425901d4f5b34e9d3f3b9d9d99320ec0073b614"; + sha512 = "64d5e36a600dc11aef92d6a3e80688ff6f9d6fd03c17c94ccfa5cbefae3e05c2cce0ba86286861989bf1201ed05fc373de327953c944e7b3b692f4a670a3ac4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "984a68bd2e3feebd0161178ab6fdd34be2eafacc063f44a32a094100c04f2bd251816fe985687ccf48312b3c108dda25d332149a3cef8e7b6078aaa588919696"; + sha512 = "8a4ef1a88ed197f3fa8042faf34e234d7b7fe6cd61a54a19aa19244a2b3f56da284062861978d7711536ed7e4722a3351d31d3f73a1f8782a2748f52d7197e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "77d7efcb4de72edd74ad9eb0af72e02b7b5df17cbbb533ca360f9876afd09f4a8686d6aa89b99220fe767de3ea3b5c417be64625168f93b9ee39a2e7be6d983d"; + sha512 = "5b43553eb9cc67be6bc5d7b0341d8f9f7df936f6a918a5bdc229c6b1e478067eef34eb0e593c2e9dec1724283e32bc8b6ef77fa93a3b20f367d5d2445b99f439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "bc4c7219cc8286b950c5e9524d8b3cc11d27cadc68536f3c82343e0f0b1101e76a2cea54af875b493066e9ddd621b0818329ec15364f668be5ca1e50c70f2a17"; + sha512 = "29bc4104a50c28b2b8cb7e7d7e652bc430dd42bb719dfc6d81902a2a5c5bb0f9ec31cefdcca2c71edbf9ff1f27f91317ab04f89e910ec6cdf8d7bb93a46d80a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3373c00ff9198e77614802a238fa4a5e2cf9234f3e5b163ea5d51b6075e9c847b573721e6f94bbc5ed2ce3acc1c633e68e578a99296b992216f87cd9063c3627"; + sha512 = "b84bf339d93296c3c2c6debe1bb5bdd6dd1873c21f2345f81beeede0f6c68f5853e6ab092c63d973010798aa0f74afc81b1c4a3433ad02419d81475e73951ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a7dcd31e3dc14463af6a383d353e45862b0ef32801fa0cc69a61100c347df903d961bb0c82c8ccc91879cfc206fcc4c7cc36dfd776c9619544c1729f767b7cdc"; + sha512 = "0fb0878e5addb1a66530238ace042dc5821e89ae23ca2e9404b2c41b66bd56b9764bf3babaf9cb21c7259bc32cbabdc52372fba84fabf1415e783b06dd9935e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "37616bb7a9274ebc6023b5f12dbda66d97cfad63c9725109928c10cc5079fdab700b0d389c634ee4606046018dd67a4e17447a8e09eba239cf8ae1c5b72808a9"; + sha512 = "5edad9a53752a63484b3256eaac74832fa34d46182d54c5dfc71a5e7c0d7b0e2308209e03f5ac118e9870913d02815f25a3124b15cb98c2d9df190d5c6ec9f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "70e50a11ef4c1c33aede1589362299f98729bddd9b7297cb9c4b023795bd4bfa007979e0e2c5cb2b91e648644dc4c20efe8c0d8be7f8ec4c7471df413cfaf5bf"; + sha512 = "53eb9336acd2759e5d4022dc5924010b73d0152342931dcf8bc97d2b9f6bb8f3c1f6512a004796558b74144781a9785a380ac3d1786b66f95fe0b0394f474663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dd5da07fc797fa794ae2a0adde6b79ff6b71bc262c95fc65d15fa34085f7615202178148018bdede01d11452ea4f9c8a05f8be67221ca890bdd344232874b146"; + sha512 = "60fb87b0d71f879be495827fae12987de865863e88dcc623642093b287a8a7dd959274760f78c1b824b8a9e5282badad49811369a5b575fa29e993f5f960d1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3162e41a7ff5d19e5f79ad748a380389ea56abaadf5909e068311cc079d3d3b9c3b81823c893cd459c53b61797e362bb4194edb046e0b7ec39b8730782811adf"; + sha512 = "8314d679716002e4bd162a5408a2d6286b325ff1b08f92a455bd33399870acea023bd31693d7c10469d853c134e283a87bb5cf0dad2f525266f882581ba93ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1e27ba06de6434f5a0da20b291e62361691db9113f3c856a0b3898a30bbea19a7c5a0f79b402ef452bb4169f308e9dd7e6dbd3deb07ee8db5df8e454824e08b9"; + sha512 = "4ac7867c2e6c0e3bbbdeb38254e8c425b9630f314ab78a177a9dd83d2aa7495a7720400ba4095301fdace8179e30b5b15ab6f67d0beed7b026f581b2d0143bb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0aee77c2f56356d2416f90c85b052c26dccdfa2d8d541964e6d8b6892e06785d134f4dd777bb0d19143cc3aef33798667b91de6f3a8dc619ca77f288370a941b"; + sha512 = "717c6489dd2863e39a9148b3394c81e855cdfaabb01aaaa90729797cf53760b8003c354eb9e1b98a453f23f2d2173bb5a37116eadcf03ed470d5670e562f422a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cfd7ad7074db6e4e7cef25a691d146f38ad6e8285c5540c5848c15e6c7be8278d33c38d101ef87f1524fd45860a9da0ca1d25eb39e9d7db98217181edf3ec6d1"; + sha512 = "a2d6fa4f9bc9327afce0aa74d8fdf6a632bd40158b3b9dff3d553e18a79fc893bce74b45e78ddb42ff913c3338d918a552058a69a313975fc04ecd832595062a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e73b2941308baddd1e24c5579f64d094112f304bfee654b528ca15528ab5ffc3a44be8c8f9717833774b75a99cbfa4078b5ff1283a478e1279e98558c440faeb"; + sha512 = "65a01e7b7777f4e96b8fc195d17ec433bad492918e3fc2978e945c6d5c8125f10e4d7ef1356fb003381b5bd41a1c2930b249065822d1f461a185c70b11455844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a51f17f851b834df48bd2eeb7b0fe4e2a305c144269af9e10632f78640d504c45f88e3a8d903a96fbb583c668a947f20565e4c2bb81852d9e3b839a67949d52d"; + sha512 = "38fccfbcac23f03f3801064d4cbd10fac73aa1f14b622f6d0cf01582a2fe4e5b18350b1fe6d338266604823af61131d830d2d673ddadd51b45e2beb2d201e18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "142818d1b5639fc673ef0550fd545fadc5dc23f20f95e10786a28becf1cd23d3a33ae9e63727100c64ee483103da1a71f0cf1b95274733701cc3c8abdb40a749"; + sha512 = "5e8becb32d19c51673cfa6ba87fff0790fc4bef9a885195e15b7f42272c486b1d27de4f3e1d09ec9817184620d66adf8c42e61692c80181ff497cfdca06ae584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7e8a1b6abeebe1dbb66e741a41b7c7b5432fe6355921bf100921642f4999698d058ab2bd11d7f5ae3c4d6ea1ac63fc5f66cf910d9a3ced2565d1119601782c0f"; + sha512 = "2076ef96b2a4dc236234f33e400b7c3406d0fba417c7e1d9af5dc1f005ad2bf09673b3420cd885a23a7e0113b6fbc4e569a655f8cae6052448d7c7118d46ce41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b58f1cb46a1f1fac15f536ef6d1269a9b8106d2cd74dc5b5f2165783c2058d6f0a41d6574ae5764ed48a9a678bb01a979cd28cdd985331f566eb55d58f190b43"; + sha512 = "bad0038493b166255cd25e500c6a751fd6fa9dccb72dfc6161660d5bae2267039ea8a7fee4c54e58cffb5a2cc819623a3239a5a49a07933e4e76340cfc13960d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "55d893a38f03230c97f0e1d81d736bf1f8e850fb8ff27931673bad9f9086aaa7b626243536f00ea205e0561850ca50d1fa60431a12c57009400634de58e08270"; + sha512 = "d3b9cd39b1f558e63c34ec9cfea0348e4aae20789fb11059a6d9bc39b47dbd66fb79b24d7d296d665aaf3d42cdf672ad73e832b39b4bd5f62869a3d8c693c0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2fe3e2f222851586489fe07684355294dc5f5d7c1994727a1b6268ad1c2e09ad88ce028b07817dc7d0a917f3f9e4bac77cb6ceee9c411b006641153eed422c94"; + sha512 = "150fe754440b8fad0b372539875261de4bfa46dacb5711a672fb1016b9909929378a5465b2500c79fd6d5babe5084050044d9bf1722c8ab5752549b081245bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "1964d7943118193f2eccccd36daa337200c25120603eef888db8f1f88c1b4e4a75ea4af6caf2a77562887e0b7be6a2f79812f0e6bb1b1ffb3e050c10cf8f217a"; + sha512 = "b0a6f82e4f4118087a97daf4e8772b9ceeed0fe537510df600e88abe5a9d6c6b81c85813cc64b19df9d2bf799c042bf1aeb9e2a014adff0eb08c937ec113b9a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "53c0a2b602b4629dbfe73c01db111f4a3c1b6e183c25ce19e1d84be373eefc88291d2f07511614a640f9a295097d9c860046b150a579308365f63181c781feda"; + sha512 = "7c9a45c296acf084fd8c4ae9203f6c09125dffde389f5cdad903c4beea09e379a4e2f55fbc292fffd6242cd5124bb9fd865fc73c4d738671f6dce27e2fceb38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7fad9c59f38580c422d4eb2aab21a86b21c6935c63d72f8ee9ee358f98fa6a09babe5c20293ec232593a6651715636402c1e4b349504428998b6fb6443c73f0e"; + sha512 = "3964d406c54fd20c93fba2a6fa967670a0e866c2d05e1ce6e4a0279ef355ebd65b1bd9b730d0c2d4e6bcf56bd72d5d543e3ac8c2824deec503159c96ef434227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6680345bd870f44995c63fd6cc0b99194d52d18c0e439efe45629c5d310c8dc4e779d348208b63eb372eb4caa350728af2dae26b0272d7e85c8e79fdba9345b9"; + sha512 = "b6c5873a0e42d171b46615c751b3ab2fd8b668aac0d95da0d4c8f5f64514780221ce373421f5ac3edc44bb185a319f34f8d970703b0e44ec413512c6a337955d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cd5abcd32cf2cb8aab7c5e712347b1b7d0c2bf026d76aee00de20c9e01db727cf42807add5fbc5f47a4aaab60b4c8268b2025943122e783f51bb8ea4eda5699f"; + sha512 = "9f3812eb426ff05eadbdf38a67044365de649e4954f33642947222ae05e273d650b54ff3d4fee6d4fbdf6b7145df86d3bfd45de2d9055cf7b1555c3d903c7f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d30feddeec0148b77e6b566fe9f7f7974405436a525adc3264be68d89691b98797d5d512c9a00e80e732d408dba0586435419400aeec07ddf8f7daa9144ccf94"; + sha512 = "c32997341f7280d3481a586747cf74efa2d136b25881d5cb1b8efdea51884dbc82524ecc856b14f21c8d70a95bbe1957637c3d74c7a22adf7f595a8af90b05b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a816887cae1397dcba16aac96b45fd307fd561585d5b3c01df33e9912d7d42c6053ab6927291c9cbca48001c90e14fc79cc1260e7ed0efbdf24114fc926a5db8"; + sha512 = "991cd6ed0e8470d3896a103fd96faf945dc73357d804552fb6ecb15144aa7a75a0154974be0a41997343b2c7e55eed16f1c6d864f1d556101a9eab8436aaba8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "014d9c5918de4a8dd9dacaa96ecaf2aa1d1831c0abf2aa1fdc13516bced15aa47da6ed6eaea3552e30ab06859a9bc38a4cd250c38bdad8bd38e8251e94dcd6d6"; + sha512 = "0ca184beb54fcd0a494ffef3bea069db2bd2d834ae09d1d30073b951d0ed7556d805bd9d2c90b1343e3522872d6be4a2f913f17a7682e16fd88dc3d33c9892c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "34f889e008724b551005a17fb02c778b8cd47b4a8051e2b342425f4bb4a173d9971b9eb963c1f875d104dda0592a9867d398310a49e3c8e5f7f3da9d76fc1ea8"; + sha512 = "5ba9d89726e051a3d2b620bdda0dde16d79c3dd8fe8bf3d2518c4203d3c5109052560ee41e288dccb23bcae8a20319165274009503931d9fce04085376b44d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8e8109eeacc53901990309aa150a2ab5d844eb99cc0f2fec4b74d55690cc2744f9070390f4b7d093e7bc99aa7fc2d11a7fffde39c16e7b2b9eac68d775e5ef4c"; + sha512 = "3e118566762363f5a28acf0db68f2579dbcd8671bf6422583e868c50e70c8b59f7bbf847d4ee2a2b01fe199d0f0b7d2ddb3f0648a4726e39320744dd097cdfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f8ade5ad0ffe73141e9bcc957aabbf2d2a6236e2f8180ca8182d2f5274d528a7befd11747c02f1de2880184144b88503f73131116615e4cd4d92a427446b6caf"; + sha512 = "80e0d0b8199bd4ce35d2b9e88fd7602fd0c1f232251fbde89376c77cafc96cc75833d9d0b3756dbbe6b538bf237d57fb717b8ee6da4ec000540288344fa059f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "36b41c3234abf77412af408b82ad04cdb622b06effec71c71652043050b35a2fa0c050d16d3667b734595318e93bfa0ff5a95f57e88edc0552f3b74290e12844"; + sha512 = "f887684ad0ab676a063bff238bdba8e0a05e6dd57d7472b7a834c6443f5c5697788cb408ba11399f38b949da0d57b4a9e90bcedd032b3d5fd9f6e1029b6657d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "39001881b040fc7a323b9495d17756b017dc4e05bcd3af18cbd3f69016090ef64621fce35fbffa8cd352622db415f86a0961e12e7f26de190fd435d3189fb36e"; + sha512 = "50d422b2863e3384de0c7fdf5bb10abbaf878c047532865226d6af5089e8a87c1515856e3ad294762f2de0335d18fdaf9efaaa7bd95245ac29a0c663aa73bb57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "62d47a17da9f6d2b756303689d383fa5fa22c2d613718b95421310c750229607611374aad5a136fcce18c76fda5da5c360781a11516c09b66d39d74de95cca6e"; + sha512 = "2de27aba569a25b1f45a328b255c5bb7933fce48b0ed1c006d9befd164b6ad7af26b255c9688dcb86dc92a36b35d12c0be4bdd91e4ef08a398259eed2ae6d9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fb475b21ebb5236ac9bd5c609337b2f87e66de5e412b66b214bb8653e6658a25399896c69321ac1e738f61eca9a17bd730ac127fcba5980cb6cb79c639067725"; + sha512 = "70ec71c259b8f5935d0b603d586e5a71d28382e848543d81eb7a004d38530b6107be6ac63be2d908b47110110ec93331fadf33397ee5af057df35991909c5f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "58eda9278feab7fd25f0940c764d9c5a6abe405fa263b3d5861a1c0b62ea66f832ce89ee26f4256ec80da18714f72a3d09e3833fd52ac428e424a3318814f5eb"; + sha512 = "ae1ee282f71c133fdd3cab09bf44da6f1613ac4eb6679747ba3922b4233f76879aac57cb88a976b0c1135c08914d8aeb024a88cd9e6636a79e5010bba1d2221c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "cb0d29adcd6da7a3d1f0e9c8dfee53f7fdea8dd9d65f9292d9e27f646ffc07cc31e544cb6a458c2ce0178f7550afad88c235fb70ab827e4a53a78bd5db8267f1"; + sha512 = "d9f5f4dc2117c98d08d28098221356bdb7a86f2c48a9f2fa5826618a861f013d72455d14706e05784c19e61864241a923c7987d3ce5fc9703502b80645e81546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "98094ffe76a2b69efee3f2e50491d536579916bbc0310fe845ecc53a500f375a00fc381b5ec1640eb5a036bb4e2b064ecc0396cfb87d602948425899e80260e6"; + sha512 = "b05a5ed0231a7c36f179112318e00a4905120f4174cddabdd15e7425b669d7d9af319cf4fd81d87865afa7a9c18ef4fbdf16b271133884ef4d30951b19e9c266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e53617024bea3ff625b5cb60f76d30a446c2a759370656f7267bb636c03f353d96113ed3f536fc2cf86c38adfb13c8a04dbd5c530430aa4c41bf6c81f5c2389a"; + sha512 = "280a4a86b21c66757b0b21c5a1620720a8d395052e1b36c7f4968a628c2b44d6131e93eafa17c33ca5e02a002ddcd21304983f02768e3f03b854f31fe9ecc509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c8134e4db3f9eefcea81d2bffaffd877afca39fc966f7bccc5b250db567fe51f0c5e4b8d14b2d65bf0e0a297462dafdbd9dbf934c71bf8e4194cb3a81302f7ed"; + sha512 = "48b782b1e1dfcd68cb5a0529a3cff471178ef219d622db1d217adccb4aeb80d0574e10fe07eeaac4d709e8ff8425b60892a9ddd5dfa090292fbaafa047fc420a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a3a8252f420af629717a32979fcb0ea84dd8b83ab0132fb215b422697ac5264c06ebdf31584aa2c3b2049a78c30514ba2746f77574f8bfc937b4f30d5047a2b5"; + sha512 = "b2e9c73317460bdca82d08754c591c18a6b078b14f8f0a1f0544040ab618d22215d014d8275dc1a4d9ca4e36201a26404006dcf8ac9443b383afcb6983c07005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "36553703e6cbe18280001adf3db5fd9c922a592138da001726b8b188ea79d69ce6ecea80f8eaf8c79f37b90d635af55df7b0837aeade761da45a97fbd2e2ee82"; + sha512 = "2bc5f65d92b3dfa86485809fd92fcbd61bfe6fddb28a928385ec54527a4b1beed9d6db6db987dadaedc17639d1d1e2a3e5d8f1cb96f55f20b203c6e537749159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ebdf19484a316e737be220005e70f63d8748b3ea981f986149ea786aa1d423d6ee905ae34bf3a252a6cdb6b9f57fcd89fa1ba1ad9e2071c76e868388d2ecb440"; + sha512 = "6f85e6e2590f181f52fa79fae12bc59a1d53c44a8df75e360dbc7dcdf4078d02e6d34b904c47b214f7c23a978092b995cdab92093b85432907d28dd0ef054bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "8b2499092bc4de819d890be54365ba1be1fd8cf811b3076b426192d5b3f27adeb567ab0346c1596fa468b933360481d4b905c8ae3edaf0adaf315e327f0d515e"; + sha512 = "2d84381da9042b0682377660f8d524f503c4e71e2002a98d2f443d00d0761ea8aac59464a54b7807e6c133e7aa9f983d00c6fee09c4020dfa15377a1d662dc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "896177f3b46e6e05d64f3e6b631ce592e9f2590a65317126d2e4f5f3c3c35e6bcf5c9e292a57d0f192a5a18da6539259c8734bc49697cce9e445d08f700b282d"; + sha512 = "d38ebe9d512e64bddba19d4ededa6a9df596b43d61ee7b8d06c183884639d693a1ed7f1b2086027f30cbeb8eb5aadc7f8a902802c827a31751985509067ecd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "96c1bdd73fad8c3ffe3c4df183fe004e0db4ca957d2533048882c05d97052aac4798ab2a918f2712e39818f84bc6df2f1b676a05cf98d1559ac3381ffc4646bc"; + sha512 = "8f7d50d14c75137d61156a360330e8e086da96fd13e1a32bc956f93f5c3361943b8011ec7ce95ff1c45194b0adcb980d123d0f58e67fc7e1b881571d81e68adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4841a984d39ad52d0ae3107042883057f55ace2ed9bcc042a136522d39a89a7d12f07e3cd7e904b43560b3aa5627103192e0b4d0ab6ac2d6a3cc5986f4d55ba0"; + sha512 = "fd3bf685c7ef048b29fd10131b1f06ee4de9f5af5704ec1b3ed657678ffab6aeb901fc64a6a9461ffad4ae6fa8f04535ff91276cf15a886642821ef5f739217b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "84a861405d7573d526af7c29adbc8b6512f95a2a19340b58e72665758b0e67b73bccdc9801da8a965a9247b39006d5f64f90618495e2c7fc1280303295770234"; + sha512 = "e6711cf4073c120228afc230aaa4ba45da0b93fb7bfc10eb48f0cf8194ac9022aca243fc9457af208c5dc8ad2702eadce88fe1e598b86ba6c2f34eab426eaaac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ffcfff4ffd2f238fb5ccbf1156d341df9df9dacb39c725084e592d5a4079e58ddd9ae21bae187a77ddd6a5f4575f2961d09ce460a45d67f5f3ed3d36fc6c9f3f"; + sha512 = "939eb996a025362181e89e1a978b6cbca4157a84f314c3f75e43e5f041738548a467ff2d8346ec6bb76305f40856b8530803784a8feffbbd8cd3d77cc0a28b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "8cf5dc55c3c0f8d88b9b8cb4c4a78d03447ee04eb9463ac83148e723016388693ed4c3b36cf70e1875f393d410bfdc2c620873cd6abb72a228222e3da32b4571"; + sha512 = "f2e13cc14f3356ea205b0553de6a856cc5ca65b3ac2ad64026137e4fd018df71dbc308473fbbe8c5d77f63c813351fe5f8392acc14a90ff89fd0c0f971c4ad7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ebeb9b562828df9ffef7dadb1663e678a011198d61bc29ce075f6de3213b59952e837058d539d5af6467f0f44cfe7cfb24a5fcc0b691384a1ef16a84fb73a643"; + sha512 = "305dc29de3ba9f73deae066963c6d1c687128aa2f132ca1405d09da04b6a0a112d9b0353f9b59fe0503769301fe8cb14fb469e64de8d1e313ff3d415c032e33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "aef876e8326e52d74b65ac0525c5f3d4cc08d622488703e5e9d2d2468f929b85ab7b7917fb80765d1c5b06afe4471fd24475b972d3afcdca793568961d20d39b"; + sha512 = "61134d922d05bb5599f70106128911e1e7beb8430f1f9a100a5a32f02b6144d6313010e6fe29f7c422af4210c510edb55ffeafe4858ee7f1202f41941982f784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5162b011c54be9d464f6ae822b237872f12c9114f4965b82079512fbc3871ebab4774fa46c8003c2a5ef19405f38b576091e0525f09a3f49a5283ba2d26a47e6"; + sha512 = "83f3ec87151cfe565a3e350ad98558741a6b4e8c72b5f36e0aab07d4ac26ae2b4d6622f0faafff8ee1a6f851c723349bbfbaf175f209bd97ae8bea2c4ba811e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cfa9f6becda5dd1aee89a57e6ddd0dea98cb993924cae54e535b6f553e8b10806fd9e9ca22b9de882eb21f29f82738d4d4cf3e8034dc06bd1cc7345930a85d36"; + sha512 = "99f781590e7bc8ea63cfe13e3fe56e1f14346caa4b3e32d23d53600c0d4ea8f55bfded6ec422ad8b41eaa47313dd3726c952e547ddde6cdb17f6515308791bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "50e1b2561b38fb2ce1c6f9347c441916d1ed810fb3c51818f353a48720a27d46312fa3b0d77a0254e9dd3a72b86a877edaa10ca2dcb0a62c884bd086206ff0f0"; + sha512 = "27de47eb3ec0ed3517ef6a3cb00933a8b891f8f1c1cc0e9c4a7ae2b732141c8872dd35c8a54bf6c5ceaa054360e053f5e52dd2c5cbe2f5ca4156ccc8ea337c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2601e6276f0351d8180c18f4ee2247e362f997d58764b31d3eb7600b22ab1831ffacb150be1458e178c186250109a73f332432c64c235480b1c0cbad9d81f349"; + sha512 = "25fbf0d23dff1f37d069e34afa3b8249da51e33522013608b4e623b0334ca63dafeebbc6db5718ef829282a78d0fd06bf00d6233123e0f405773dc1188dd4615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "136cef825011e9ab2951bafdd5ea24c41299099c50988911fed7a413f42c318a704ac8078c74e0fba1899dc5970ac750b1b025c3b1200ed39078262cc41a53ff"; + sha512 = "e82bdef3a02f356eab85facddb6a643a0059de873782691bd663d741f29f06b223acc6e1d1058a5f8a0692262a764ad019abd1b77b1d5bd5610eb9a338e2fb43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "29055d41e4923485dad3b76b1088f74821d5c8367f4f1d71acfacb4a248803750b3b0b4f339077ba84dacb31d16967f67ce8e432938078e55f830f78ad3972cc"; + sha512 = "36e2a43da67b1f6e941ddc5a68db953186af1ea0f505bf4a1affb70aadf3ee5f9a61562d66fb87007ceeff87ff33fe5244ba1337f83ee187cb004b9859b4f2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "28eb53f5d1a6f0869554b44199b1efe17ff4784c274c4af1e34e0cc28f6d941a83030532b17c7050e42c0e36f328c80ed18f715c5198bb7db5b0cb107b0e0173"; + sha512 = "45bdb9aa59647238d457ee1eb61ce31777734b1054a7045b0ab917cac82ee0636aa033a578492966ed2c405890743334b942c962cddf00c7aab7cc8a2868faa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bf959f4f160dd842750968561c902e68289e4a204a36add8ec3b6ad651639aa0cce9d849961a7eb6bb7b40918a059dabd9aada3b23b367e6b6d22578433186dd"; + sha512 = "cbee32deb9cf59e94f6144d88f8b78d053fca294f050cca739e81c5cceb33d6c34153a082413317353bf5e792c8ad1c34a3db34fe2bd5cdf9c7f59d70d050d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "84b02bc76542d63b006ee96fa3a5302dfbed75e198a7e28ccbf31d5b81f5ed55aa3501700a8791d55fbebe69ed16a826e123e498ff8c846a21e818b477e25e72"; + sha512 = "f824fe5a4cc0b56e7d479f3f54f33ad939e93c9911c4a133e567607b325c75b36e0ae40b2c4ee52eb90ede34f64fc9ef83e56d86000194e453c76c8cd505e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "009d040a98df25e6c02efb89bf04f5a3a6cf177bb7583773bccc58cd67bab56cce50c3b91bcbd563f4392c7203b1357322162b6a6033785516151f966956fd68"; + sha512 = "2706befded2f4ce9c7bcbc907dd634ae90309dc3e55849b2862498323fe854d563f7445701e652d7205e41f3bf23f17bbf7e7c43ef8e9808cb63f873d3a5b343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "35d02da918f0c5690e996ba1abd12b3c96dfe7cb8081680a6dd3c70d9db1acd14cb07b18908b3a4c89100c48f1ae5cd3d0731f1d7ae3a764c49104262d16671e"; + sha512 = "572c907f6c8d8de9da98a68d74b50a17f073aa2af45d7c6d3af1e637ef9bb7192804ac89bc77b10a9e99dd0ecfd1eeb8b5594473125b1265e41ae91da1fdc3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "809a89e3000c55606748ab5e5b6ab32e2902a9a6adbb2ef7ad6b25c8229983e031755a49a0f87a0ab75b658099a353f98da6b7576282b0f07a53cdda17844ac1"; + sha512 = "48d3b243d4b656f6ffaf18d63c549c71a530f4a252f368d879f5c854ea8107674b50b4ed4bddb5c36d937b7652bdfc6150672dbaf639eb1efb1f2982f2b8622a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "43e152f761294da17606e31f6f5bb5753b514f530304470a7f3b6f709a2ac58c97ab6290c69de9412160991185e9115ffa8c694cb819cf7bfd30d37c2d32eb9b"; + sha512 = "18d4d5e1892fdb647b4decc13e4e48b74195f924533a32c1e7a8387e94b51d02da2f7accee7420d8112093951a311a7e871c8547ebcdda4c3226f4fa5ce294a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "caee87b61c156e753e85428f215b0602cf1c0ea608ac6ae111a706c827783221038743178560126240601912498f10a555210fe2691e38d4960ea5df214618be"; + sha512 = "ef3cdf002efcc9fc2c3fad7c0ee0e098b0a967f610066d7efc180dbadb30dcd3d0696136391f15a9304758fb610a96cb84321d9e40bfe28c36e7f43a96e1d7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "686cf21b6456e86de1287af870df6ffbbc726bb10aaa564ae7e53ad7ca08828babe2d99cc4fa8d00fb001f6e1a52c3eae0246e493147020601ee808e7b8a5226"; + sha512 = "4bbc24ab9700af5449709fc2fdc612955e3b75e5973765c698ade3ac9f041510999033edf5a587983ad62574fd45eac467043b1a1671133cf5b9ac07834e0ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "81f7708bba6356127522de30543e3a6322735c9c1b204a18d89adb7d6e848f9155f6929eebb4509423186c807bc8f874501e3e3d4ee27d308598ade33a7169cf"; + sha512 = "987ee31ec5ae384c6f6dffab7583a246f1d67fb94aed09ae3d389eff8e3f6d898fecb2afb0db41ef7521ca5c8d8ae5f525071fa7931f83524462634c3b3d049c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "527cd14e9593d5f01a40a016d3eb4fd1375ce6286f926f47a05ebab0332bdf1d3359eefb63413ad860d1779e82a2065c46653c61e38f6035223a8fca9a5a56b6"; + sha512 = "e419094a4bffba6e1ed263a14a92039d861832bceaa1da6eb91fd2ac07f625736bcfa483434f303c6370a8c4212f32365bcfb469cf8183c6a6bdae59643ba42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ff101783cae4e86a897caff95bb1d0d7b0063b8b3e2428debdc6d4b4b294ac6aa486e0e68967808f90f230e69885454243ba89c69a3aa766f314e08a0184bfbb"; + sha512 = "c65d19533e0e9174a5a290dfe932284109308f3a9a227a59b533ca5d68eeeffcb064d52bf407baafa497b1b569cbf03ea4f5565d6e39b2886496d2bae9aef2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "08cb22907cb3ec484cd510e6801fc33e6b2fe3df0afce5f8df5f84d3929277ae9bcb5cc555f0644e8e1e5234a4fb111df7cc92dc21a2549b9331ff12e2644942"; + sha512 = "19452bc2f73d53ba8eb6d5d5b5a67540f2130a43508c7841b1e724e143783f973458ae1948e71263fd1bd9ff12dd717f02a6c6e57ef7b165d189a7428bc00007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4064c7acd0c8193be70a1f9a4479b0dc4905c24497bb44809ce34815e953d1a0e717506751d7ad43245a08f6df20cdea54cba4c588cad917c2344f335800ad0f"; + sha512 = "577bba4202831b92ecf74484016c5ea0cd9161ee64d6df2bf0f81f6ca88ae718e64ada78d8d3e190dc3a54aa9ae15881b34e04949f6c6376bbbcf59225a9b6ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f76383ce08ccd80cff05c4242de23a82e3a1e12ee02af7f73f7cda8d03e934dbf7e27490c4134dde712d7d05f6a9141cbf13e3f7234ed27f781fc823b4b64b5e"; + sha512 = "80ff213322a015c906adf43f278f0ed7691964692b036e8bd03fa9417f46bd7d2604b1fcb7f6d1038741c592b1ca63a1accdbef1b9e8e40e150230f6ccb350ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a86a1f537e8ff975a55023dbc6fe6bdefef7ffdb674305e5880750eaf4b5c17b7d866607563db77cb20cba097790822643997a9f93d5ddb72622719aac793be1"; + sha512 = "542a019b300edbee543e86b265b80f899dcd646423b367957c255be864a4c25f1cd7a5e566368492f83c0b76854d48563764e01cf660d41666420c3d959f4505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "fc3f9b62c181679918ba9b1085ea35dff6c7fb583445ef7295b62adfbf6eaf4f4cb110427d1f5a05e5561068008d6ff9006626be8bf95c68e87669e69fa4ee8b"; + sha512 = "b2f158e86a62c345cb82fbd7be2d3f4888c0a39d239b1973083ea7f710da755b160ad5b7b0c2c15a11ec4c7f707df9aa5fa1f9c479821bc7bdb71e5732410721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "614026b48fab34f0ef2f5cc91d36afcbb3eeab3c905d3363110382596d23983abdaeba1890abfe2d7f4ff86db3481875e7837c9fd67951047af2207e204b2b0b"; + sha512 = "f78ca53fe7fb3a74b46cabc079f5ed837f76196a0253b7525fa7f0e9b0e96c21f0c93f04da3e6b50393c262a34cc399d3c6a2f02fd5e75b9b05ae99a1237ee18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "0b2c7e117f6288c2e7a584edeece3b579a1a3116d23e825d39807b6fbd33a8d3e720918f90b73d8a8772d7ceb8ed3a578f667e4993cf1c38b9b04c28463e5e89"; + sha512 = "9a63de9bb32eecfd7cdebbdcd43ecf8977a96a73199dac06561964fc874d785e67db5583b7300023048524208d7ea6d4d83df68d713ed3227fe3371269d54951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7d74fa5332648397696f1bf656ed925706eb90da46273df0e0ea9438dd3498be6024e62ead0bdbbd835f37c7c685daa348edce0fe8ff264a1ad0a3627ec079c9"; + sha512 = "0500919759971c60007c9766d4c719ccb3f794859aee0d06ec46b552cea6186b0c49a3e0ae7439c48326e6562a50cadccc138a1ed425d677aab070d15e53ef89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4fe7a9509463b3980551fc8317e21b71fbfae62f76a600a7199139d64e220fc14faf3de1f4a35598b1bc3e1fa41659d0ff166359b125c4536df232bcb53cb373"; + sha512 = "96043eca2dc79f2ba635b7fa930219e1e8995f7983c9aaca73d700153002cd05375feffd9c501681ae73caebb060ec7c6ccfb2a3666f8b6424575728f1975f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0cb23d92701b076e828dd036420ba44ac0b238cc66e3065485e2d8fc7c7bff3410a87fa9e4044ad7bf9c79a016de44525f8cf321d8a071719d8a712bb10afbaf"; + sha512 = "603b9d3764d92f3fc66f89e451526749ae11c5329e4052e81d1949bb17171e0d1536b6824a9b0fc9017b98ce5a7ae31adfbc51583b275a770f361b77d6dfe742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3bd497b5585682a52f3d16d9bbb728d59dc39de289fc3b1c9259e28f740db8e55b46b6ade290ddade308974d38877b972fa50c89a982a2b26084c86c0739eb42"; + sha512 = "dc7447ec483b1419d8b752045bd8380f2678bf976368734800daae02085d99323a931954aface4e1f701f970a3ad70e07107812fe930eb300a1458a14ff88b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c35266a35160b0b333f87958de81469f3f5ccf3bcb4e6e2049768256883a6f59d0b1d42f7b67b55741af81561bd227acc00e2912709ff72fe3e8787b680bee5d"; + sha512 = "f63e391b4c490ecd76d3b2806f4413817d0ed8da5298cdf2e9da7abe0499ff3fe612474f8f040d35f186a9a4cc0c989074affb26b8ee0f25e774fffcce049f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f4c6924895f9b89dc24a8f1e811d11ee5ca8c15c19ab02f58bfc9082afd05e0c4d4e3b4620b16a28deb70a7237edf6864c7a76b24ac596a2ff88e58224ad61af"; + sha512 = "ceb3d5005b5e7b2edef0447ab9372feb14dea49bd0a3d2946cc7852f30aa0c174a0535c8edcc1e5164faa3c7829f5016daaa3641203dc2690984cb2a72cee626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ae13d6b0a3df9cadfff91df9acc1d45181d96519099fd3d2d04f9fd5d3c21f3003e893cdf49127e4a1cd57c38cdd38feed0f321fd3165ba38148dbcdaecaf2fd"; + sha512 = "a2d4ba92c6971e99521617ffa1ae2f047c63d106f2644ad22a09eb76aab516f1468fe6e2aebdfa71b51a9d92379140e19f5ad968a11b61cee027cebcc84d0552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "423dbd22a046a26225573996ccc9b1ebc246a68d978c832ab04890998d507c24f3c19babba656d3615a48eb68c928c4f68f5766f137a0555eb5ababaf2d6d34d"; + sha512 = "00b6358ca10bd1728f80954d2a2660888e1c73dd2892855c72ab3ec0ba746786dde29e6b7fd4d559eac704fefd2c87a05ebfee1c226eb46440ef8ec354c08fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "52b92efb1284da07f356a04803d13385861dec151dc243f84d36aedfcf3a5daf5f77693aafc76337a1cff8c9712ef6ed8be1907c979b24af1f155234a5a9377a"; + sha512 = "2b3c154a9ffe91e0882e4ac7b42fb2b332e9cbce726a68522f9a99d159ab11d2aa75ffd017d8d0ed73ba700c4612e4802ac9a7767e2751b2833d48c850536b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "91f3cee6370404ff3a9a9f392aedf5733004869865875f7dd9c7c7a4ed5fda6816ee6b58f501829eb4581f070d357358bbe9b01ac434d395986b2d5e7c94cff7"; + sha512 = "71c16d638faa108c26419913f3bd7ed5aa65774a4a1b6de4b89f1613290ffb321ad85cde2a423573bfc0fcac2a6d26d2235318e87f4a534919e5726bbeecf910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "50da79453d7c95927aff9de5ee7a3da70b91ea8cb499bd8b2048868dce095a71075997ef3e6990a42f657417c64c1c3da80d873e978b7d536322e8e23773c402"; + sha512 = "f45356d2b746928c1a210489a8936ad267905c192c9bdb8c703c86cdf52a9db0cb118512649803c5f64a7f7b5c5e9bad1480284d09ce16f27d1630ce16326f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7c4ade5e88227ababff39e639c6e12496c6fd5e4c4d9a94ab59057f35afdbc55732026838ebc3402a83ca26115cd5ee6c497ce2ed4de62d32423390a2308e010"; + sha512 = "64310a4d25756915efd8a586861419a3daf6b85ec3c5fcf52dcfe0446267f217fcc11f375e67e917f37177ebf8edd5da9e945afcfc114ab90102282e94e39d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5592130474f72a4ac1e24095b84dffbf043c078b0e78e746f5c8a69ac1aafa907fa28dc55bc89f82b9459641eddd3520b5ca4e6d942f67856e5f44e920a3a0d9"; + sha512 = "87e5586928918b8b8c294f3a3c229c393abd116ebc27ce64f641671a5cbc10a0165ec62f8b4f9fc8fee084feb51fd16a43db6288dd62abf6f4319cf58a3fc0fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0dd59de2256f6bf027fd746f9a575d5f958033439d1699cc08417147a9da9bda0bbfd198911f46fe8df6daa1d3d91e23ffd88e391be54a5496915e4437b54a20"; + sha512 = "fa96336f5db42925016592845cece77d369775ad8463aaf72090a759bac0c69032e1b7379b1be3dbb2a131d5f3dae3317d5b0dcd9e36f5a91fe7a2dfdbc9d5fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7d3f1c6fe9009c5ba6f7e667a586a52a08e7625fed869f9bccf8fff6dcba033323224fb405841b4e6e2ce0f676cd0f6c06b1bd16ca939b473d24345d99ee5936"; + sha512 = "7ddd0ace9adb84cde7910c0b247468e47b802d90cd00307f9e660110d5fd80d79dd6dbbd9efc1baae632812742c977a58d0d8f951f1c1e70648a2b2054bc63a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "067b3286a675c359c87b77a41c8d7eadf4ea5558a9dfa6961686141a0ca2772998e93dd821832aea019d626241466e627726d64adf4b7c96a8e6e48ee6b25e81"; + sha512 = "a4a1eec3e2e62ba617cf6a921f125522a6ac49a2f5deff0855dcbee3037f17f6d5e32180a215893028f933dcdd879c95cdcf4f133c6c952db073a7543012e474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d383f44caff525e73403b5c643ef38d2ea5ef72f4fd6a432f019bcd554be010d8b7575a682c4e7ea0c9e514c4e60ca63481bdd294605064f2b9b94798d825505"; + sha512 = "71fc1b5f4a1525e3358783498232db6df0b92b52d6ac2420051b5f15191c40e94ce3c7409b917ba171e1b8c65b316e771b56e46812b5e9421163c9e6267adc2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1f24b54f2c3cdf382503b466df96ad473c2e8e153f4815720e8ae8d9a91de365db987211a0419e143680c9241aeee5417b8d382787c589267b8b6e4280848123"; + sha512 = "8ab57e4bbf78abc9e6ead70fb579d0c5c0066ee8297941e6030a6132c74cd965d23775029c7c4357dc80b24223473311b13f0a826ce7a763a4fb87b80de81f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b06a23354ece3b3e874015dca4836ce6882870844d01e1ffcd0e965f4acea32d8ab90f89e0bb2eb0ff9b558745afa623db274ac6b1a7bbe6a6726d79fcd15fc3"; + sha512 = "3ef11e84ac83cb2c38b029342b4e7782554af6831e8c18c27e12efc97243e2b84e041633b43ce8d4162d451ad0df6109481d94c3bc4c9bbcea27807427c9e830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b98c9d5bfd69c30f152ba592767bb76af25da59370526180aa6a55c703498d0967e5488e42b49a177f610a57f7cac9e1eda505c7d4691071873cc875d01d24e3"; + sha512 = "a795e111da79b03dcf73c90cfacb58d56fcd866ba1a7d5d70474844d91586eb98191cde4c18cdceb481cf5be3fdf7ab2fe98f22690421877b9c9f87afa8c5bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dcef4e5408f26632b32f0e3e91221af920d9f039ad6745a566faa555dfafc3ac79909176fa9d97967a27af6628dc963d657cb9270842a701c528c58064162756"; + sha512 = "8dec0be4a506c750c6c6cc3a52964b6d3cf072ea6a37c9d5a6ef855eaadd3b715ff48fe9ee320716ed23ec56889e3585c729f1f8c22683d45fb1a04a344475ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "217f9aec9a46c8bb93108b4e5fe24a16c4c54a74fe481643191d45f0128491bb84930e94a1ef1f6f5f0a1af34bb64dc090b3f6fcf55d4ad6b0718280e2ff6906"; + sha512 = "e9adb45a8e22243de0113007a3b6f4f2eeed119cd326a0024e3b7e42abbbeccf0be26c8ea80c951e50e857fb773cfaca6532b6ae32df0f6516421b1d1683d98b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4f58e27746a15c69312dd3ee20147119e34ba504342c0814679cf4686978c4af13d77f277c3dea92a8302cdae5dd9d2da58daf3d793e25ce6fc932d1a98db20b"; + sha512 = "dece61a88d1a3fa706a26a847601bd633c06dab512afcc4815c1a379a56589b6afaf2877658f9745d328657803e248f5c22d5e611db79c46b7d78d38f3819778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "19fd4044d50146827514c836fb92aa3d2e1bed10795c99b0b8cddb5436ac4cf9aeffbf2a9f472882b9f1b1f1d2688c8a81730e25083520f43a7c79b1464f540c"; + sha512 = "63a57a44e92e2dff5e24dc720aa1e2c5f469ff670b839ffac11ed27e242afb8fd30f5472d6a120c0d9a75553242e4017566460f0a374ba71e08cdb967bef198a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fb9590e9be48ee8ac2e0a2704ffdc32d26830ac46bda8038563d08fa96779ab90054790a44a063634a1abe7388e98b44f34ee60a770dd03084e37a49b3993a9f"; + sha512 = "f4d2d08315d00374bf1bd5f9b0aa156df9fa27676c191bb11a8add1396f506651298ccc6e35f6a260c1d1ae36deee51c0aba39dd0a996bf532f6c627db07d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "abc0a9fddd62e3b311ba15ff8edc66e20b68f5d1fa5a0d2152b03cae396df9f2e1de0c50b70b986381661646e3c857f85e5d709eceb0b7572d8e4b6cb69f7445"; + sha512 = "bd067c5ce137d3d60c2646c6121823c5b2d466b1d5e6ea8b97e3a341ac66088f6d7cd86d1530fdffaeb5a9298972b6823596940ed8133712e4ea2420df337f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "14b1d590fc7b562e5a9d15a02c52b09b3afbb4d14ba4f8ab4b7b2779db7c92515c0b094a3efcabf30ea54606fcee821684f697110ecbde9d8e1099e389dee6ee"; + sha512 = "60dcea372bc427733d1939ba10e476545ea2545ab63358152947d7aa92581800384e4f9812945651db911523c48b7b8279248d01dcd6e331dec8457bd6eb68df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "aa0284796e51726e90e601e948bac237e9b214454d995789c690b8f17fbcaaf2f9512d0e54bc36cc1676d5c13428ab006e7139e3bc5fa16b33df99f176c80369"; + sha512 = "ee0120540d500cb9e23843a970c9d0a7c4c59d93dce098580e0e26a1de789d82f86252767553f42b58146c8c9bade95de4aa0b0834c8c73a9654bc646e241ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ca930637b1bf17ddd7201da883633ae1eb051c31ecd11f7e97217cca2a9727d1ce25a17182dacb6db077527152fba7e477a2995188c1c41f260c40aff189fd6d"; + sha512 = "572949804891307635ea3edeaa3f8a2a5fd9417491b73c3314785749889b32a89ea454d84b87e26af78f06bd65a9b40069e7015e12de702c68e1600f1ff55291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9dbd2f0ace46e0251d2b6e1404e9a57352750542dc23676ad0b615650cc1ad415ba585c614aa752e8262d7924858860eb8b6ea123fe9f3f2bae52fe6b5e5ee4e"; + sha512 = "30320faa886b39827eb6a167e133b205e0628570c29013c123f30919fd6f08c9eee13d9a989d518ffd5a7115c07b0c4144ae7ec1d4a78a6abe130ad1b6ecc3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8245abd62543e71ee4c0f9ccf8e20f45669427df7d8e4dbd8f252c53f3e57d2aab1da0bf7821f6f0dbeaeddb2201f2e345c58618207733024eae9e5d69f9eb6a"; + sha512 = "d8caab89ce3d95f432f5e05415fdd2bfabd8ccc4019312df87d56aae9cbd991baadcdf4d7bccd2c549f01f4fbaa3bdc08e48de36258ad1dac6cc91e7983c4736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ebbbbe4fd689ad68336e6e02fd69400fa339ac654dc0bf7c77a8011eb0139eaf0836fb7cf9ac09354af79b31d150383e112fca56444a9313763784805ec62dc3"; + sha512 = "f1f063ab4115fb66fb3c16330748be402dce101fca5139ac62174c4efaa877282390a435a1998d28950f8c2d37267a930f8b5c72ff86ff88c3fd472075ea0794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f603f2c8d2f6c02e7d508cf5a8f2884cb3b15af082b815ac37d8b6276b39b7fa2ab685814f19d9bd317b5b3c9f24385ed4bca887b641a7f3c715ff81822444ef"; + sha512 = "dc35e94d5329de50ee8a6d49bbf7c1a21163e6e93d94ba42cb9e6f15e7b173d21df218388130d9033afb6dc4d4af402c42614841b22c97d98ce8a68c8a1b02a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1e5e560f04ed6f04c93dbcbe366323678087829197496bf76d4ccc4bc429cae44e875aa2b0f1e5282f43f8f7d699fd0a3ae928827d77abffa77c8cdeb5a7d759"; + sha512 = "295f600dd18fb684534ec301541f144bf21bdc245d812507cb8b7425c46337af4100e8cd9265c5e9b3bd76e65fa2d6ac48619d1253a4458b7d2a5d003366c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c6149c7a5a29dc9ea1863d96a75d7489c069ae658538bfba0bb58a79fccf5987ca6f197e4a72d18a4fffbd377ef96b3e73a44d31c0c9d6984527b5f63f51c2ab"; + sha512 = "77aa3e08489d5c2fa15c793ef1cb514c7f210eae4e24a331513e7d40a729f58b92b339ec05ce646c9861c8524bcb6e312af267e4db7586ef058aef0e53e3f5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f305ddc3f1a91df5931906cbefafb5f05c2353fea61630105f127e33d68474b3e6eda1bb5566a567440ddbfddcf83193604e1ebf1b004813fd1c1f3d3d8d6237"; + sha512 = "4da69920ffbc3120a6ca75da79252e6bf1ca97b4540315683599cc702b6c3db4c996b0cf0565a9c97ffcf316f3519a8fc16529350aa9e22fd6b4ca48f734a289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1fbfc43f3f092818f3c791853c18bf1973105fe8a7b357bc3331f3a6f5b35366bb7a530f7c6fd4dc7ce1a2ce472e4c7225c043d11f9ad719c67f2ed79a44785a"; + sha512 = "12639e719842e98181c4c0fed1ba284da143e49d42950dc350c7ae996bbe07154979a2377cf59b2979e91f8b75a64b9e7ba20cc64388de94329488d1151ddeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5d6b65521396d2860ffd334f4827dc0854a96418dc3e95d867b44b4ca5072b28057ba55d86236858541182595052c3de868b121e0e52c4032fa0dae9eea81c34"; + sha512 = "946a0b00c94a030ab0547a0529b2639d880795c821952a71b467f199332424e42de4fa06c015208d58be12e52ff5044c8ca40dcb57480a838b4688917e9d527f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b545e18707af5a7a6cab6306dca12ce50f07586d6338ba1d72cafd891695ab04d85c7416d35a13bc6ed6c1fdd460df903b1fe2eddfa32d75f5c5fc7f3a1fed87"; + sha512 = "7f71bb5dc8af9733b3cf14b72e74034942b46f06945870b550489e178f21c348da4b67fd4c7e51c601c59caad9868d1b64dd8e7d5ae5976525d57b739a847308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8a12935dc84f34d7c9df07406c7f228121e31602e40a5d1e061d90a13fb235142affa70033902ee095addfa355ebf41797d136eeb3d2c06297b0332b7bf8dcd5"; + sha512 = "79ecb68f4b4da883e7238ded7a40fa9e61e830926e5943e7c70d7fde63d9757963e3ca7c763df12a929615a1817580074f661f03fa02712479d1b677578ffada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "27a43df4c9d47510e694062febad58d19c5b57adaf9106bdaf9b3ad86c8e47daeb34e01ee346c92fed45126a9ddbb2cd3963751fdc8c13e9c974300c8105b640"; + sha512 = "c41ced6025916634099a01dfe9213472b936b89e4719cde0a1a06404140fc564d93b2a0188b7cd74afc90dba4777d0919e64ee496ad9fcf76966f3392f434592"; } ]; } From 557284de3324ecccb4b8967ea53b45f96d2c2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Jan 2018 10:41:28 +0000 Subject: [PATCH 150/185] firefox-devedition-bin: 59.0b3 -> 59.0b5 --- .../firefox-bin/devedition_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a20178cba9f..23ea0b80267 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b3"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "2a08f6447c5451cd7fbf094c3e263db55d37128ad1969af30bd904ccc43ce31fccd73397f509d21351304ba19ad06544e433a1b9e5c05c7f58e3b9e219ce44c7"; + sha512 = "6de09f1ba2bdfb652ed32a7cb64bcea7afb52f29eeed965c02643dbe032083c7c37e5151aa03033fb93c6b29fc1f2dac03575af8e03887f74fa0e3161294eea0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7d9effe3b13a05e7821eed807b799968fbf79e6f20de9059b7059e7fdeee4134f82f47cd417d555d136ae7c692e64ca305b1e79e7b348e0d817c9dd26d16cbc3"; + sha512 = "44d2b1de47ed25b0fc363b310046532739cbe16281ffa43715ff2e0cab090dec91bd21d237c06eb364f0fe015258fbb2366015a6f9be12fbf6ebfaa1bde165bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "5de509043b42c2979cbeab0c05506de65477f551f7be2cd0e84035463819cfdc841cc0697def15a1f253b9ba1e189dfb8e501bf2341fcc03e7e17ef7188b436d"; + sha512 = "2c58f4eb227b58ac804d98cd6388fe2f9630d423a2ab45c5c4cee448aa6a07aeb5f7e54f373a39dc280557d0e2400e233100b5721465f96f5cb53c28289aaa60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ff6f78ee4889e56b6afa2935a4c927350d01ffc1d28125866ae07525a6c9d6cc8dc28416ff9815a539eec4fa936e7f292178289ea0484e62491f7c908c521cb5"; + sha512 = "1bc623e6eb796a679aa3e60acb418a49dad24267849db4e54c962b54bd3d2193444bf39912075dc3687b83f5d579c23d4ced940102a046608cea744ecf0fc9f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "52e1991409108c4805d0a0f90da32533ef5f9bc90275a8cc4053864918417813a0c12507c06eb04dc61deb5385800a82c9f43ce29772efc8f196ac7481fc4019"; + sha512 = "b40d5955835c7370553967ac32870c47625c493992e1f1672be363ded1a5a2b3637cc3b2756530f324aad0149a84fc90df5a0992f16aa1b6939c15f6c8ef9d14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d88197793be6c610208749c77487afe018405f4a21107cad46e1a4d62b1dffda6083918a3eede403ac726eba1baee67f5ab55938f39dbac6270c4428950a38d9"; + sha512 = "e9be9a5b55504784cc6531f90356a2a256a27ad20faf5880b5eae58b326163d43bff138feb48f23993e6d9715cfca8bd48c601cb6786129ed814c5c9d8e97261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a24ef7b0ea1372e91f5b82dafe955fbd175f0cd00a3323033a706a9184965bbf4eb3898bae35b85ce25e774429fecf2b3463b973ec5c2c7a409e455722f64660"; + sha512 = "f067b3e1f4482dd32f7dbb1611f33052d55f835f164e7fb23bbc7244ecee3eb11b49b49447cae2c2d29b29c3769296ff98fa716a9171c8083825f6403d2c7fbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a78ae804d8dac484b8fb6a2ca526ffd3fccde4cf45ef075b82e96338512d31f69c45aa6edde795502cb7ef90c6b8a81bce7fc26c1bcc2898d3cd30920fc90b12"; + sha512 = "489f7df280844c60e5badea653c51c9649dc484ca7e8d114309a4849afe3cf20c4f3dde58e041500d654d40fdd7452cddcafc971976e0aa163fce3bc1815930d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9d6f78ed4154fdd2d2a89c8881624e36094869870f6972a8a61a62ce84b90a50f679b37eede6c1bac02730121b1df61be90065b6932736c66eb12f18b7cda69e"; + sha512 = "8e563ec2b7640369134c1490b753a39de957b326042547805d99fefb24c5d35aed09f6dc66a93077d09d367542a64200e19729ab3e7f86cf30d7444054f3f931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "7208b11b55b7042d401206fc9d6d035776fc0cffc4945c81185cf6b7fee0d0861dfac76578fc27234ba908efd465f1283cfca1963877ab1b030b7d599e8b3ecf"; + sha512 = "08ecdc5d4da416d6b2119f328137db2f707ed6dd9fb49084b8b4052bcfe7d221ad3e9b65ebca8b2f72e728603a30e66c5ea21066b7ce7a97c8b5c2aafa2eabe0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f14376e94038ffd564b8bb63d73464bd5c52a89f8c1e883bc55d78e0f5df7abff67ccd7020783829aca81093093e05e2476f78050fa7cc946ccdab0d2a69ece6"; + sha512 = "981881c012a33e3b63bba012d4c692cccde51590b1ba75367ffad3d26b75499d6e5acfd8a532991f1901ec8a1950d58d6f3c629d48b2f8cc6559799c1792f76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b5e3b0c4203850e1191bc9e2ad3f7b6f784ada565b64a968eb80897460ecbea91fd4e21cbb13a0073df5fdb23e259a6f98df2b233c676fc5a831ce5acbd3f636"; + sha512 = "ff6f6ef5d457b4df00366bc872dbcf605568b6161b0ac74da9b1bde2c4e9900aecd62448e2bc3dc4923c4f62a760e15ca351ed69490213f7db31e62a0aa8874e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f2bcd8ea9e6d22778102e95885b152a669a0d7baafe8dce26068502f4fd975f9f818c1df5a96e0b95309b438f1bc42693183659060cca7f58de9183b7024cff2"; + sha512 = "19e98369d4c0add670870fff37d9eee743a6ccffc56d173d539c4a0bf59525969fa77f3e9f36a4d130ca8c8bfe817c0d9a3f4d3b9acec4abf6e7e2e2cd739c46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7bc7d66c2898c8ddddf413f41f0998a498f76231b0dcf10506b514da96690d879169992635033853a5a63c9e9043ad9220df5dbbbc9a48cdd02b5d1597bd931b"; + sha512 = "14a226c60421c441c835e68cf23d0754f0bc5639ca034e9a0e5aad766faadc57feff03b0174df87c1dee0ccf66bffd4530ddad5c264f8ff6aaa5d55c0968bfaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4bde7c7039b72950ea3adb84c32cffed523888f4a12c63e2661ec43483db175a98d864b0b70f6612c4296e607726ab31b46be39f2145cce4458f76680743a81c"; + sha512 = "5ec83245a40eebe7fc7eb43058149816ce2b54d35fb4b413a86f1509d59b467c0ee77a0f5cac3f5bbb4af7ef9068e30971bb00f40eb1a483d5b60e60f3d06c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a27b0be4082178bdbe7d7f5f5e9048b3bb2180a319b2d5e127426367f47f02a3c821ea01905205a62b2dc845005f9c0538bacef72e29abf30d286c1adbfa91c7"; + sha512 = "a0156ec17dd39619256fcc2c03722f6dee9a722b16ab1f0c8cfa0ff91c4110f471704f59eb26010d4f10f5e18facc9e4ecd1793320ec344280c5b009af3a5afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "25f9270bc08de85c620425fdd7c6d5cc5290426c3efaedb09e7275c46ad54bfb0d23a0c9e73d6ff5f42af4a7b6af4ef6e4651add35abc925a2a76d13e35fad9b"; + sha512 = "32f54e38fb4a3a79b1ec63e80d4bb89c652976f9b978ade25ae9e4e4a0957ab0321054207ea9251be256637615b647d2b94499d9b9b1cbc427e7671de16a749e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fdf7354e1aaf0cf8f76ec69f7dc67fb4bc2dcbca301e718af33bed648e1627701af5a956553f7b8d2ee7bea43ec7c94256b9c25ba32fb2fd7822659deeed7fb6"; + sha512 = "958ab9b7a29e3a0b71425345a643b8d3ffb2f052fa8aeac80d06c4bfd549a0215dadcb6290e0975b177b1120ed299a487b1c18c58a316d681c7bb7ed9e6de9c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a5424208058383ed7ec324839ee417374002ef0c3fb949183e51cc7e06c80e3a73101bc13b371e028af29a912bdb5cb212e3ae798475532621a9248883f70666"; + sha512 = "29e11ccfecf52fd1f6636de3062382c0476cc86644d8d7d0ad05ecbdf8c1640ae4064b348504d1e86f9fedab9303c4f504bb655f01bf2ef5b6607335f5f580a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3766884bfffcbdc614d3e2b1e4d9b455bb6599a5594acca61399dbef5017b693c15b539795c4ca75f023b95939d034f23b4ee706f49a0fe359c8f0ba1f0e3a7e"; + sha512 = "7b2542d0c4737f5665be10f540895b1af9fe5320dc5c40ab24feb523588925b159862cdeb18c9a4f14dc78715703c048ea56ca53d1fcec7fbcc9d3f9bf256cfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "fdcdfd8b83f49b74acf6aab98207e143711983505e93749d356ad4804045eb0d47c1af94b837a383c10a98f72f81eb45cc6b756f1c1f75b4697255eb312b6b3c"; + sha512 = "233ebd6c09a91521ff69f947ade1539ad136e284e539d06df08552c9bfb0efe4fb755484d6038e2161865e0997aeff93002f613fde3e93b6eb9c205f63a5191f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "dadfd5cdb268223682ee58833bb5f3ef23047e061cc0f9bb58db444973f063b12853a19057164fe57db8964ce4612767eb7273eaeb6ac2498991ca07651656b3"; + sha512 = "1bb4e2b3db6291c74769e2d335553cff68bd426fd3aec20e858d2db29d558b327f316e25b73ae0131e2cbee7a58ad337d85b05b347a2a0abe442473e94cf29ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "88ae77ea8eb15260ead00802d99a5d3a770b37aac180f107634ef466c8fa88b09e6178dd2c21e5ebcfd6a6e4e733d4a829f6ef97937a678f076f82f5ac3fbe78"; + sha512 = "72db0fb93a0a58f0ecbefcf27808439e5488df47851ea584101e1308e0569297a32f6ad7fe2a523af099ddd197845a3582f12a1c0381e080f31253a5334cf767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ddc912df5fe6389c27e7e7465eb5b4a2770a2603c536602434b9ca9dfb9ea06afef6ab327d54a13794f7b200252073c38d3526c353a25f0f797c3c0b50f9e245"; + sha512 = "58b0dc3614f56570556ccc20407d9070f8aeca22308b0e3975e44108b9c21a95546a9625a41aff6cd887aecd6119390d32769295e08e88de76ad0b5c48a57ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5789a9c91d704461c4d5c0a7bc4bfec8a36179cb4ae1a7fb9a5e953db6ba2e5ab7ca58402251ee29460ed9f14b2b3ad26ca3e5ef1741d7ef5cd63e20848d5e50"; + sha512 = "6b2b1653e3cd3c6858e4259f51dcf7cd8e34cc38445d995f5aa08461ddecf9d961502500e0e43f6059c7255216917305ce40bcaa6e208b027f22dab035b5dc19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b1c89d4e7b01cea2036a8a1e15c6cac488bfd4382cbfbf44341dc8815c950018afe0bcd3628a4e53fdfa0d9ac5d18f752cee7527dabfcf7c194fbe2d8b49011f"; + sha512 = "e884adf45c7b5897722ea80052de616cce2fe45dbb6e4af6c20f74294e9becbf5d2e15804772f23ee697adb66af2d230b2d3834785ce40f3989cef22d28f8714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d7bd2fa80f3ab8241267e7b8d911584bd24fea92f77006e4fa447d26fb8c12b9cb7e3ee3102b09cc5fe11335c01edd9eb9c8c24c48ea85d070cc66683c39da22"; + sha512 = "31e7bc4a6b6151a9411acce7ec713f12ce4fd00651f757d2ba989ee5c870c78c5bbf4453333a5063edfb0a6a58d533dec738bc1b93020855e38911fa29eaed6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fbf08892719cbcd7b3bbbb17ec668a5333fcf8fbe4bb4e25f6984e032396351e3326fb22ad69d62eee0269dc98291cdf63ba00796bbc94da3a1a9de1b7761e45"; + sha512 = "63b17939a194b1042d350c5a793262d674d41d6ee2e2c0cf92d6f8ed35f0f05457bfe4de61fd97c5d1bd2b256386140d26c31e8db6b53f6a04d0ddd0bbaf34d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "b52c39c3a8c1fc9b37503bf1839cf655473aa52c95b99b6de583cb3a8f3ff7cec6b373bf0f72e9696d3aaa52cf96b5b078376213998c671484b47ceea30258f1"; + sha512 = "d03c6a6b2bf9cb62b3fd44d8ad43b619e14489ffe163de376226f3c720aff84dcfbffeacb2590b11565f094f6b1c20e899d65d0457ae3889e054f74184ad5c37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "64960d2d5c8a837b5bf090b792825752dea124f0bafffdd77eccfa05ed8c130651c057b9f154f0959de8c0a187f276351c4d1366ec1b45c8183e3d3c1259a796"; + sha512 = "e7b0023505781e0ec8098ab98d2797a4341238c763aa5a0872fa4334e0116dc8bc74aa989522f7b2cb135c2c20bb580c8510e9e57f4363cac69d55b6b6d88d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7a4db9d48b10e5bd905bcd8795f829573c939e163c581c4477e52dc86e58d47796d9e82ce8c941c282984a206676ba2d026fc79c782d6a4365aa3eb84c5e5977"; + sha512 = "aeb87fa12ea9b5fb4e6e91d83df47f51a1e6c75f020202be6f0604854f8aa011820698328b92b3fb871599f9a94bf7f1ca2c0ebf0abccf84485e610cf5153ea6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "dbe26b5c7ff41baa782be380e551ed0f22624780d6c72950005dd6045e019e520ec0636dd126018b9db5efdc1ab7d044ef3b75a3216820cb17cd665b4553e1f8"; + sha512 = "e8718666948beac9709fabc9505e8963fd3f00b09342193fe455c7e56265402922cb4151be0bfce0269297a14304ac966aec8ac696b18e3d7227e5dccae0c1c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "de6a97c790fa9d3c5e60b2918c757b39da0bfc0e2a3f9f8764616e3c49804a7c3f450ef756d83987c2fb41af2f60628b793d9d9aa512bc8cd52d77e706f635ed"; + sha512 = "b13f2b8a6522caa16c797c37bba806742a93addf1e1a88e31294c0667115f57d72744daa0af3fed160f02997409d4bd6f7c9170cdff75eae71f5427ff4fc98ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "6b1128f3cc00ab3a0f7874554bc14246bb13972d4575f7251d570418d68039313787a633c6ea4cfcd336ba2fb6a5a2321b85839e62e8fa37c4f964a202859d59"; + sha512 = "4951e56f9295dd6bff569c0d76fe082bcf498af4b675041d78dccc3725be0294db5cfd62e49ad8c08fad81d6a53236f56519bdf7b4f4177a69e824df0054efc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9e45a76c2298efffcaf0d7ee51088e6aca0e8f91ca0767462e4f0bfb4d4431af18f3e038a0312c0ac2903f82ad5e15a7b0b427e9b12b202720413a1e3305ea4c"; + sha512 = "be5388a199d18b85347caf3f3691149970b614a1f9ca4da7e379e2b8a49e37c6a70953e7342c6621fe3534fe8a1e7a9fd6b1c05c1769ea33f7a51b61c5803134"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4b26900536bf4e851cb194a5aa6ae8e54df0c0052d6ced49ce733c6668a82449fd3ea693b1bbd2fec5e5d241d50c43dce52c0a75d201711117e9a5904f5d34e3"; + sha512 = "6468b03d724ad585d8d31c17c75917eafe908d155a4e4544b6f2a3f6ca467c6ec34c2c0a5d7ffbcec17faf8cbd00c5bbbf4f71660e7dc04adc337295eadd4ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c7e43f7f481478fc3079320861fbe65c66e7da53c9311314d8b78091a5e3b003af654775abe490c5d63c867e41306c733928b423b812303b662f333dce5848aa"; + sha512 = "531b36471ce64e3e9b1693081bd028b6d417b5c60543b9d1a192c67a20708a898595b80e7a2862f3f984e3c776bbb2b97870e6c88d4f474a215b31901ecf508d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9182c8a1083d9349c3ae307df350bb8fb16cf769d91960cedbe4a46c4bf050691d388dd87c988507a7695637b1cd7d3811a97a3806e0e9ad56d0e4a4e72dbe07"; + sha512 = "4b0df4896516396ba7593c579b528b5010d3be1c2db019a191263f28309a62d54bad9bdb013c8dbedd3094b22d31cd2a97c76bcb0045532b309aef3fa45b3260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "57179613f1bff56db0db78454a08a5cc3e889112ec6c0aaf02585066c373cfa73dbc1bb320021d7791086956fc9e3fcc20cbbef3026bc1a00a5e5cab9b65e7e2"; + sha512 = "c8c15bb5df2798ed16d97849c620002747554f46f1c89de665df151581f6832a445e2e969f3cc25ce4bb97833894fbf06fe4e48c4a2bc89c436443101b2a8a6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "59664e909b6a4fb566c4458012b90afb04faa190b8971cbbb084697942514d71a2af22bd25f44043c0362bfafed107b4496bec9561e26d89db64253ba8730f8a"; + sha512 = "7bdc09008f5171515e63ee2625cafc2a2eaa14f2f7586ba977a890f2304ead1781a913e959508d277c93995ee5be9f519eb69782dc7c48244547a0fa6a36f5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "74f4af669e347d246896278e61aa5c0c753890ce1d2ccee82d227d7bac8efbbc4f8267a1cfa548934a0620ef1a30f9668b7c956477833a43348748130314fcf2"; + sha512 = "c29a89728ff91d3b8ea6c83d276122af2cea578ca36deeb56619fb03949b5efab37210d7bcbe4c248e01996e9feee83eb0bc88b72575a963131b17be956d7d56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "21a60909b5a4a87c1a2a836be2f989d6dd71398cd1fca94fa5faceb68df09031aff807ed763f7a70ffd1c94a2236e2054319ed0fbd227a1d6b23cf74c15b55ef"; + sha512 = "a8dfa6ff14c74e5c9df282e97e1f3fa719dac2d440531d6d34e065a4cf8ed54153153f9615ffb89fc8fe84131fb008ab27490ff8152e8a048d00a0e5ccc02c55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ab34c10023fed053ff93b3ea8c1c3a434d2c9ca10653a23a87070fd4a16b92fa7b1190f20a0bdfd05970184ca259f856a792be32b7cb18becc9b39a47630051f"; + sha512 = "1fd289c95ccc3aa5156489931171abc98a731a4faecac0fec605991f94b7ea001480ce1e623e2721376f221390eb7ea5555d8d982fdfefc8726d825bcab6fd2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b9f991a04977184352b8794da92cd2343b17a1145d8fbbb20d33a61b9f77721f4bbbb848f326dafe0bc08cfde0782e13b47d14fc6ce83180ba9ab6e6991d3921"; + sha512 = "2e26d9b4e4a994b0334ba7634152fa03d8de19d20ad0fd34c23a9c21d705bda57d328b6f9fdb7874aeada9bbd3c2b4468031630d7b3d49cfb78deefc67173b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "aa9ed845c7c486c1b2c85b85e64707ae902ec23ae496179b4b72affc46a56bff4dd23f5b41fe0213a68a97ea68d6b64cf4b2e6b7eb6e9b1f2b385a6b50d649fc"; + sha512 = "be5ad1cc7c389a6e11f368bde8395284eec98c4a7db4d450998d377a937c727b3318404610dd4c1de8b679e9064ad67a48957767121d5dd3e449447e448bf362"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f04d149e4ea20de92395d942ccc2896e5bd5c71ee483f73ac5482a9508fdc0c31bf197bb90b16f522c86e980296ef7f161203a3526b8146371e86f5f0687827e"; + sha512 = "76aa9e09601f62bef027fdd35e473bff89af5cb026dea145480d321b6aa2b31bba4fd9960c48ff2abf464474f9884c2b1cca9563d1a0d8df4aba9ce73945ee8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c374d8365adce41bc46f02932df1950308715c954209c35a677461aaeef5485547f22b90050d584440941a00c99ae25e0ca1a717bd19b1f9de233f96ba69952a"; + sha512 = "720e0c135a04f3af595c1e01d6e1241624df45d3494b08ba777ddad1b0784bab62854f581ff614a576d30a12cdd495ba5a53766976783e0169bd288d285c8187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "d5f65934b238ec83a55cb45ed839f6fbb0dc117c8d92f7821f8d28916dcf0b9e6b1312c0d70094a3a10497b6cb3a5227492fbcb53cfb0d0df36840af0cf53033"; + sha512 = "5d19d1e1cbc7994dbb5c4c4d9dbfbc7a6514561659f737bb2f24f75a44c1b118293059f8e5276d6eac5418bdfbbb4020d8fb886f839450449bd2ac5c95e9c55e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2cc38263fa3fbf430091e4e13cbd08a9275195865ba22d122a82c137c55b58dc036c8af00a31462baab5394bb0d388c8de46b9d32268702aab0b3d8fb8f49dec"; + sha512 = "2e30628640f68e78154331572c860c96400a7ed84b89a37f03520135b0bdd3c966b14a25fd0ab5467e4114fcc24a35a69c575b28e2fd213c2df338d7b26ae111"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "57ae93fe1bb56c3911ec9f598e3a8186045b93780c2a392c0337d150c67418cd6af5c798bee75adfc1e3cee36259b8e82ae77ddd8e6d1262d86a9faf19d5f254"; + sha512 = "c801600e229105f50d6343c7f2c912e94fe918e566f28e6d39da4df112d94d315db29abbd9854e5b39eb875364483f8ac65131b73d4574099c5cbee6fcfcedec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d78348c0766cdbb694bcc083b5ccef9516a11b54dccab71832b77e988bd62e83acc825014b5375ce2521c9747867b048b0b064a2a91dfdee22284a18b4fc4955"; + sha512 = "83556862e82dd1f96a261e433e136f9ed30e0aaae28af6a3c5b4a3a9b68477e82e6b34d54cfde0c9aa8e694ec9df79405e6b8f0841096b46c09ccfdec0637ee4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a009bdacdeca8718275ea9fea2f77353022b28e907ea1d6c79c761dd36c20c771692c43986f9cf0a9eaf843d1af5ddff0381977cb53cddf37272bfe3e5b76b80"; + sha512 = "cc0a5e22cded43e999eeda350cc8e7adc11c7e6dcb8eef3eee209e0f663fa4b1e7e57fda928d163a27421195a233690c939385544e6293305c33fb3fc6f56c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "eaf727a6720bf84cfa77d531593da46ef864f49e19e569036042ac716cdec83805a6ca77feaa9d9de0e17f4a33104893f8a833a48b30544c34b2e7b46d068b64"; + sha512 = "c2c5609a180033b41866f4acd356a7830fe5204f81e1eb0702c5e1a7f228f46846012bbef7fcabc02d76f7d79a0079ea580a602f381672a75230b2f8f66e53a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d70596ed880ae12384f37bd98d1f39e5a62fb47ae3c832c051a8e6580f0a01ec39f004f3bf7a8ce592981cc70f8c3dcfa87ba89e5e2c4b7516998bce2c458c12"; + sha512 = "567a0ba23f39fa88cb5c242adc372016fb771dc562fc086597a48e6a28e329403d4eda194726a181d1ca4b45ea55e721fd02c2c1cf013f8dd7b15d9a525cafc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9b54084515b7af6b37231acd9085ad7190f163f01c7854c06773967a95984a4bc4a7b07872fd267a4119996ce97af4dcf069a162be5bfbb42efa62b2af50af11"; + sha512 = "5d5367d2e60de1577aac257137d8449028f30b75cd278d378dcd213acdac31ebb6fdd86082b387404aeb68a1d41552c96221bb647be62f4b968c433caf6a5dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6fffcd7cf4418a1a3bd5a8452080add6eff10ef483fef51e29fc2eec7769736154b620661674a327db42495deaa2e2f32e34536fb200ef699da363831cf5fa41"; + sha512 = "8540ba0245932a3de10985fdc4f99db61700af56a3529c412e30a960fe05ac2ed1e9511355f6a2d1022b99ceabb16448adf0468b94ecc4aa3d5b91ea63b59be6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "edf7dfe2eb01c5ccccff9892c55016ed9ac0261dccee7fac591d7549bbbc9d1de80672b3e8e51ec9087444a3208297070c33727597bc8f17a5a724d9d9d978e0"; + sha512 = "0f860427adc1b5f40dc44663124363e69415a8daf1551aa8671282a717cd7443dc47fbf5dd75c961ac9973833c255dcea212bb9457297f9eab28df8db5c2db26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "65851847f452954d1881fbb308119a61919935dbf7945eedcdcf8386dadf746150a83ae260737f5d7a031aa312305209872433be86656c9399c2672944b44fc3"; + sha512 = "79e997f5506e55a0685d26988052df7404f0e91f8c3a3eec0ec894c6a40a8e2483dde0b47b43fbaf8ced5fbc8aaebc13bbf487e079ad10cded9ebe6450d7a9ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f5092b0e9c8207ba8a18d7e25f42b95a07d431ed62ffbdce503d2dc52b9f01622608c1766c4e84f8ee116d3bfef0ded8b6e4176ba83a40494f35a3b468d73677"; + sha512 = "1779bd366a6c9b36e3dd7f069baf07a383c0a9f863427f325ff3d9d60ac96d25aa6b70c069bd0419f412243adfafe21dbd9c232dbf4dc8e6bf7fb02d6761290d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4f81f3ad8b2d9110634e8b7eaf2bb99528a2a02f5ddd067d8500629d0f96fc81d3048010f1b46ade6b0905ef2a3248e008357af83a806a4009f47d386dc65011"; + sha512 = "7531d092f9b47d6d5eb0a5c21f9a47d60d9790b8db93a36179c4a333afdffc89408ffd49a7ef664097ade6d741131912846d52ee0077c834010fcdb438d07045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "8c0c423e2f68b4b07ff74d60b06c7b031de7915401d22b82da136aba622acec5e63eb67b6d9a174f25757447fc0dff080a472de55c8e82ddb5f1891ee4977875"; + sha512 = "acd88bad84d7c1280298f968139878d1dcfb9851266666c59a0fc830d61c46a2feb95f34c0fc7bc81874d6f393175ad1c48d317cdc475149b06ac11824f4d1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "99205e9f145c2e6ae885687d5da3d187f3c8d65b5dabe30ab5d1554d3aac88a2f04628a2ca96fc47efbeb22f0bb429ef8de241513e2c6f56a015bc5f52bb7df7"; + sha512 = "c4612d9b2aa2bada63a484f705788a97bf7895c2d92f32eb88684374f8fc10bc6e99514084568d4ca1e142f06208e8f4bd0135a8c4f4b7f6941e993cb12b88ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e2acbe91f447648d537e9a524786e6ab1fe31a3769049e57028cd93223c0c4b9948ace8ed370b40cb67f5e95f7227a8d8d72f62166e773f52fbc5863e17879fd"; + sha512 = "6bb1ad34746943553e22d9424e015c698bcace10e16487c854d4ecfea05ba47e6d2f1bb68fce244b7c8ad9b5ead69cefd20b39eadc77433a5084abca4a5edd69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a38d221225b00c716bafd729fbed526ca7a78afd7b256909972985459481ec07e78fbaefa7108330293b8e35479b2653bb7f452ae388b507993e92dec3fac743"; + sha512 = "97656ea9ae3f252c012f2b6946768226cc8fce1a5ad44fede8fb436bb439681c8183cadaa16bb17e7529865b8991ed1856bd90f884fdabe87aa4973d75b451f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "5b8e69e54234eb39bec83b86f5654373f14440870d6eecf22fe9ce6ac421f94cc0bc940c4d27044039d369cd78c0fae3fdfce580c15004ef3a10a03537164077"; + sha512 = "f90820153d06ffcb98e881bdf3ea761d1548e0b54f91cd734a5d6fcd86439c1aebdb695ed0a73cab1cf03e3f26aa4833b85845dfc9bc5394c07da51db70a6022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "dfedb637c97da86c09f6cc7a0bea17e9d49c164fe03eeabb4f5cd74c357fb5a86f12232c0bbdf9ffed12845765f49846f438fef869068ccf98c41aaa534f9a4f"; + sha512 = "7dd3bc7b383015d437d9f8cfcb2288b40fbeb00caf562cd4127c85e4324f7c0bb18c34e37eb5472fc7082f9d4101393315ab50a9af016d6d56d6df022d8cc912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "f951dc3e2805b5d69d72c0a5c23597f824255a81ea69df018552e5327c5da5f201f8d8b8898e45b6b56676722ee043741c5bedb29afce0882d7cd7c825d22de5"; + sha512 = "fd69a6880d932b1957a2da3a457cecb1cf0350144044777155f59ec09969e8e0977f12b5980b180a086b4a75c1d94b74aec11113b683bdb58722e745fd4dfefe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ced5dca5416d5a451ad624abb2a568fd79a01c61f76f39cccc73d929dd7280d6d9318d7f33c67b6cdd26e7b48c0225ee90585b7513646625ca7d649329e0bc66"; + sha512 = "dae68bdf96119efea5820e281bae73cebfb857a26fb7f3e308b6fc5a89ce9ec409cf73d6f8360ea63de849e46ccbc9299fd941c3bb1d18100692aaa55215782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "5856a3c0aa48b3c73dd8554a099bee30fd4ce5f5cd676a8edc3bd3432e40791ecd6ce9ad18b3ef99466017ab5008adbafcb78e23d91abf6b1c8f36e8a135d4df"; + sha512 = "6dae447690cbfe761ac805b2a006b09d5bbeebd4ccb65b71f9ac7d6873f416c59f84bd1146ca3950fb44f926447d603f262f78b2ee4ce06119c729bacf5ee8d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d4de32ddab80beb280f46f8cbd7c2fdeaae71b19e8dd508400b406b6fff8d6a52aa8ef8ee464d9c37a45879cdadd63fd07d85d5f246a6c20aed8fa0cacfff016"; + sha512 = "931e2a9e95c8aece76c7b7cf8c9ab7da8ec50868157bfa18eefdca40fce33d2d8deafd26e177b8c6d880d17a81abbc4fd53d77928bed7e8378652033d35e4d45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9ace63a9f0c3959f076450a5303176f1ebfc3d958cf26cedd8462b5b09279ce90ef66675c8361934c0fbc506e6c803f404da87e46b912593736789233fca7b72"; + sha512 = "926f3ef2cb66b816ef12969f5841aae4662a495cc9f7a69d4ffe6a9e53f7286122416dab24550e93cdfdb1a9523f989dd6949aaa9a43b9f9128e9db4d5886482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f8447541efc6cbb47c18f524a12eac39aa07c74426a690b8685e5642e9ace22d94d962d99cf29e8a5acf14cfe2a54ae2933d4628e6800a20406a0bab08057eca"; + sha512 = "4a432b203baf674acb654ba8efbfd5f18f40bc3a03ab31f627783dfd3e13797e45de8a115e08b73afdd440f3e7a3cafa695969c8225593a55d09c58a1c5f6971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f9c4e08516bc66a62ff538a382404025ed4fc9761c978684b61d034e5a7514abff80516a30e5e6fe055adcecc8a7a703081a09332e4e13ca4ce8bddac879421f"; + sha512 = "1036eb53799852063433ed2b9e85e964f6073da7a384759e740385602ebbb20bf5101d2317663c56933eef13fd963e8299ea3166cdf61b94b5efbab614067553"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "06be2c47dd7c1a6ddb5dbbf72463c376daf79e2ed164c87a90d2fd73e3daf25eefed17330d181d41691bc1701fd74ba26d8f71bf8394e4f0e1b291deccd3bcf5"; + sha512 = "4038ac928a5ab61c47a6de53e5563f84995480e19f846e67c7cfbc9137736191010d605647f0e95d3c19c3abd7095d935c6afde9719c71df802ffd1236915066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d5aebb6166b65b0411e506ccd7392d330a722d8162b1a9c69e9a273329a6032549bd0d00336d7b1181f4137aecc05405c6290a7e2a0cc7ccd9d7cf845ceaa630"; + sha512 = "7de41f598b616c7e1144410a2f25f105ae307d7d6d9099d48f8f6044a9eeb65f4652b80371d4d61065cb7b48a9190087dfdc55b7118d0ff4246255ba3f1f90f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8e3bc7b9481dbf1416d811867bd2e34b6f2eb78433a3351762494682fe4de68caaffefdc574c2fb309c987a7016b0a892a08d0b590384676874f9651a423317d"; + sha512 = "1508f24a9f3bb206dc33fb7182c203ead18261cce765605e2460341dafae5d6b908923d2611b93157e8f437427f93051d8400f50da36cb3cc155fb97a11b79f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "255299df1da93dd0152590009888517dc18c2d624c94d4277207d97e1261e2c7d6b3f6a564bcdac21ad9fbc81b579a0581972725c56a03e47543c0f3c9c4e392"; + sha512 = "6ea10d8335c2011b3e413e2e0a9e9d7f1471509cc6238f44251183318ab3d80c87050e15329ac5df5643304325cdeb32c821028cf994784b2d4ef719d7a2afaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "035d47a7daae4d0c6fab7dd0b98fb9b48b0602e7fe493ae0cd374fee612020848366cf56f9dec0824cd1b74e32e16b86a70b1238ac493c64320b68ae66446071"; + sha512 = "8f052d48a41f43527b7eafffbbfddfa9e7e5d38ee9066e279fda3e714f3f29bcaa2b2808f4090df49210171e9d337ceea60589203a57d49bf2c3fd1c1c45f3d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9bae20347104bdb8a66e31dc1c8417fee71994060e67a4ef88efb9edc39ce7c1d9f0d9f09661c6f9153274ab2db269009c89a81131f961ce8fad05fd69b8d8e9"; + sha512 = "71cf09dc451dd58eff03a90610e8507a5084833500d7b29671051a1202274f59fcfb237d47a33d07b26eb5cb8b9130cd8126c4eb546200fdafb56aa86bf885f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b4b0bc99b3ba228a8d1e6f7a6fa6121083c0bc80c529e45440a2e6e1904f28b0af616badaf7ab41d42235ae14f8a13b848b66090b3afbe9519a9728f795d36ea"; + sha512 = "edd4764173bd0db3eabe024260d1630385bb40736092a2dd2eef2d53652f31c0cc7d919e99c938d1ad1a76d2b1dab43482c011c1bc1608a2f0589508ef6d082b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "52507584b43a8aa2c4ef83b3b232c8676bd0df7ac4efb4f69663bfcc714db8a7edbf564ab4920db9bcdf6f87cb73d80b54ec9235eef78bd8595b56636aecd330"; + sha512 = "6004642d3b2a5c81e82473c8ce36d1154165f7690959ee2ccf5e26387cbce3aa5081dc01a441f90bf13f4b95ed4456daa1026f76a4634bd2a076db84f72f9ae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "71366e112dda767c4ec77b0fd9daa16573c0952e918c69c2fe7d053bcd48dda48b60f18c3c4bc96027b63d3bfe00a7f77c28e58c000ae772ea26289e542f2277"; + sha512 = "7c34ba23fdc3999717928cd4465d88ffb77551bfe6e1d142a4675719fec1976094a5afa6117ce5240fc52741bc1fc616338f30227fddbf08be253d9e9e15a632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "98c55b1ee11af276c2daee9c272d5aa6afb371b52c8041d5388a15e6fb764f55f327c87517ea83ac4644b94a8306a6b99094982a89328bd71632ceb4937a9df6"; + sha512 = "c15314dc5063751a291b50b1f319eb8bc99ec8f5dfadfe6e6c2c87fa6c9c97b2be9ad4836ec16954a6785ff18259c3c77806d09d9b2aa62318fe8acacdec6149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f2a4b38f40fa4491ca95de02396ca37e7f007c3594b61cae3ca1e0169fe3d6dc2d86312562e533a5c294ae6b6442b3dd8a54f964e0092809f6d1ffaa7dbe7925"; + sha512 = "4d6b82218287c243a9bf15a95b7abbf38fd733042f33bde959d16452a8a15c10e4a999397c71624bc4b4234e3128b73875fc467992fe9ffc6a859fff7d328572"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cfb026027bece16c9de1285efbecf17735916afb98cd9036930c58854a2cc9ff429db20c9b63b099bb9833e137c06481813fc99ef2f742f1b54cb1eedf4c9ada"; + sha512 = "18e152bf426300ea964cbc539740883b8a62dc12ea8a48cb5ff8171fd3499a4dc6b8a824eab8e711762a5146899d62f4bfcfd03b3878f16aa997a8583b004643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1801ec136f4b0c605ca2163ce3fc7cc7de43c6d6d2ab3ab42cba1ed8ee671ce93c2ea3833491a16678b9fd4483cb26e5abd11ebb484a9adb6333fbb308752c5f"; + sha512 = "53a3ca59a8535a3b7a69b5116ce0906f8162611a14b877dc56a86946b1ba7b55885fe822309d00b12d8855a3ac7dc515bd8bc396c71b4055fdb2203f119d7fb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "00a221c57f2e0915eb1c8989d1e2401dda23a94fcdeb863e159f134a2b33d143b1ffb4c748d1efd4e3538115af258f937fb7f69159bbcbd1179d35bc69d13f02"; + sha512 = "922f626af6df624d4154dfb074627bad3a7e6ccb95e1e607bfdca0a3c0823a68720614a52d5dd51a2773f8214695803899a3b160c1220fab3d43351d4c41d3a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0f0f436b85d45368ef0a194e822710bf7e9bde08673c2eb785b949815c5d76aed5cc3a7a34ee8d55d663908aab834f4a51b7c51bcba6ed9ecbd9d4fedc757a1d"; + sha512 = "2138095dc31f49b6266c8b8789ce7ffd674d9d3888eb0f2255a04f15b884d3f076d4e7f00331f6b4782e0bb5f32db9fd923679c19b07da029b691283ad9cfcf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "253dffde4858d4351fcebe57fb7028c394ca27fa41125dc7fee7774e1d0aeaff25fcd45b9529fccc4e404f876fdcc5488ba82c83863895d0829a6d53f4d8fea2"; + sha512 = "cbe73835e029354327ae3ab08617508750252056b1ce5d6bae244e12e0141eb284fac068670afa40abd7da568c50f0d278f12c9650d605d785feb040d911e53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "022a6cb49774d0648d43e72a7cbde816a573ce4225bcbeced4f5b837b68700fe593430ebcabe0a175d97078cbbfe064caa1cc7a5857d562db0935cd7ee3eba93"; + sha512 = "c02b011ef67bd32c07140e2a994de8751eeb48594f872ee7f4e2e886f3e0c80821a9a2937bf1dedf673561b0a18961953699116ae3a3b409a47ef1c9bf56159d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b70e8869ccd47cf085f4c15520073721e1b32e5605bf3056a1e41a5c06cce4f9838ed8be6eedb47237a71667da99ce70397f8a0695c326d02ed79847801ac91d"; + sha512 = "929b9c653d9d4fb0b930256638238a70ac6b000b688cabccba5dd408742756a54fe08857ac43d4c18ac638ecd2b4219d5b885897aad4f2c665cfc7f3a8250128"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f512c5c4f60712b7c52c32e96bfca4f08065df6b0279fa347425150ad580582f00968b2e68847a2cae68348bc3255a31230965ad0d24b531ff6c36af39e42b14"; + sha512 = "349d6c15c211b1b764797e46a6275a4ad6d50d17c50968e91e23d9d3f185180436c63eb3d5c98eba1d7ac48844ba296de15c4cf22be26a169e38cd9c9682343a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e0390eba3ce569206f12d8fb2c996a022f63b4c12c1e3bc58b14ce71c49de819926235ec48c67f82ed8796299a80dfd668439c99396c94cd444d9528934f8e1a"; + sha512 = "19a7fccc33c0b71af6ffa2a699041bd0f04e2aeed3d22db11354250e3d5ac50149e38c23fcc7b2fb61ab7edc4cae30bbb34b7c0331e22e35652eb3f0a6d20c65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e29304651a752a9bc90468472e505040920e0e1d52ff5e0d294347fa66d1428cddd8b8f4394673bba164eddf61fc1e207bdaced891d490f7c9d0720675595502"; + sha512 = "d1ed26f2c38e6918bb58d9284f1e190f1d644014b567d71603ef06d181d550e10cad198efc1758a0f84ae91edd272f7ea2cb96c79c32dbc8dd4124977d984348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "27ed1798f07a1c3fd34a4298ac5d5aed55374c03674551827d20538bccfd68cb7df09b96774ca2873e7c3097bb51e53af513de536f7cddb028fbc1f8feab976f"; + sha512 = "dde88337bd1aecd728234f4a868d7fd32087b863c193d8ba87875b2dd7acf6c3bf72ac2fe3b0283929e64320b7fd481a898637b7860e58303f41c59e6adcafb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "20e5c70d073d706f5b4a217be7c6dab3e593bb922e8984b723c59d924cfba14011dc00c0872066fe8c7183b1ab73bbb86027a1996f6b597cd1fbfb0b889f2354"; + sha512 = "dd659b712c7c5f36eaecf62a382cfd45fb70dff95fe9f1bd162d9cafae860de71fb64dc5d6dc3eaaa19af3ba7df714aacc63fa471ca29afd7616f80038e65b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fec28a65df092a16810c2b75a261f86cdc48756d4a0765ce107820908108fd082fc22c08b35c9bd2a0e6a4d21854d2f009f64981b13948df281ca8f02bb4679f"; + sha512 = "9b3ebec8f372ce750ec17dec78013e910f8b05bbbf8b270aa7e9be84f627719190c2dd8525c82c04a4f6e957ef71dfd4bd0aaee1e92fd019cba9a297802a49ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2cd5778ae52ace4cecc79e4b62f4d143ee26b6c5e2d828cbe73306a1ed1520a069c124778d2c95d2de10a3196797bbc3368a0ce266bed97b5c3e0ba353771bde"; + sha512 = "666100224cb7c90409b86921ef4f01eac685187bcbe306077909f4822691935d77c72f7685483e76ae7eb830d57d3fa2e404bcb542247564114239e3933c0497"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "39be754f989fa2706d6ce2adf00b5962b599601bce72ad17be53e3d05c2e81d352bf16f21fb5824a54e470bb956bcb859a6abc997a5afae49f535de5318d4b30"; + sha512 = "32024e9c4870efa6576b35559ee04ee5130d90ed5e9931e0b6665b65d202314bb343d197f5d1ce3bd5d0a2e3136b18beaea033825f225b157a5a47ec78e9c35f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bce6f7dc0df3c6813e86d08d672ba780e6016e1ffca1479153736ef2baf26c242071b4ead67b079a1712bc01fd0dafe69d0cf27f2414b425a7a9ffa5d3d623cd"; + sha512 = "5291bd5d28a1d3f28473731bf916e8a2d2f0e1fa521423f588b35155c889d1784c986ee6fc40faee0b6c879088bdc04987037ae5b34585cc981611ab2d1c2bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4fc259743465dd9045fa632568a2f59b1cd24d352b945efea8ab97df440fd221248d93e4982a0d739144c3dda74b716e6d9648e95468331ba685569edaecb0da"; + sha512 = "b8c744f892dfcfbbeaea16e137b37860f447235f7a6842a1e5164030253974aa713cab0e9ec4646b15bd62e23794c6d69065457cb7aeab18214dfd898062995a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9975f31579fab0037bc062c3844801723a9e77c25c71f674def49098e8f756ca49387d7ad8e36debbf50e01b4b32f4986399ce905202a5b17311e056612c0d8c"; + sha512 = "4964447e37193809decfc09a47ed96133560dbada6178dbb2b6f2cf974f2b2daa62b3eff0d015f890dd651bf9f2432cb47bbfabdedc75315af97b2158ef5046b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "102703b0fe4baf7cb40805e2db937b3ebf5045aed55e95d5d7ba6776c5a6f19c7ff20bee43c228fc9c88d2271735f4c240d5a5c0ef4c2d3f5f1b26dbe39e726c"; + sha512 = "e34a66027afdd4191a11888a9e0c9cb5b35996f57255caf1fa8eb2b7effcc373fd96a253ec8067a1b6c36e5cd4d6071d04cc94071ca4212ca49308200d09545e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2e7407ed4f6d01ca1fd4d799afe11c97d665d0919edd79316f97c019c551c87ffc531d6dd3096e7fdcaaeadd2ba7e28af7c6ecbc78d684ffb1d65188b13ccd2a"; + sha512 = "83ac6d10d9e5606011e6addc54b02026d1ca272a87813e84756fa3e8015c7070e3f617c9d9f17a673b161af1cda86a418ed96bca46c8397d7950bb40f1255825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b5775bf2a1ee741da8b249f7a51685bfd81758b962e8254767fb98cba9497cd9593dd412b9bfca5c6c910ca9f0a1a112860aea6d19b300be03955fcc3f254e65"; + sha512 = "482a0ea33bcac3a760b6d8ae3ac7d52e514654ae340c22f8db17fb39b92d5db5796821bf8c658435624550adc92ec9f1d3567bc6c277ad182820756cf41ea19c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "afd11e9ed73205d625db1c363640160c6c7641cf3e009cfeb613b03f845fefeac3f37a267b8f493152fc5a149865d6dce28bacc8a835315c4cdcfd19b56b7bea"; + sha512 = "e57d29c139f43d42bac98434ce0285405c16ad48141485ac9d0fb15ce3b1ee920bdbc5ff1f763faf45c71553086b9001d5e24e2940635ed6caa6bfbbebefabc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "e278fb6af3968f67d475bd7b8be5566ef1840e43b40d213af8f45f356ecaba54e6121505a5a9f06f2d7fff3a55da2cf0425cae505ca4e9764f30ef8a707c4cfc"; + sha512 = "4e145b1a7a5681d43178a210981785ee3a44d9c8b7a1e166b44331daf99bcd4d0413e2ddc6e323d228ef6c26f0bfc5cdbcac82a34d71a7964b4a67bb5348356d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d1a37af0132bbe5ca0c6a74f13c57d9fee63cb8f9f628341759e32ce605806b779e26931f7348839c7ac9c4ad43d7addcdde5468852dd855105c202ad2ad28c9"; + sha512 = "fc33f3661e98cdcdedff6a5bef544ff059861389f14cf7854044e6ee32950f53a1cb74339599e407f60d92dd82ca8a6df77b877501a323a67186100da640267e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0a639514bba78df5df671c83fa09a6e55b55c9cb59ee1cebef60108ce3eccd483a6078fcee0ebc8ff205a5991530f8bdc6c672bc493136393ce94059a8ca122c"; + sha512 = "af31f2571a2cf85598412f7921a286f44c2f78ecf46f94f76626de29e2b5a7278963757a47746d974c085297ecda8b42d7ba02b0613091a1eaa116c5cf36876d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0b93082a827cd1eb3447979dd66d1977532a5ce75af851fbb0e5266ee9e8c4ee081f33d7dbd2c2f9ed09f9d7b0cc1fe80fc3c185bc025d03bf2008876140133f"; + sha512 = "c1016709138e985608d6edba3edaff43f46af60bad19247cb1f7942fc609d2ff845341b2aad38336456dfa1d74783cede88eeef3abb97dfeb1c3c2ebdc4be1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "33445a4bcbaf1ae93cfda71d788b991c8091d82e3a0ef001eab032f5f7c175c3082cc51873b4948bdd975db16962b996c0995fc416ef3ed9519a68386b090826"; + sha512 = "d862326e3d3045bc0939d444b12399f89392a1b91972b27c93f475d1a8432272bab3b9c568a3f597abc540e2a085d1538906e8c3a8dd79ecd5afdb0891a07c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e90146c6fd1c80a2c62f1bfd4a211ccd074baa732c2a0f7fea6586c23ff1729601dc89f2fbe65524605fe468c62f2300f5a991b307a6eb393bb5af92bca67214"; + sha512 = "10d2d073868fbdd8b8b9c49d10368948e9d24e641b3c86d2629fb513077ddd1c364aeefedadd47f6d8709df4372b26624b3211f09816bbe60fd02be7ea7a59ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f05854b9076e28d2a14655cc6418363871636dd5d59096b1f52f2d7bea18632b0b25daac8e16504a38f43668a1420cd067b0595d1376a49a82f3443630cb11d1"; + sha512 = "488d65b5c33faf6de23f922f8456f14ed4dda2db7fcd307b3b34b01fe22ee7abc679cf0ca009917fd00bf71383965239320011b0e275a103c45c6e22056816c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3b5cb998868df9286a37dcea421eb31964f5f3aba5a3a90ea2bcc2f254b1e7140ec153ebe8bdc1e7bb7d6d7028b7a71a0c4e6cfc906d8f1390056e076bc167cf"; + sha512 = "03450045a45114d7228d3534c3488e34a8c1a163396592a8194db6d599aaf7542843123bfc136cb8b9b2a7e5f58ae8b8187717a0c05aad7bd0f3051c0ec0876c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7ee405d1ab8ca16f1cef0c77469e006d9a13cf46e284612f4443dc17560ceafd4973cdbf6a224aa6bfbf889d4d8a97e7e338c2a23af0a991c852d9e863cd090d"; + sha512 = "f91d643d5e90bfee170437c990e01744bc5e4fffccfe16c3b806cd4c299c9601b651645ea8c52bef6fde3c1b4a4509e1bba433a315671cd4c614fe0462af4ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d073ed4a8bae41e3d181a9aba72d454e7b38072f698b5f690df2856a1ef4c16506c43805587373cd46a9a00ec1654e83d62af1d8c02091f9c0ec2b8a0c26eaa6"; + sha512 = "224a65f6a82c8a50d9a1349e88879dd93e7bd5f958ad0208d5f7264d6e5deef0b76659627ffdb21bbbdedd6853050d7a0a3ae1a86c5f6713418c6447eba00ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e41d25e71d05a7e90209b63a9c9928b0893ab2ad6eef04c74a0f82ded4c13a85652bd8fccc3332a5e7dbb96d65a1ac1c2fd29e32641c6bd6c2bc598b49896163"; + sha512 = "c5639b8c3c002d79992deeb2d6156f82cb04e11e646fcd0f41437faeb8b49fd7e08ff89c00eb5a9aff80e70c5b90ccf62498865fccd08c1e4db64f4b27633fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b4a9e5c6dc135ebd9467045078180097503592f888b949b88924fd8a85788bd3d2ecf35a65a30ac583503e767747798691ef2034e9e0e916b392491851ccc0b1"; + sha512 = "6175fde499171372212d088882203c62cd75addb138946ef7dc0a61d1ba4cda71dda6e3070688b5b4075ac602073a001999ddc0be52ca41f23899b23d053e659"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "788a8fe3d48ca12d60a942cc97c113379482e65ab1aedb2e1cd4892b90acb2bac2b273d6180767ca7209650b2a82c35557d83166717e7884a43ffda69ed8b43c"; + sha512 = "a694c3260358baadf3eab7b0feadab53facceef72ce1c760e845183ca0309fc67ea02581d977f0b45d64742c48792f8b07658c83f4ec9cc9aef6e5fc126f8842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82f0c46efcd0ba5a9814c36dc49fd513c7706c892960380c496b68272b3634fca861908ef35661324a7bbff4cf6a9933eaa730eb6ad417057a444ceaa62d1ca0"; + sha512 = "c2f2a3599280f0a44053879ed5fdce337c15a78952e93d93d3138b550e31b5ffb62403ddc0092c4ac82d04908d2b0aaa6a7698fe2dd94cf78ebab066dc40585c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "589c0b4f7d114d9a62d1a488136007d67b9002683548b11b60bfcd9e14ab98cd01d90ba70e67ab498805c0ab957dc9ee6f2eefb35ca414d6b7410c15874657bc"; + sha512 = "bd6e7c2732503ff2ed9b4e0b399bd4f98e02e1fa1d43637ea1deaff00d1916fbdb5951430ae06296370a4959c2364a7473ecaff145eacb304a9ea888a0d5af53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5696abf8aa03faafee7947843077d6fa1d0d2e9a12707f8fefc49addd4085313100dee577851419b5bf7bae1475e0b088b3f08e96f306dab293c24acf60d27d8"; + sha512 = "e737792c3ae820aaa9e01ebb5dc6ed508fcc25fbf1b873942f5dba8e99c4ada0320b7924de31813794b76998c1ea8ef555e9a8ea98f394a455eea5614a1c2a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cdbc40af7806fc4f64a27a60b7d41096a6f440ab6e00b8be279724483065884731ded97e54dd7a3838ab67823ce3451dc088eb73ff899e9497adcbbf1455a937"; + sha512 = "3043e15fc4e6b4cc19f2e0c74ac87cab1ce4ddf79b7227bbf986c6e325d60edc33924909939def86092368f7158a5f12d725ac20b71f53ac038e2f3ca7709f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "97cf5ec8c2f63c56ec36957d759784f93c9d138b14021eb5db66377607d7a299e73cc96b41d91fef90acc0353a49c942fbe1d79888a99bde7f0a558c07c56242"; + sha512 = "396a832f795c20eca7adc9147cacad5a90a56bf4008699f96cd8180d9fc52f1d318656a8729c82052a985444ef3a3ba4bdeaf2caa279b2a1c9d6618c94a2c517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c774b9e91bec98aced2ef6909ad1f5793e6064311ea6c298f9cd8fb5de4289b02d958e1d8af0a0418dca2bf8ddc752120ada65ab8b61c0300fdce32420e94600"; + sha512 = "c7101edd19e9a1106d586ae79e9678e3526beb1c90f1d0922b898ebb986236338cae2c93121b3186b9e9084fb293f7725b769586059b2dfff5ad7646d294b3f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "831d11520c02422940d67f67f62ebd3b9e6af501ebb5277592a32d67017fa8b2e42ee09aaeaa07aeded85c6277f601357390e8771c4c0eb91f150c660c13a977"; + sha512 = "859be5955ea7066be34c8436ad79e8a19add4794be5fe8822df5c5b418f63d675f5a22e0608aca1b872873289288cfb5bd3e98a18774ff23afa0a66af5dbe0a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "40bee2445def5e57338e9d0f6d93e58945f7d5b2f38eb8c2c522843c748fe8cd112db227901ef574575102fcf1d61764f7f241d518d1e3df84e1cce19f12dc00"; + sha512 = "10e1085be63d4baa19391b54e8960344d70f901d07f67f5c1eaaf8f2bf8fb2b90635da1e5c423aab6ccc6368a7d4bf27ce5dfd3693ffdcf7311f9c1bd888e1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f1f570696db1421544483b4c12d84e04b024d7d2493167d543ca771b35f48601b30a92445919a3ac629b2875ee79b0b50ce70de098d3ec3f368ed87da56ffc15"; + sha512 = "ce1c796b1bb419c27d949fc268d5eaa0e1baa9fe93cd10603bf1a4ae60f66f6fdb8a29e14255859c45adc37e000dc65a9887f9eeb5ebd3e05d46a0f0f73dbdf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "293b0e1965b2f412a1237d95f60df58638cbff332561b176479dfb39492d7da916d5d68be632bdda67cb25d518b7ef7400aa1ef56c8c7f6c1d95ada74cbc1f7d"; + sha512 = "5ccf9dbfcb55b67658611c049d6ec5e859493c45015ff9f424cff8dab45b69be5426c1905006b04f79762ec7be5e63dd8bfb19e0d5cc59e02f31033b1529d57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3e8dcb3435974f45fb515691424047677cf9483f7a0e880829cc80cc40159c2314e39e5519bd543bfc3ee15c0d5e42cbd2442705f7d88be940b1445910a706fb"; + sha512 = "f2ddf1065e5e848bc99e2fcf8ee9c6e5049070380c9414e675581bb842c98ed7e9e1fa3958662282bffb9ba41d52dac0a66c1376d094573019cdb101401b4e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5e18e33506c0e60bc86da8ec20359da4938d567abbbaa64f95b32442e856dc9df3927c2f779068a833d47c7caf35bd9a943d6333950d166822da5c9148a8a004"; + sha512 = "4fb98ca5bd53beed2dd33f3f3d1bc802690a7e856c8cab0e830f062c0f115a964c60117392cc9b24b75adbc564c9196fc951174bb2da72b76941ec2148895393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e7946312fe453ea7e4f2945c34f321b3f37b57df4935132563b15d9df676a1ac0dde47d8b2efb931f1638a335146f30ee4c3452edda6c77b9fdc9f1597b7cba8"; + sha512 = "6a2c6c1f0f4e72db4125e613c9c9c3c91b0bea8945bf4e12f3e2682cb50f7cecfcb0fddd63c9591bc39fd31e9eea575b159fc65bd3fb8326e24bd315ad1fbd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0d41d291e2f605487c4826e5ebf677217460b3f8275245705716272a2acf01cf5724d093ea16efcd2bd46c5c6e6600daaf3513df4992333305d1873549dc2456"; + sha512 = "3d1de44f6c0b01951777ae913dd25b89ea0c0fed1d12eb8571aa4c79769cc2222f4c417c29a81cef908def319482eaa09c3c09549bf388841806b2ec27edcffa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bd5e84475b42be7c40ace78d00b7e66bcfdf18baa071bc7841ed296653dc246d99e16d623e69d792548037b3d0617350a49d9e30b174fb5f2f7371f95d01d61a"; + sha512 = "3bf2882d814b539ecd3f7445fd48983d585d40e530693160b39342215ba5a65623985d1b189ad76b07c1c0c39cbb4ea1b2f45234182766e4bd9f13ef1707d009"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ea7955f902c22a9f36c57c6392a36443eb45697d2b3b131215a5fe153eac93d39a407d62edd744a2264d02f46ca103f36ef3126bce5dbd743871e3091f02af29"; + sha512 = "547f62c2cd0105e4328171b30b2747e4d75424e42866b19fc600206d90208c9e21b484df2455f5c2354be493ae22f7c8ccbc5c26a4c17a7d4c55f5b177d77f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ca616271a493f335f6a2dae72e6e539b1c2b2605a98426ae0ef4e4437474f49a12f74564abcc6846efb17f5bb5559255498b24dbe82dab3eae70d4d3124035eb"; + sha512 = "90676f1f7ea1cb0fbeef5a3bb8ec28acf389ab755cfeaa1484639fe44add3fa89ec994f93dc7eede2cb71f76bb085a3351dca6a0a8374997db855f921aea889c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "364a4127236b8c681cc5e2bc33795f5f1e608b5cda2c83e3ff0acc626948021f1c048920fe4923104470de00d8a02fff9523efebed9fb415cc8d5716dd78e272"; + sha512 = "43b55fb395cf9cb2b9705f4986b95cd323c26bf1c6fe47d6548f58fa03084e5213b1be99ce843d0af7947b94cd8891fb0431a1c80cbfb42bf09e69eff3b9998d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e87801862b132c319aef7fee5642c62431f197a587651f5189d2ed97cce43924b92e359f789b1aa90ec253e5772d546e04c4c827570e22f511239a89119527df"; + sha512 = "c294b70d51d0ef31d8db3fce36ecaa0d50b79efa272731a473d8eb7502ec9461ee6a5acceae6e6f46ecc008713e28f943817153c458664238be01c21fcd1952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a32773b58a73d243166cce86a0335955fc265fa38f00618afc7656f3ef7b912553d3e11cf8c848a28b6fe08a2a31a71177e67666713d1604e254345975d801cd"; + sha512 = "872384072f61046c18169ec399c7a72f9231b58d05fef6b41b5591ae0b28c8f496bf9210738c56249e682b451f257cb220204aab74e7f3fcf6e998b5350f7665"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "90ce71f362bea122f2ec6298721677126a2bec531b12899b28f16523c11d302cf2ca170cb8017027de7cf2752c69ec933385b187c0421f04d739a040ac2fead5"; + sha512 = "6adff5467cc9a2514a456ca84de2bf91dfeb8d528e1296a636fac7048a353c4373270d551902cbcaf62567af53df3d4db0abb2788d28c24b014aa73cc515be69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8b4904a0c9a71d7a6dbbd56ce312e68c9f0d06d5a11ce8ced66573fc83fec780a3b6f7ae93cb16d4b0651252610a60bf60b49c9f5b6e866a412af96227b4d05f"; + sha512 = "09694e46fd369ce0c8b6b11c04916032880056529a4fa5d7acdcc2d46b1a47f01efdcccdae8f569e597a52acf45198b132654dd3fac094031ba729101cd36aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "027fbd7b92e0b996c24017c9ef21898032aec9925c70cd3b54d6072de95edef0aaaa7baca036b2064e04949443993cd864cf42988107b43a16fb18a5f899dd37"; + sha512 = "7eeb065f6c7b971a9a9f9f94e1eac6cfb45b2c7c32b9770cdd49d50162a5b409abeb349e676568f3c63e973311791dd8ce6b9df340a8f13cf5afa19df780dad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "784d7c692acec190cc14c65345396f512c2f487bb9c1f5140f5b7ff002e431533c3653f98a1bb254ee75541e1765ecc9bbac764d26a94bc953707a880fb01eef"; + sha512 = "da930d401adcad3c1648cbbbfb7148e8ee7255b937a4503f9e8c686504ce7b1c40cd5aae54dd5084669a153c449807414eaf689804b56c06a0f453a998aecd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0717091ca6fe037a05e42ffc240539816cd34644910336a91d2c6bd312d5c434951100b9980d81f3f940a7ca898073fe3e6c2f1c2444cf8cd7687156d2219ce6"; + sha512 = "e5686af9acdf7d11f0cbf80492e9288570d358ed8b4db9567b943f3e2de5f44715caa2fee8da5e11affda917a896a8822658c8a55f0085a93e73fe9540cfb09f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "114ab370a0368007542bfd5ba6f4584b1f13f6c852ead2ae3df04133fa8b3096094bd02ce3ba163b2f80655c847865f07b463d824c798a4e2c378dd4f379bc71"; + sha512 = "bc7600040fc001e39fb654946ffee9317983729391767b91793711bd1083d7cdc16af7c1fbb91fc3bb8bc903529da3c398de9da4a3e4b0d3ecfea6e1ba8904ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "26a96ec15a928aaedf57f9c0877f0722116c8c9afa1d4aaf4c7554f1a0f50045585d158ec5644dcccba5c69078e7169924297a33032534ffbe7d678fa61b2c3e"; + sha512 = "0b3e845a2f346f21ec90e0e423c7d3f1b635fa0ab1cebeeb7cffdb4f4c849ac100f17f370ab4902b18997a8f883ad71f651d397fcc8b7ad3ade7b643f2e75a79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "2eb047634f222c45eb0e170e04e7afa39764e0b722bec5a3e94ae7222998219629b240057aa99f2d2d41e627374dbdc3198335914937db098085ec8b2d7bf7d1"; + sha512 = "f345579826a039d7008a86e04f437fa112579f6b21e2032e8120f9444fd86d38831629683c9441d7f1f5010c02f18a0b7232e7c0db0ebfa82012fc38d7f90165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a4c00112fef9d03ca8ed78fd74854427a76f190c798f808ec6a1dcc97b362383f7c5485ab89affd2231cd7e1772fa702e7cc1dadb10b9e6983fc92c523921616"; + sha512 = "27e4ebb4674c0ce189f649d5dca273787386103f9b2274600fcdbff10b78bcd5ce39e7d530e5438e2c3127ff2ad15ea82bfbe07a9118baa2d1b722ba8ec2be18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "77eb05efef6c112aed75247fd96a2b550a2213e21a038d74b846a716fe400f1e8c863a88399bb659641eee5f3f7a73032dd582cb282bb6c1a5f06dd8ab8b3bbb"; + sha512 = "30ba80bf62edbc26314b10ae2bf0caa41c69f92d6fa04fb086471b5d7b9f439f74d37b0c9265f8de888c599e8efd074f284a085fc22251599753c65fba7bbca7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c2857c83985cea8e1b721fc88f205c4d078d7c6e222050cc1d0457462f54f751388ebe9bb960d8a5b9cedf533f5569474c95824799eec5981c6b39dd6f5a892d"; + sha512 = "fe305ca5165d693841e151e3356068e797c2058a017f8108cdf2e9959a13055fdd77091c206bbfbbf92971b0bc3141821159add88c031053370da266883c887e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "39727469286a1975e2b4bc8aabb8edc61c7065f69c142d8d833c5c188189fdfe40b454e3e22b92260fb53627b54c86fb2e6488af9fc925c6a9d85c26dc92635e"; + sha512 = "3413725d76686e50a4bc8125efa0160ac0ce89c92ae1afc41e9977dd2212a59042e4c02c75e2a48c9b09d1ea2da7fd8683a524f90f8217e58292b0abbd0a3242"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "708319f6f7a7a1fca46136d9396514f9b8f0c9c29ad117eccf0dcd8329d451ca29fe7ad543fddd1ecad3a21b98d72db87582d00dbf242154120d750c05c5b53b"; + sha512 = "12dbec279fceef28b199510175a18455e2db411beff26d6593dd5ed4deac509be50ecd55f9c4e31e65eccec59a8bef6fc02dd054ec9644505166d4a0de672cf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3f227b4bb51cdb424193c316677d425e7221a0dc2039620f93f1e1dbf4cbe37a48946fa9c4356b7308581cf90ba031f3474dc8da476c408da927bbc4e0575fb8"; + sha512 = "e69c4aad3b2fda0249dc5840af8f48b2420a213f0801397c434ecf17d096773f235817bd9f6205a06fc22529fc289417fc3ebb292cc7932ffff9e7de07ab0c4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "763b7b158bbd8c4b688b78dfbf5f1c34df59dc5c2b0bd4b5cee9e6768257650ef220b656f2016cdc713a8c754b61de83978ad479b54d7c5697324f41a912a4ea"; + sha512 = "7748d7f3666684021affd3d50fe3005ca5bb47e0eede9aa4379de60a0d6fab292753e577ced60c117ae6225517828bf750e05cb24a0406a9f5b4aef7f09aaf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a03768a46fe3ffb504801368d8536e9aa88533f25c3e6048cd27864b2115244d339d93c0f259cded5fe32361cb85bffeb689bd915f4c5146bb390ea420f24472"; + sha512 = "04de73ca7c1ab3611baf8192b108aa5cd56582804e17a822f3fb39595cfc155538ffabe38324a1475d95605ff7c702988cb9f4b6e086813b5c661428774c2fa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8b401b3545c24a34e654ccaae66c7109d28f113de61cecdf512abfe8b20c163172311dbb38d27b10d98f1527b185b46ffd7a6d9ac4c07a8ed4b658a4cccce91c"; + sha512 = "d35f733597a2faff1ca54fc4fecd97ac03576443b1c2ed8114e14f59bcc71e58e3a828451146a592222d406b631b6c55cb554c5900593a8cfce83ea68d29f88c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d699e8e9a22a96f976506302292275f2b9ef861c87dca78bbfe61676d61d91426173812132dae8565030982f7b13a163c3097ea9e69484b61e22913a136df0ca"; + sha512 = "594d93a8537b9d4ada5b87d74f12902580c8488f9e0dca9b5a8be109025006c27d6b92ab45b76f177cc15bc0b7e95d2544c0d2acad5a7ac64119b008c8304703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e786c67a813207c2abb575781c97e4153bc74050f24eee4deace5fe9323d8c61fbe7f7bf333f27bbc1f6dfd3608bce5624eac5f4aec26a89512ef0e3bc2a2649"; + sha512 = "f904004e0bf94ee2cfb9fa22c020f6e3a4c0377522f6ccc00ac69df1133717b57bfd5403ce97ba8b69775c3caec9c730513c53db262e8b62f8b8360a0e340c7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "3bf31d6d3a558f1da0e3761500170c58cfcde17aec5252e7f2ee6e8931e66943bdb1d5070c637163037392209ebe8f82b042f92cd70a9d4fa7443dbc26eb2ca6"; + sha512 = "47fc45930445344210762116c56004c8e6dab52e70926ea9837852faff9d717a4d6f5d04df66026fb33487051776bdbbf07d4faa2a3eddae23faae3c88df7618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "5f9621ae445181cda3467e92d516e3eea905ca64ccaea015ef4e331ac8ed3dfe54943a4f6386d9ce3316b3f04594c61b2843559ca3281e798319e8ca196be07e"; + sha512 = "8747d1626b54a83da79780ae9919aa75a6828fa94b5eabeb299b0bacb1fe5f44f2540a223206df3c3a3cb3ddc890e87a062b7acdbc890e19cb5d957d29a28fc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0434438376c20f3f9aaa92127e708e28ac48da0bdae626e8b8d81c26d6d89ae4495811a3ad19618536791770d4572950753b9ac885738786c122d61afa64db59"; + sha512 = "9388c5f3b3a12f72149899d4f13ef305396f5d3d4e838bd909050cf24a0c72b4b26017ed5057f30b42d59d8bb27532f71d174ce7285fef82672d12e50297d283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "abebe02c72586ffbf99ae2e37573b207c0542d2fe976f80803b007e4eedc5f24e0e95412220ab6ff8b613855681b0eda0c4368efd2b2113461173a1606baea40"; + sha512 = "2db6f9628f9cbb533ec2575cd95c54423cfffd185251b65cffe8233b9af92a6000a371f1ac1efe5fa2e7939e3cff36da5a8f0d7ae1bbc8354a3b3ecd3a0eb7ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "944b852cfd77d2461598b7550450184bf4e57b4e273a99848aa2caec6737aa777dee4bab699b78d80335fcd05c8d5542da762477fbb8b36f7de24a0ae77617bd"; + sha512 = "1513aa8958e26c1b8c618151ba88c7a0279fbd42f1a8e3ae6616cf069657337647cb180bc9d42f88a53d8d1f71e6515412f0da2cba16fa177f87a048988024f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "06a1736a390231f92bfc3f3afbe9fc10d66f43f9100696528a792766eb6bdf1eddd2ac4dc96b446580034005f400063608d547eef33c0a1a802779c708bca578"; + sha512 = "200d0ca08a7a2215f56b71e73ddc37c6b57188aed3926b1852d53253327ff631274442536cfcebedf2e78e4bdee6e431fbf4e722f867819484707ffb882a2e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ca4bf388e38392b86eea522d76c1b56420e8f0bce9beadf9b7835da7890f3350c640b7e6c4dc69a9578fe4ad2af3495e30c2e1c069b345025310dfe9facb95d0"; + sha512 = "dcb391720e9b2d51f10346fae4d46396e47ab391ec80c57d9ce4a3c96a631e61c94b23e1e7bcf00360822ab32a803732e686f7f54bcb60207b190dcc271ca8b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "32dcb1279bdb3880260b50a4c533241c86b6b61c76da0676aac607a9f6e26a061b69460475b9ed554ec11f295cabd1aeb0da0a1d284caf94cc8a1d707de732c5"; + sha512 = "c977b42a401be633b40435ef25dd0b3faf362cda71f02f1991d41ab43d8b465497792a6b80c0d57ad693a5fd542832c98057a915f64fe9a75181d91bdbc7df87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6d58e28f1634066f27f3e693b22aa257e016b60d8b2a5d7b3e6e82d2027574b34d6770b819d286041a6315748894f5dfa5a9406ce1471d2413207de3f31f6044"; + sha512 = "9b91c4663f12df7c1bed18d928b41ab7f767f751b33b83aac9655bcfdbd6385e26cd72564f422e79060740d03ff512bdbc03df75603016dab6651520d2c83c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0ec2e11ae36985bd7ec5d2bcf2392a4602008055420bf06756ffee006a242948f2ab9bb6ef411567aa20e11128c9681a75d6c36f8b0bab2376f24e8ecc164f12"; + sha512 = "66a72b57845cf85362756b9abdeedaa754a82ba792b9d736419a80ea6bc2214f01b875b3307156c73a5f58a858b18bc11cb9adc04fa71d19e2aadecfd2ae4e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "7833ebe2611e09f023620e04a02bd2969106e69c5ae56e4820d7fc914bc239ef1096c20298cace76327a1d4e3943c2b835eb1bcf850149a4039b391dea5ad0e3"; + sha512 = "b821114749a241c9c68c0d8a19aaeebcc72b89eae1ce9ec141c06ea4c09432a8d26426092a35d5daa2886bb4b129e74e2254e6aa6b795ea537413cd31f1f738a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8d8f3e41b905e021cbafd2cd0990d08d5bfc38dc013604856639105a5ff0d99a1aa09f200de58aabadc6ba0532225632847bdd933c1a7afa7e969ae8b4ca0774"; + sha512 = "211e65d8a4d681be39f6b1d47210f07ecb357c6e3c51d078d21827681f8a168489ce4c01d251f5f711063dd3ff9ccf0585b2bc11c3f1399f06761678541ed911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "cec3f84bb46f7f2952e78352acd306ead77c1e59f00430d883172ff50183b54cc59d646abdcc1595ad386b881eb5dab1670308ef7bbebd7758d7844200919665"; + sha512 = "310d890061a823e9cb2014b8555dd29d201bd80d1e846ae7a457ae7bfe0df06b0a331ff1dcea09cf159d7d969454a2f730304254bb7775b995414f0f20617806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b02a49e4da0eb8deb43fc9bdd0636223e5a442662725b3bfd41d278943f1ea7ade4840655510541f5d2ee2b9653ede530e13c1fe6ce646c8fb5886b51ea6431d"; + sha512 = "f39ec82806e5a83eb997d2c16f93238d417d39a3ddc62d591d153da16a7b71e7d916220ce7721307589dfc671239fec15b0a15b8387620eca6478452e0605d41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "94a169848ec7d5d77d0829d8f2145126422f56db2e10c1fe5bfaa63cc50ba176825d2b46e85fd99ea882df3cad7caee3c7c2b44adb95e0b36807dfb47ebc7c8c"; + sha512 = "8463135fe439ba1e8796ebf626dac84c3672296a84ad8217ae90e104260ac4c89d036c7c87c496f2bc45b259f98e10af99d3ac2a370b2a6ba04223a9b71a9029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c000ecf6e9a639886e0025a4f74f01b462e27dfa54faf1d63d647a67951d4e64cf62979db57a058430877fec666bf729aaf6421e618f74337c384d7f9acfd58b"; + sha512 = "8b5b601e3b458e75b1cc27fd6f6be45c503c52d3f70be5a2a0fbed0aa8e1badb2d88cf8011d852a4f39caa87d894c3c412ba7b2351049dccd34eaa5f8d493c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "599cd05155c3774fd54a20633c75335cb7a6e4d9fbe8a050cedebfebea46ad5769cf6aac1b908970176b415306e05ee84094277a3117b1ccb18a87cf698f9832"; + sha512 = "4dcf71bdf2fb5cdb238230b5ef33a01db062bfbfc29cf0a6ace929e5fb84e6d0aa7598faf5b040a4b7ac899fd3024f5d91a1838098b91135bf2f3351f48678d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2ce3463b1fb0bd6c4b00a3fef1ed72651d8d6ef1bfba3e0ec5c4514ad5c246973afd0006da71bd258c381bd16140ab5159af2597e9092adf8edd953a800126fe"; + sha512 = "0dbc609a7d10351772f807b78f1fb68dca4df80dcbbcfc48a3872fef07fbf0179bfaa53b08d58f54751e2648e792547d314d39c29c37ea036d8ba501cd2f5670"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e8ff8fa40baf11b686a8a3b82a0dfa3657f708fc312b663a9c7f4c5da0fe1cf66f3207d8ac1946dbef37747243b57ee9092749484fceb76c475b2dbdab968501"; + sha512 = "66c1e12658008c762ab66cdb617e04ec6c6cd1d950ff81a3e278f5473b7e552d27e5906b01419c954081372ff02a06195d3daaf513ac83cd40c71b4f4cab5385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "704f4371ecdcfbee104665853d18ee879a0994b6ddb54758dd305a7154735cd7e869a93cdcbbd142deca3ce66da50914e32647e1467411199936d5511c2f7bb8"; + sha512 = "11383a0760432febf961e2342dc5ab4d1bfe89732be71f776d313f14443caf8e2673cd81476979465f333dd6e338db9368d969c736234195b5bce4f57db4ab10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "143c3eb7a62bf137dbd09aefe2f79d18ebe65bfd3e0e09e9bf0aba3a21d7c052bf80dd2fa00f17037917eb7466475e68084d357bddbaf57facb91641fc59a9f7"; + sha512 = "c137a8f2e5932cf1eb07b3d374dfabc5d3465fc9496a6e8932de12f8b166bd2647071ba64918f42df38af9becb574ec5c4fccf7e9fd323a64488f057aef0f06e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8f156ca2c4491ef0aace2060eadc808797b8ae7f9a5a065b3c0ae021d0e79390a1330b8b15688a36083893ca8828222fdd15d30cbf30c936e70b581705a2aadd"; + sha512 = "29865376c3dd16a0c54c4b1c47685ce862d0455351f6c22acb118a987f8258fe5ba0ddfc62d904a9e11b787d34bd8d22414acc2b95a6f9d6d051621a990497b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ee8570f187bf66b595f43b6d9cc5c69c87539958230045dc743e1b2bd8ddb42db3440810e633e3f20279a3ecf00bc90059262bebfffdbd5bd25a0ccc69297792"; + sha512 = "1a52f547683a7380d605b43ee3eee9d2a34efe42adf68bc74905adf168d30ea4bb23ff33e3e954a8ebd580920aaab70473c001562b0c77e983aa5f365f8bd238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6b02054f418272d84b84f78139e9762679198674691c78b3a3068a3cc61941d978b974dc4c1ded4e7528e44572dd89144ebb66c15543a2fa3f13dbaaa82bf1c1"; + sha512 = "c1ca752f999d54a6c2c9c37b78d98e9fe87bdd82e3769c6312a74b63dd402f874c1e9e708b88945745f2ab1f8309b7c9955104e4e2981a9e7b53fb196b01ebbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f25ca3ec9a73c09c688e44b992ac8ac927632dde14531a4526b24e86f42b43a689700c68a21410848dd4d7212f7ed58c0df8ff98ae32924c4d50e7712c8ba60f"; + sha512 = "31b94482b5a2c7627a08f40b67480c26d685eea350b6ac6e22d6e8014375e9d45fe74d81782cc2056ee69e27a06dc36f78898f9b7419a4745987b162fe34c6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "6b8e559fb742f5979b9098fc443a6a87efcc3a2a985f0bed4572b8d6d9141c7ecd58a0cd7c5a483f163f0788c0bcefecc207e7416819a79acf801a2ee93fa67d"; + sha512 = "254a0b805ea3b24d05248a6abca647dff6a95a28c939acaf6e01b68646a94643123e7ff49977ad6d7bc54ba0aca71b2b4d3d147ad02ca84173ff15c21464d271"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "46fbfdb593cbe9e94a586c1de22d629ae2f6b69b5e5c9c1cd24dec23688f3d78b8f571025d7bbed175e1040c06c69875d5e70631de51598b58364224e1d431ab"; + sha512 = "32c86b921324e81ee8bb1c2e64b8c9a9815006ce29b19a2269066ec13d6c6ceb3c45e3c83a22dc8f1dcc78ee13845bdf5a9d9776ea84c8a9a2128a0b45f7c074"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2bf16bf1be5473d3d424163d551621ac51c3a6fee5af97cf2ec17bd4804bdcadb3096aafc8194476e5a10268b14d55d489c05d1f7d0fb579feeabe4b0f266ae2"; + sha512 = "9d2f979e7bfa97b6b6705f77a38948de80327fc657e43e574a2ab7bcb100aa58c7450c1bcb30d3894e150323e1c8e1c4fde91877be782c67996a95987a61bbad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "67ab00731c1ee4a781df931eac650f54d6af6772c7ec525eb00d182f99b89a3045f937cf5c9aaa9b436214bb26cf4514466bfd55b4c1c7c832ed5ec4daea568a"; + sha512 = "672136b49e6805960e209c7b743fb7b8428a7bb78474f355efe01830e253888c5939714ff72a7fa0e87c848557002bd45cfcd2d502f9a703193ce1c42db5d13e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7d57035ba2331c459830a65f581310fa62b376fcc24c7e7377ea9a20851f0ad83ae2df7b1ae3cf3a3ca5b2c2d172f57169cb5a1b30e81feb295df128a8a57106"; + sha512 = "d8f619b346de9c3b36d20704524b464b1dc44ad230b17048cf884cf7999996fe08c543285611b358f9afc219f7448976f9d831f4eb6cf4e965f365f17ddf3382"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b8e0732079d8a81472b26418da486eb5f3b731e3461c08a41eb8751e260777742c823f295baf95e84ff4b44f87b68d2d110767dabbc4a9db3f102f05a10b3948"; + sha512 = "1cfc67675838e768e7c330f1dc0b0289feb18deecfcf68b726f0636438fba5b577627e5aa9d241f510a123fc1793ac14a35a2c0d098dafa2e3a6213b6fa9be93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "201933bf5e2d078365b59682292201fbd5b0bdf313cc3dfcf0803ea920989baaacbabe6a5f506d48665a272e19afc3892b77f36b91dd0f63699461791ef49640"; + sha512 = "00dca0daef262c75e3aa6ea91a0339e7716ec696d747db04b3a308efffceb908ad772abf929c190c1a6e2b8f09c64dcb6d09784bb092070c87cbfcf82dc004cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0ad0ee37b2c85d4cfb4b11795f2023add8a826aa481651f8a56b725f7b69efcff55841bd473d2154d27480fad704a3e1020c5c53a5fad14e4199a0344939c19f"; + sha512 = "84cbcb02d41dab03ce9c35c9de44a73f06255fab65f5d5f3fceab968e6162add3c9fc2b6694559107625e1a9e429ab974223806899bd5fe47c9d87b38ceaf68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7d704e72a100c790fec7e57b4e713331b42c154afc2fd16fc026d6bbd730dae1c62a810664149899aea3d3cf5d4536ecb7f991521b7258b35629b7dea02acae8"; + sha512 = "90648cc26f600e52b46e4e6ea2fad93550a904d762300ca3167c46a10d16c7148aa88ab807165928e6a15b91b21528b503b017d87e084386bc102574932b1326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3995e8a4c0a232ab9f2c64c45c0a9a9252e12c1bf700fd84b4bceee0e520b7a772985befd92c9375bbd24b1eb5b3cea4fcee2119effa78608f29250adb57aae8"; + sha512 = "33efcd6f165827b951c0e4e05fbd24a759ba4405f7148c7b78481bbc02edc87d6bcdd31c7c7acde88da8660c9178687878ef2f3a2362fec2c037f244efc335ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e52c6bf36d9cb527bf8a8e717e2ee2e171da0577ee4a7f588c5910beae7ba6af3fcf8b88e5b8b3264a8e3c738c47dbbbab2a1e038f3da8af96c768727af44930"; + sha512 = "e2dc8c395b5a5aed89e3231bde24550f8f6f964b02a5fbebfd199c8263aaf79e6d4cd28808be61ff65ffa281418585f066986c49c6ab94708a28d470031935ad"; } ]; } From 44ebac05fea5daf0011601f808fcdd9c9d38f152 Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 29 Jan 2018 13:02:13 +0200 Subject: [PATCH 151/185] exfat: 1.2.4 -> 1.2.7 --- pkgs/tools/filesystems/exfat/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index f404d06eda4..831594973e2 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.4"; + version = "1.2.7"; src = fetchFromGitHub { - sha256 = "0x8wjvvlqmp0g2361m6d24csi1p4df8za2cqhyys03s1hv1qmy0k"; - rev = "v${version}"; - repo = "exfat"; owner = "relan"; + repo = "exfat"; + rev = "v${version}"; + sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; }; - buildInputs = [ fuse ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; description = "Free exFAT file system implementation"; - platforms = platforms.linux; + inherit (src.meta) homepage; license = licenses.gpl2Plus; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.linux; }; } From 192c2330d08ff2dda2ff0a7986fec9cb1e60d27b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 21 Jan 2018 02:12:40 +0700 Subject: [PATCH 152/185] nixos/less configure less with module --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/less.nix | 123 ++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 nixos/modules/programs/less.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 65718e31897..e1fdc3a6e5a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -325,6 +325,7 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; johbo = "Johannes Bornhold "; + johnazoidberg = "Daniel Schäfer "; johnmh = "John M. Harris, Jr. "; johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb3abc256fc..611318fc5a1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -84,6 +84,7 @@ ./programs/info.nix ./programs/java.nix ./programs/kbdlight.nix + ./programs/less.nix ./programs/light.nix ./programs/man.nix ./programs/mosh.nix diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix new file mode 100644 index 00000000000..a7f2290764a --- /dev/null +++ b/nixos/modules/programs/less.nix @@ -0,0 +1,123 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.less; + + configFile = '' + #command + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) + } + ${if cfg.clearDefaultCommands then "#stop" else ""} + + #line-edit + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys) + } + + #env + ${concatStringsSep "\n" + (mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables) + } + ''; + + lessKey = pkgs.runCommand "lesskey" + { src = pkgs.writeText "lessconfig" configFile; } + "${pkgs.less}/bin/lesskey -o $out $src"; + + lessPipe = pkgs.writeScriptBin "lesspipe.sh" '' + #! /bin/sh + case "$1" in + *.gz) + ${pkgs.gzip}/bin/gunzip --stdout "$1" 2>/dev/null + ;; + *.xz) + ${pkgs.xz}/bin/unxz --stdout "$1" 2>/dev/null + ;; + *.bz2) + ${pkgs.bzip2}/bin/bunzip2 --stdout "$1" 2>/dev/null + ;; + *) exit 1 + ;; + esac + exit $? + ''; + +in + +{ + options = { + + programs.less = { + + enable = mkEnableOption "less"; + + commands = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "h" = "noaction 5\e("; + "l" = "noaction 5\e)"; + }; + description = "Defines new command keys."; + }; + + clearDefaultCommands = mkOption { + type = types.bool; + default = false; + description = '' + Clear all default commands. + You should remember to set the quit key. + Otherwise you will not be able to leave less without killing it. + ''; + }; + + lineEditingKeys = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "\e" = "abort"; + }; + description = "Defines new line-editing keys."; + }; + + envVariables = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + LESS = "--quit-if-one-screen"; + }; + description = "Defines environment variables."; + }; + + autoExtract = mkOption { + type = types.bool; + default = true; + description = '' + When enabled less automatically extracts .gz .xz .bz2 files before reading them. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.less ]; + + environment.variables."LESSKEY_SYSTEM" = toString lessKey; + environment.variables."LESSOPEN" = "|${lessPipe}/bin/lesspipe.sh %s"; + + warnings = optional ( + cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) + ) '' + config.programs.less.clearDefaultCommands clears all default commands of less but there is no alternative binding for exiting. + Consider adding a binding for 'quit'. + ''; + }; + + meta.maintainers = with maintainers; [ johnazoidberg ]; + +} From 72141a630bc27660a858dc8b80b7c48818365ec7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jan 2018 14:40:46 +0100 Subject: [PATCH 153/185] ghc-8.4.1: un-revert "update to 8.4.1-alpha2" This commit undoes the revert from a74b0e717d9156c61264e15a1e7fed680a5e4b31. See https://github.com/NixOS/nixpkgs/issues/34229 and https://github.com/NixOS/nixpkgs/pull/34232 for further details about why this build seemed broken. --- pkgs/development/compilers/ghc/8.4.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 88bcc3e148b..17dc24e567f 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.20180115" +, version ? "8.4.20180122" }: assert !enableIntegerSimple -> gmp != null; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc"; - sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs"; + rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5"; + sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi"; }; enableParallelBuilding = true; From 57ecb3a8f02010c7dd0d5aa1ee33929286966dcf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 13:39:35 +0100 Subject: [PATCH 154/185] rsync: 3.1.2 -> 3.1.3 The CVE patches weren't previously applied because they depend on the enableCopyDevicesPatch parameter. The naming of the patches attribute in base.nix was misleading. The new rsync release now really fixes: * CVE-2017-15994 * CVE-2017-16548 * CVE-2017-17433 * CVE-2017-17434 --- .../networking/sync/rsync/base.nix | 39 +++++-------------- .../networking/sync/rsync/default.nix | 2 +- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 69613c489e1..abc1f27e4f6 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,42 +1,21 @@ { stdenv, fetchurl, fetchpatch }: rec { - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc"; + sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"; + }; + upstreamPatchTarball = fetchurl { + # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; + sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; }; - patches = [ - (fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd"; - }) - (fetchpatch { - name = "CVE-2017-16548.patch"; - url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce"; - sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1"; - }) - (fetchpatch { - name = "CVE-2017-17433.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51"; - sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52"; - }) - (fetchpatch { - name = "CVE-2017-17434-patch1.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1"; - sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx"; - }) - (fetchpatch { - name = "CVE-2017-17434-patch2.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9"; - sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6"; - }) - ]; meta = with stdenv.lib; { - homepage = http://rsync.samba.org/; + description = "Fast incremental file transfer utility"; + homepage = https://rsync.samba.org/; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 8c66e41f4cd..f1e3f6b7301 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mainSrc = base.src; - patchesSrc = base.patches; + patchesSrc = base.upstreamPatchTarball; srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; From 0a70f3727583e54a75223563caba2a316b78ca7c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Jan 2018 15:15:00 +0100 Subject: [PATCH 155/185] lispPackages.clwrapper: build helper; saving dynamic library search path from NIX_LISP_ --- .../lisp-modules/clwrapper/cl-wrapper.sh | 27 +++++++++++++++++++ .../quicklisp-to-nix-overrides.nix | 15 +++++------ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 55b469729f9..fa914f6d26b 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -87,6 +87,33 @@ nix_lisp_run_single_form(){ "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) } +nix_lisp_build_system(){ + NIX_LISP_FINAL_PARAMETERS=( + "$NIX_LISP_EXEC_CODE" "(progn + (asdf:make :$1) + (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:make s)))" + "$NIX_LISP_EXEC_CODE" "(progn + (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) + #+cffi(setf cffi:*foreign-library-directories* + (cffi::explode-path-environment-variable \"NIX_LISP_LD_LIBRARY_PATH\")) + #+sbcl(loop + with libpath := (uiop:split-string (uiop:getenv \"NIX_LISP_LD_LIBRARY_PATH\") + :separator \":\") + for l in sb-alien::*shared-objects* + for ns := (sb-alien::shared-object-namestring l) + do (and (> (length ns) 0) (not (equal (elt ns 0) "/")) + (let* + ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) + (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) + (when fullpath + (setf + (sb-alien::shared-object-namestring l) fullpath + (sb-alien::shared-object-pathname l) (probe-file fullpath))))) + ) + (asdf:perform (quote asdf:program-op) :$1) + )") +} + eval "$NIX_LISP_PRELAUNCH_HOOK" [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 09113bc30bb..4de4947c073 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -15,9 +15,8 @@ in export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - "$out/bin/stumpwm-lisp-launcher.sh" --eval '(asdf:make :stumpwm)' \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :stumpwm)) (function stumpwm:stumpwm))' \ - --eval '(asdf:perform (quote asdf:program-op) :stumpwm)' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" ''; @@ -69,12 +68,10 @@ in export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS $out/lib/common-lisp/query-fs" export HOME=$PWD - "$out/bin/query-fs-lisp-launcher.sh" --eval '(asdf:make :query-fs)' \ - --eval "(progn $(for i in $linkedSystems; do echo "(asdf:make :$i)"; done) )" \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :query-fs)) - (function query-fs:run-fs-with-cmdline-args))' \ - --eval '(asdf:perform (quote asdf:program-op) :query-fs)' - cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ + '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" + "$out/bin/query-fs-lisp-launcher.sh" + cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" ''; }; }; From 8a5f77ffbc8896a1f06ff4d2d61bb48d419cf66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jan 2018 09:08:38 +0100 Subject: [PATCH 156/185] nixos/borgbackup: add test We had problems to get borg's own test suite running. This test is intended to perform a quick smoke test to see whether we have missed not any important dependency necessary to create backups with borg. tested with: $ nix-build nixos/release.nix -A tests.borgbackup.x86_64-linux --- nixos/release.nix | 1 + nixos/tests/borgbackup.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/borgbackup.nix diff --git a/nixos/release.nix b/nixos/release.nix index 7c2e5b6415c..972c89c1a41 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -227,6 +227,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; + tests.borgbackup = callTest tests/borgbackup.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix new file mode 100644 index 00000000000..123b02be725 --- /dev/null +++ b/nixos/tests/borgbackup.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...}: { + name = "borgbackup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + nodes = { + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.borgbackup ]; + }; + }; + + testScript = '' + my $borg = "BORG_PASSPHRASE=supersecret borg"; + $machine->succeed("$borg init --encryption=repokey /tmp/backup"); + $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file"); + $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data"); + $machine->succeed("$borg extract /tmp/backup::test"); + $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]'); + ''; +}) From 762b1bbcbd445b93a384a5b2fd3b72a0d9a55cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jan 2018 12:31:27 +0100 Subject: [PATCH 157/185] python3Packages.pyhomematic: init at 0.1.38 --- .../python-modules/pyhomematic/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pyhomematic/default.nix diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix new file mode 100644 index 00000000000..094274cefec --- /dev/null +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pyhomematic"; + version = "0.1.38"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15b09ppn5sn3vpnwfb7gygrvn5v65k3zvahkfx2kqpk1xah0mqbf"; + }; + + # Tests reuire network access + doCheck = false; + + meta = with stdenv.lib; { + description = "Python 3 Interface to interact with Homematic devices"; + homepage = https://github.com/danielperna84/pyhomematic; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 334d09d09d2..54f116dc750 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6156,6 +6156,8 @@ in { pydotplus = callPackage ../development/python-modules/pydotplus { }; + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + pyphen = callPackage ../development/python-modules/pyphen {}; pypoppler = buildPythonPackage rec { From c0aa35a21796c02a1801555db47599839751fd69 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 29 Jan 2018 16:02:35 +0100 Subject: [PATCH 158/185] nano: 2.9.2 -> 2.9.3 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 87ead669b70..a4dd39b8f76 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f"; + sha256 = "04j05nbnp8vjjwja90d83p4s6ywyl6qhggflcjzw0p9d9gyvr0vp"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 288898d6f1dc532e1dfb8785a591a2d8ad55320b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Mon, 29 Jan 2018 22:08:32 +0700 Subject: [PATCH 159/185] nixos/less: use lesspipe package for preprocessing Rather than a custom script the less config now uses the lesspipe package config by default. --- nixos/modules/programs/less.nix | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index a7f2290764a..c0283c9e686 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -28,24 +28,6 @@ let { src = pkgs.writeText "lessconfig" configFile; } "${pkgs.less}/bin/lesskey -o $out $src"; - lessPipe = pkgs.writeScriptBin "lesspipe.sh" '' - #! /bin/sh - case "$1" in - *.gz) - ${pkgs.gzip}/bin/gunzip --stdout "$1" 2>/dev/null - ;; - *.xz) - ${pkgs.xz}/bin/unxz --stdout "$1" 2>/dev/null - ;; - *.bz2) - ${pkgs.bzip2}/bin/bunzip2 --stdout "$1" 2>/dev/null - ;; - *) exit 1 - ;; - esac - exit $? - ''; - in { @@ -93,11 +75,19 @@ in description = "Defines environment variables."; }; - autoExtract = mkOption { - type = types.bool; - default = true; + lessopen = mkOption { + type = types.nullOr types.str; + default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; description = '' - When enabled less automatically extracts .gz .xz .bz2 files before reading them. + Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed. + ''; + }; + + lessclose = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN). ''; }; }; @@ -107,8 +97,13 @@ in environment.systemPackages = [ pkgs.less ]; - environment.variables."LESSKEY_SYSTEM" = toString lessKey; - environment.variables."LESSOPEN" = "|${lessPipe}/bin/lesspipe.sh %s"; + environment.variables = { + "LESSKEY_SYSTEM" = toString lessKey; + } // optionalAttrs (cfg.lessopen != null) { + "LESSOPEN" = cfg.lessopen; + } // optionalAttrs (cfg.lessclose != null) { + "LESSCLOSE" = cfg.lessclose; + }; warnings = optional ( cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) From b05ad671fb75daf1bfd9030c950801e56905e9ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 29 Jan 2018 16:13:55 +0100 Subject: [PATCH 160/185] signing-party: 2.6 -> 2.7 --- pkgs/tools/security/signing-party/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 3ec6abc3eb1..fc7639b1d5a 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -14,12 +14,12 @@ let ]; in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.6"; + version = "2.7"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"; + sha256 = "0znklgvxn7k7p6q7r8chcj86zmzildjamr3qlqfxkj5m7yziqr21"; }; sourceRoot = "."; From 62ad671a80e2f7e1468ffc0354ea811d02660828 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 29 Jan 2018 17:42:53 +0100 Subject: [PATCH 161/185] highlight: 3.41 -> 3.42 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 90d7c2f4aa8..1fcfdd85e7a 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.41"; + version = "3.42"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; rev = "${version}"; - sha256 = "163ghkyv3v6v200pskajlsz6sbq3hi31qx7abjcbwc0dajqfngvj"; + sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; From 04b45828c671d8ff26560ff5c347e31de802e01a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 29 Jan 2018 14:40:54 +0900 Subject: [PATCH 162/185] pulp: init at 1.6.0 A python Linear Programming API. --- .../python-modules/pulp/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pulp/default.nix diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix new file mode 100644 index 00000000000..aacac72d2aa --- /dev/null +++ b/pkgs/development/python-modules/pulp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: + +buildPythonPackage rec { + pname = "PuLP"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g"; + }; + + buildInputs = []; + propagatedBuildInputs = [ pyparsing ]; + + # only one test that requires an extra + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/coin-or/pulp; + description = "PuLP is an LP modeler written in python"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..5194063a6f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22374,6 +22374,8 @@ EOF pyemd = callPackage ../development/python-modules/pyemd { }; + pulp = callPackage ../development/python-modules/pulp { }; + behave = callPackage ../development/python-modules/behave { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; From da26e920789f1d0b63ec9b5af79c611063d4561d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:39:57 -0500 Subject: [PATCH 163/185] linux-copperhead: 4.14.15.a -> 4.15.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 08649e61c7b..c449d632ba8 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.15"; + version = "4.15"; revision = "a"; - sha256 = "1ziw1wbbm35rkj69in4f2b28slplxdsz43w29hxngbp88137h1vx"; + sha256 = "1jia6isz4mi7a76rg7nd5iqll6py5kjz0myp4z0dx17xm9axcgqm"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 61043ad4d1425af2d2b5cb3af8b3740fdd90e3ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:02 -0500 Subject: [PATCH 164/185] linux: Add 4.15 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.15.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix new file mode 100644 index 00000000000..0f1aae1aa1b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +with stdenv.lib; + +import ./generic.nix (args // rec { + version = "4.15"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89405433a0..fd5ca5872e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12837,7 +12837,6 @@ with pkgs; kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.tag_hardened ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { @@ -12924,6 +12923,21 @@ with pkgs; ]; }; + linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13112,7 +13126,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_14; + linuxPackages_latest = linuxPackages_4_15; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. From 0e852076c4b23d5a29fb3aa9739e37aefb287edb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:31 -0500 Subject: [PATCH 165/185] minikube: 0.24.1 -> 0.25.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index f69b0e5eca9..d27693823a6 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.8.0"; + localkube-version = "1.9.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; + sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.24.1"; + version = "0.25.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "18b5ic4lcn84hq2ji5alyx58x9vi0b03544i5xzfgn3h2k78kynk"; + sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby"; }; patches = [ From 900c0241c911f5f51229e1f943f330f000f9688c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:50 -0500 Subject: [PATCH 166/185] kotlin: 1.2.20 -> 1.2.21 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 1c1c428ebab..108fefca863 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.20"; + version = "1.2.21"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0mx047j98jaw0smpk150ipfbb922il2kqqp3fmsz6hvvygcx6qzv"; + sha256 = "08mg0xl6n5kl71rn4ix6innqa7dlirmw1rlj9qwmqv5abp9wpwn5"; }; propagatedBuildInputs = [ jre ] ; From 0f01846e974e8151cd80a6ff9e3f53e8c1ec63d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:42:05 -0500 Subject: [PATCH 167/185] gradle: 4.4.1 -> 4.5 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c7da0947607..bdf446d4d12 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.4.1"; + name = "gradle-4.5"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "12b3d0cyj9wdk1m6pdi3500fzvgfks8x6wgm8hf0rhyzacc7vkz7"; + sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3"; }; }; From 9b7c2371f71df0ed8a300aa58feeb534e3d91369 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:55:14 -0500 Subject: [PATCH 168/185] Fix kernelPackages for 4.15 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5ca5872e3..788087d5775 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13138,6 +13138,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); + linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From 4b0000a1de2e4d45c9d3e9c232321f1dfe15e8fc Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Meunier Date: Mon, 29 Jan 2018 18:17:04 +0100 Subject: [PATCH 169/185] Pyrseas: init at 0.8.0 (#34225) * Pyrseas: init at 0.8.0 Pyrseas is a declarative tool for managing PostgreSQL schemas. * Replacing python27Packages with python2Packages * Explaining why the tests are disabled * Pyrseas: updating after review --- .../tools/database/pyrseas/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/database/pyrseas/default.nix diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix new file mode 100644 index 00000000000..20123a0600e --- /dev/null +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -0,0 +1,45 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +let + pgdbconn = pythonPackages.buildPythonPackage rec { + pname = "pgdbconn"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "pgdbconn"; + rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + ]; + }; +in + +pythonPackages.buildPythonApplication rec { + pname = "pyrseas"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "Pyrseas"; + rev = "2e9be763e61168cf20d28bd69010dc5875bd7b97"; + sha256 = "1h9vahplqh0rzqjsdq64qqar6hj1bpbc6nl1pqwwgca56385br8r"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + pythonPackages.pyyaml + pgdbconn + ]; + meta = { + description = "A declarative language to describe PostgreSQL databases"; + homepage = http://perseas.github.io/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788087d5775..ef2ce297bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7808,6 +7808,8 @@ with pkgs; pup = callPackage ../development/tools/pup { }; + pyrseas = callPackage ../development/tools/database/pyrseas { }; + qtcreator = libsForQt5.callPackage ../development/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; From 4e593638670a01392206ec5a5a700d204b01a01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jan 2018 18:45:38 +0100 Subject: [PATCH 170/185] pythonPackages.discordpy: Mark as broken --- .../python-modules/discordpy/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e11ee54f1a6..e548781fde6 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pythonOlder , withVoice ? true, libopus @@ -9,14 +9,12 @@ , pynacl }: -let +buildPythonPackage rec { pname = "discord.py"; version = "0.16.12"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; @@ -38,5 +36,9 @@ in buildPythonPackage rec { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; license = lib.licenses.mit; + + # discord.py requires websockets<4.0 + # See https://github.com/Rapptz/discord.py/issues/973 + broken = true; }; } From f2dc4781f1ff6d3f10b84aaf1fa9f0acbdace632 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 14:26:49 +0100 Subject: [PATCH 171/185] upower: 0.99.4 -> 0.99.7 --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index b1a8ac7d518..c46ed2d0c01 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.99.4"; + name = "upower-0.99.7"; src = fetchurl { url = "https://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"; + sha256 = "00d4830yvg84brdhz4kn60lr3r8rn2y8gdbhmhxm78i5mgvc5g14"; }; buildInputs = From f833dd70674e609e6e7296d1ef0481337a630b86 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 19:25:17 +0100 Subject: [PATCH 172/185] imagemagick: fetch sources from github Release tarballs are deleted after a new release. --- pkgs/applications/graphics/ImageMagick/7.0.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 0cb95d75fcf..e716146ec7a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -15,7 +15,7 @@ let cfg = { version = "7.0.7-22"; - sha256 = "12c48cfhc2a3zvhgxdywrfy8b4m2vx85vn2qj69iyni5x849xpj9"; + sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam"; patches = []; }; in @@ -24,13 +24,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; From fe0a15eaca4eeb08496a1ffe195d570f86ee7f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 29 Jan 2018 20:15:43 +0100 Subject: [PATCH 173/185] btrbk: install to bin --- pkgs/tools/backup/btrbk/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index e68bf846363..3565d8cbeb2 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { --replace '$btrbk' 'btrbk' ''; - fixupPhase = '' - patchShebangs $out/ - + preFixup = '' wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}" From 393e39e2e58722db3f46aa5e8247a4b88c813b34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 20:24:11 +0100 Subject: [PATCH 174/185] Revert "microcodeIntel: 20171117 -> 20170108" This reverts commit 9b7ef9c738e743992ef268beba13d52bcc8a0b04. Intel recommends to stop deployment of the updated microcode as it introduces unexpected system behaviour on many platforms. See https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00088&languageid=en-fr cc #33414 --- pkgs/os-specific/linux/microcode/intel.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index f7393d79cc2..97843b2253f 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20180108"; + version = "20171117"; src = fetchurl { - url = "https://downloadmirror.intel.com/27431/eng/microcode-${version}.tgz"; - sha256 = "0c214238mjks07zwif07f4041c74jil522sy78r4kjs6lniilgq6"; + url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz"; + sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck"; }; buildInputs = [ libarchive ]; From 106666365333684cac004e688f2fef5ed3316300 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 29 Jan 2018 21:45:02 +0100 Subject: [PATCH 175/185] perlPackages: bump some package versions - Crypt-JWT: 0.018 -> 0.019 - DBIx-Class: 0.082840 -> 0.082841 - Getopt-Long-Descriptive: 0.100 -> 0.101 - SQL-Abstract: 1.81 -> 1.85 --- pkgs/top-level/perl-packages.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3dffc1ab312..7989f742b83 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2722,10 +2722,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.018"; + name = "Crypt-JWT-0.019"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "90e78f7f0ced17e5c2080ad8c7008ce3badd05186e2ff20cf9c7232ed863cdaf"; + sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -3835,15 +3835,12 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage rec { - # tests broken again - doCheck = false; - name = "DBIx-Class-0.082840"; + name = "DBIx-Class-0.082841"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; + sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; - patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release - buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; + buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; @@ -6053,10 +6050,10 @@ let self = _self // overrides; _self = with self; { }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.100"; + name = "Getopt-Long-Descriptive-0.101"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1451e79310d1630de37690e3aba5c38ea5f01a486c5a43f0cd95bef2a02dffb6"; + sha256 = "752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -6064,7 +6061,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12313,17 +12309,16 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.81"; + name = "SQL-Abstract-1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "5f4d5618ce2424d62bbfdb5228b382e8be0e0ccedbb273d6d850e25d07e64f9f"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ HashMerge MROCompat Moo ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo SubQuote ]; meta = { description = "Generate SQL from Perl data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 609a86bbc36126c0cb22c2bca2883e1440620767 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Mon, 29 Jan 2018 20:51:58 +0000 Subject: [PATCH 176/185] keepass: change from mono40 to mono54 Issue #31859 (https://github.com/NixOS/nixpkgs/issues/31859) highlighted TLSv1.1 / TLSv1.2 support isn't available with older versions of Mono 4. This change moves to use Mono 5.4. Tested as working with Keepass v2.38 for which PR https://github.com/NixOS/nixpkgs/pull/34360 is already open. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffcba0951e..35fc715f0b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14977,7 +14977,9 @@ with pkgs; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; - keepass = callPackage ../applications/misc/keepass { }; + keepass = callPackage ../applications/misc/keepass { + buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; + }; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; From 499b3edb306988d9ec91db50174aa85a896e585b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 28 Jan 2018 20:36:51 +0100 Subject: [PATCH 177/185] criu: 2.12.1 -> 3.7 cc @thoughtpolice --- .../linux/criu/criu-2.12.1-glibc-2.26.patch | 13 ------------- pkgs/os-specific/linux/criu/default.nix | 11 ++--------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch diff --git a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch deleted file mode 100644 index 916161e35a4..00000000000 --- a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/criu/cr-restore.c -+++ b/criu/cr-restore.c -@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void) - (1 << SIGSYS) |\ -- (1 << SIGUNUSED)|\ - (1 << SIGSTKFLT)|\ ---- a/test/zdtm/static/pthread01.c -+++ b/test/zdtm/static/pthread01.c -@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf) - COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); -- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); -+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); - #undef COLLECT diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4ceb397d9f8..4ef162e56c7 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,30 +4,23 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.12.1"; + version = "3.7"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; + sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq"; }; - patches = [ ./criu-2.12.1-glibc-2.26.patch ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; postPatch = '' - chmod +w ./scripts/gen-offsets.sh - substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto - - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - sed 1i'#include ' -i criu/include/util.h ''; buildPhase = "make PREFIX=$out"; From 8baa11d46cf6647a06be691ba272814083e59bba Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 30 Jan 2018 00:18:22 +0100 Subject: [PATCH 178/185] rtv: 1.19.0 -> 1.21.0 --- pkgs/applications/misc/rtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 02af4c28d59..c9064d93740 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with pythonPackages; buildPythonApplication rec { - version = "1.19.0"; + version = "1.21.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7"; + sha256 = "0srm01nrb23hdmj3ripsa9p8nv2cgss3m6and9rdr875qw5ii130"; }; # Tests try to access network From e4570af4933a71ef701e0267c0d400b09dd44523 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 22 Jan 2018 20:16:50 -0800 Subject: [PATCH 179/185] beegfs: add rdma support --- pkgs/os-specific/linux/beegfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 1bb5612ce92..03b485b0ae3 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, unzip, which -, libuuid, attr, xfsprogs, cppunit +, libuuid, attr, xfsprogs, cppunit, rdma-core , zlib, openssl, sqlite, jre, openjdk, ant } : @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant]; - buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre ]; + buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre rdma-core ]; postPatch = '' patchShebangs ./ @@ -42,9 +42,9 @@ in stdenv.mkDerivation rec { buildPhase = '' for i in ${toString subdirs}; do - make -C $i + make -C $i BEEGFS_OPENTK_IBVERBS=1 done - make -C beegfs_admon/build admon_gui + make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1 ''; installPhase = '' From 043dece5b7de97930d9f010c880d1bf3eae6a61d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 24 Jan 2018 00:27:00 -0800 Subject: [PATCH 180/185] beegfs: build beeond --- pkgs/os-specific/linux/beegfs/default.nix | 36 +++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 03b485b0ae3..6cf233694cd 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, pkgconfig, unzip, which , libuuid, attr, xfsprogs, cppunit, rdma-core , zlib, openssl, sqlite, jre, openjdk, ant +, openssh, perl, gfortran } : let version = "6.17"; subdirs = [ + "beeond_thirdparty/build" + "beeond_thirdparty_gpl/build" "beegfs_thirdparty/build" "beegfs_opentk_lib/build" "beegfs_common/build" @@ -30,14 +33,34 @@ in stdenv.mkDerivation rec { sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; }; - nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant]; - buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre rdma-core ]; + nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ]; + + buildInputs = [ + libuuid + attr + xfsprogs + zlib + openssl + sqlite + jre + rdma-core + openssh + gfortran ]; + + hardeningDisable = [ "format" ]; # required for building beeond postPatch = '' patchShebangs ./ find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \; find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \; find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \; + + # unpack manually and patch variable name + sed -i '/tar -C $(SOURCE_PATH) -xzf $(PCOPY_TAR)/d' beeond_thirdparty/build/Makefile + cd beeond_thirdparty/source + tar xf pcopy-0.96.tar.gz + sed -i 's/\([^_]\)rank/\1grank/' pcopy-0.96/src/pcp.cpp + cd ../.. ''; buildPhase = '' @@ -93,6 +116,12 @@ in stdenv.mkDerivation rec { cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir cp -r beegfs_client_devel/include/* $includeDir + + cp beeond_thirdparty_gpl/build/parallel $out/bin + cp beeond_thirdparty/build/pcopy/p* $out/bin + cp beeond_thirdparty/build/pcopy/s* $out/bin + cp -r beeond/scripts/* $out + cp beeond/source/* $out/bin ''; postFixup = '' @@ -100,6 +129,9 @@ in stdenv.mkDerivation rec { --replace " java " " ${jre}/bin/java " \ --replace "/opt/beegfs/beegfs-admon-gui/beegfs-admon-gui.jar" \ "$libDirPkg/beegfs-admon-gui.jar" + + substituteInPlace $out/bin/beeond \ + --replace /opt/beegfs/sbin "$out/bin" ''; doCheck = true; From 6c744fc93da0f50e439030d142ea2cf0709b920a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Jan 2018 10:09:36 +0100 Subject: [PATCH 181/185] pyprof2calltree: init at 1.4.3 (#34379) --- lib/maintainers.nix | 1 + .../profiling/pyprof2calltree/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/profiling/pyprof2calltree/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ed3fcd81951..d579395b20b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -617,6 +617,7 @@ sellout = "Greg Pfeil "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; + sfrijters = "Stefan Frijters "; shanemikel = "Shane Pearlman "; shawndellysse = "Shawn Dellysse "; sheenobu = "Sheena Artrip "; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix new file mode 100644 index 00000000000..b2497633a68 --- /dev/null +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "pyprof2calltree"; + version = "1.4.3"; + + # Fetch from GitHub because the PyPi packaged version does not + # include all test files. + src = fetchFromGitHub { + owner = "pwaller"; + repo = "pyprof2calltree"; + rev = "v" + version; + sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + }; + + meta = with lib; { + description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; + homepage = https://pypi.python.org/pypi/pyprof2calltree/; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2bc56aea51..fc958838f4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7792,6 +7792,8 @@ with pkgs; pprof = callPackage ../development/tools/profiling/pprof { }; + pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + prelink = callPackage ../development/tools/misc/prelink { }; premake3 = callPackage ../development/tools/misc/premake/3.nix { }; From ab5357b80d11565d691b61e00a13e5d128762984 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 07:43:41 +0200 Subject: [PATCH 182/185] eternal-terminal: init at 4.1.2 --- .../networking/eternal-terminal/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/eternal-terminal/default.nix diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix new file mode 100644 index 00000000000..8941494e316 --- /dev/null +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: + +stdenv.mkDerivation rec { + name = "eternal-terminal-${version}"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "MisterTea"; + repo = "EternalTCP"; + rev = "refs/tags/et-v${version}"; + sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags glog libsodium protobuf ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote shell that automatically reconnects without interrupting the session"; + license = licenses.asl20; + homepage = https://mistertea.github.io/EternalTCP/; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc958838f4a..ece4b90f5c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1107,6 +1107,8 @@ with pkgs; et = callPackage ../applications/misc/et {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + f3 = callPackage ../tools/filesystems/f3 { }; fac = callPackage ../development/tools/fac { }; From af38f1a5e78b2a69e2cc1a95d53102ff8ce74705 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 13:11:58 +0200 Subject: [PATCH 183/185] seturgent: Move out from linuxPackages_* It's not a kernel module at all! --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ece4b90f5c8..6064c87a251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13086,8 +13086,6 @@ with pkgs; prl-tools = callPackage ../os-specific/linux/prl-tools { }; - seturgent = callPackage ../os-specific/linux/seturgent { }; - sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) @@ -13414,6 +13412,8 @@ with pkgs; setools = callPackage ../os-specific/linux/setools { }; + seturgent = callPackage ../os-specific/linux/seturgent { }; + shadow = callPackage ../os-specific/linux/shadow { }; sinit = callPackage ../os-specific/linux/sinit { From 89d66b84197816cdfb83ffd211ed8feb47553bda Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 30 Jan 2018 14:20:55 +0100 Subject: [PATCH 184/185] pythonPackages.xdot: 0.7 -> 0.9 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 272b57298e5..1820125b0a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18664,11 +18664,11 @@ EOF persistent = callPackage ../development/python-modules/persistent {}; xdot = buildPythonPackage rec { - name = "xdot-0.7"; + name = "xdot-0.9"; src = pkgs.fetchurl { - url = "mirror://pypi/x/xdot/xdot-0.7.tar.gz"; - sha256 = "1q0f3pskb09saw1qkd2s6vmk80rq5zjhq8l93dfr2x6r04r0q46j"; + url = "mirror://pypi/x/xdot/${name}.tar.gz"; + sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; }; nativeBuildInputs = with pkgs; [ wrapGAppsHook ]; From f7bb9f67777b27b2e2fde6afd5012215293eaa26 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 30 Jan 2018 13:35:45 +0000 Subject: [PATCH 185/185] vscode: 1.19.2 -> 1.19.3 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 6b449193337..5f1d5c50d4e 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.19.2"; + version = "1.19.3"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "05qfcmwl1r43slwkb2rxh99hwpzd8c622la0ffd9p2jg4lbkgs1p"; - "x86_64-linux" = "0kjwmw68av9mnqcg1vaazm3k240y9jvbng6n7ycgzxwddzx0qlac"; - "x86_64-darwin" = "1mjmi5r9qlc6ggh3w566454ar06by15xsm6dymr8zv4sb352w70h"; + "i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr"; + "x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k"; + "x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";