From f099df3c80e589cd68a000af2e5fdceaf670bdd4 Mon Sep 17 00:00:00 2001 From: Laverne Schrock Date: Mon, 21 Nov 2016 18:43:03 -0600 Subject: [PATCH 001/138] make-desktopitem: make genericName optional --- .../make-desktopitem/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f5b4e5af93a..f8c31ed5c1d 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,36 +1,48 @@ -{stdenv}: +{stdenv, lib}: { name , type ? "Application" , exec -, icon ? "" -, comment ? "" +, icon ? null +, comment ? null , terminal ? "false" , desktopName -, genericName -, mimeType ? "" +, genericName ? null +, mimeType ? null , categories ? "Application;Other;" , startupNotify ? null -, extraEntries ? "" +, extraEntries ? null }: stdenv.mkDerivation { name = "${name}.desktop"; - buildCommand = '' + + buildCommand = let + + optionalEntriesList = [{k="Icon"; v=icon;} + {k="Comment"; v=comment;} + {k="GenericName"; v=genericName;} + {k="MimeType"; v=mimeType;} + {k="StartupNotify"; v=startupNotify;}]; + + valueNotNull = {k, v}: v != null; + entriesToKeep = builtins.filter valueNotNull optionalEntriesList; + + mkEntry = {k, v}: k + "=" + v; + optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; + + in + '' mkdir -p $out/share/applications cat > $out/share/applications/${name}.desktop < Date: Sat, 11 Aug 2018 16:01:00 -0400 Subject: [PATCH 002/138] libndtypes: init at 0.2.0dev3 Dynamic types for data description and in-memory computations --- .../libraries/libndtypes/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libndtypes/default.nix diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix new file mode 100644 index 00000000000..685518efbd2 --- /dev/null +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + name = "libndtypes-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "ndtypes"; + rev = "v${version}"; + sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + }; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "Dynamic types for data description and in-memory computations"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fb84e68be4..7b2b5ebbbb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1388,6 +1388,8 @@ with pkgs; lief = callPackage ../development/libraries/lief {}; + libndtypes = callPackages ../development/libraries/libndtypes { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; From fc2bde6d7a362a7f75e19f3e445a9b0f528e1681 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 13 Aug 2018 19:42:47 +0200 Subject: [PATCH 003/138] nixos/switch-to-configuration: reload user units When rebuilding you have to manually run `systemctl --user daemon-reload`. It gathers all authenticated users using `loginctl list-user` and runs `daemon-reload` for each of them. This is a first step towards a `nixos-rebuild` which is able to reload user units from systemd. The entire task is fairly hard, however I consider this patch usable as it allows to restart units without running `daemon-reload` for each authenticated user. --- nixos/doc/manual/release-notes/rl-1809.xml | 7 +++++++ .../system/activation/switch-to-configuration.pl | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index d527984f5ef..0cb4874a1a2 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -422,6 +422,13 @@ inherit (pkgs.nixos { The module option is now defaulted to true. + + + The config activation script of nixos-rebuild now + reloads + all user units for each authenticated user. + + diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index ecd35767e01..b3fe6caf62d 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -412,6 +412,18 @@ system("@systemd@/bin/systemctl", "reset-failed"); # Make systemd reload its units. system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; +# Reload user units +open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'; +while (my $f = <$listActiveUsers>) { + next unless $f =~ /^\s*(?\d+)\s+(?\S+)/; + my ($uid, $name) = ($+{uid}, $+{user}); + print STDERR "reloading user units for $name...\n"; + + system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload"); +} + +close $listActiveUsers; + # Set the new tmpfiles print STDERR "setting up tmpfiles\n"; system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; From 17876c2cf1d14dd1c0a42b1030d6ada21c899941 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Fri, 17 Aug 2018 12:57:33 +0200 Subject: [PATCH 004/138] nixos/zsh: Adds enableGlobalCompInit option --- nixos/modules/programs/zsh/zsh.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 42d4e1d4ada..0ecf2945a87 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -87,6 +87,19 @@ in type = types.bool; }; + + enableGlobalCompInit = mkOption { + default = cfg.enableCompletion; + description = '' + Enable execution of compinit call for all interactive zsh shells. + + This option can be used if the user wants to extend its + fpath and a custom compinit + call in the local config is required. + ''; + type = types.bool; + }; + }; }; @@ -159,7 +172,7 @@ in fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) done - ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} + ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} ${cfge.interactiveShellInit} From a50807e1b8b02919a18d0d0d182fe7dd0201059d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Aug 2018 21:39:10 +0200 Subject: [PATCH 005/138] vim_configurable: fix lua reference --- pkgs/applications/editors/vim/configurable.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3711b3cdcee..6c20ac8bd08 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby +{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -28,7 +28,8 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge # allow this to be disabled by setting config.vim.darwin to false , darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: with args; +, ... +}: let @@ -100,7 +101,7 @@ in stdenv.mkDerivation rec { "--disable-gtktest" ] ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${args.lua}" + "--with-lua-prefix=${lua}" "--enable-luainterp" ] ++ stdenv.lib.optionals pythonSupport [ @@ -148,7 +149,7 @@ in stdenv.mkDerivation rec { postInstall = '' '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ "$out"/bin/{vim,gvim} ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37bbf0ed0c8..99e2fb9cf97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18836,7 +18836,6 @@ with pkgs; vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; - inherit lua; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; guiSupport = if stdenv.isDarwin then "gtk2" else "gtk3"; }); From 8a6064a526c98cf6daf51f8c02e961098f6b792e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Aug 2018 21:41:15 +0200 Subject: [PATCH 006/138] vim_configurable: make gtk optional Using vim_configurable.override { guiSupport = "no"; } would still pull in gtk2 as a dependency. --- pkgs/applications/editors/vim/configurable.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 6c20ac8bd08..d0d0089dbcc 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -129,7 +129,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ (if guiSupport == "gtk3" then [gtk3] else [gtk2]) + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python From e2ef32765246fa226e88f5ba22d281ee4396e1af Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Aug 2018 21:52:51 +0200 Subject: [PATCH 007/138] vim_configurable: disable darwinSupport by default Using gtk + darwin support seems broken at the moment, we probably want guiSupport = "carbon" instead but that doesn't work and something like macvim is probably better for that. This fixes the build while keeping guiSupport enabled which might be desirable for eg. +clientserver. Fixes #45025 --- pkgs/applications/editors/vim/configurable.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d0d0089dbcc..73db70880f1 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -24,9 +24,7 @@ , cscopeSupport ? config.vim.cscope or true # Enable cscope interface , netbeansSupport ? config.netbeans or true # Enable NetBeans integration support. , ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys -# By default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support +, darwinSupport ? config.vim.darwin or false # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support , ... }: @@ -100,6 +98,8 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] + ++ stdenv.lib.optional stdenv.isDarwin + (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ stdenv.lib.optionals luaSupport [ "--with-lua-prefix=${lua}" "--enable-luainterp" @@ -144,9 +144,6 @@ in stdenv.mkDerivation rec { cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim ''; - NIX_LDFLAGS = stdenv.lib.optionalString (darwinSupport && stdenv.isDarwin) - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; - postInstall = '' '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ From 0b701f479f1d9690c17e835e6851bb2b99ba2177 Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Mon, 20 Aug 2018 17:42:51 +0300 Subject: [PATCH 008/138] cryptsetup: 2.0.3 -> 2.0.4 --- pkgs/os-specific/linux/cryptsetup/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fc13d97429c..9bcfbeadca5 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,21 +5,13 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.3"; + name = "cryptsetup-2.0.4"; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; + sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; - patches = [ - # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. - (fetchpatch { - url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; - sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; - }) - ]; - NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ From bf453ad4e567836ec1030fd01ac588196f0b675f Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Mon, 20 Aug 2018 17:43:48 +0300 Subject: [PATCH 009/138] Split outputs to out, dev and man --- pkgs/os-specific/linux/cryptsetup/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 9bcfbeadca5..7a38c41bc34 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -7,6 +7,8 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { name = "cryptsetup-2.0.4"; + outputs = [ "out" "dev" "man" ]; + src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; From cfc3d7c9181f543ddb2cf4aa61112957f58e4a4a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Aug 2018 22:43:52 +0200 Subject: [PATCH 010/138] vim_configurable: use gtk3 on darwin --- pkgs/applications/editors/vim/configurable.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 73db70880f1..0945b4e4570 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -13,7 +13,7 @@ , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or "auto" +, guiSupport ? config.vim.gui or "gtk3" , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99e2fb9cf97..59c4ed9d6ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9682,6 +9682,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; + # On darwin gtk uses cocoa by default instead of x11. + gtk3-x11 = gtk3.override { + x11Support = true; + }; + gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -18837,7 +18842,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; - guiSupport = if stdenv.isDarwin then "gtk2" else "gtk3"; + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; From 7ef0a74d1b80cdcfcc2fb990fe32c00727e57311 Mon Sep 17 00:00:00 2001 From: Thys Date: Wed, 22 Aug 2018 02:45:07 -0700 Subject: [PATCH 011/138] faustlive: init at 2017-12-05 --- pkgs/applications/audio/faust/faustlive.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/faust/faustlive.nix diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix new file mode 100644 index 00000000000..b8ff73f2cb3 --- /dev/null +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which +}: + +stdenv.mkDerivation rec { + name = "faustlive-${version}"; + version = "2017-12-05"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faustlive"; + rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; + sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + }; + + buildInputs = [ + llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = "patchShebangs Build/Linux/buildversion"; + + meta = with stdenv.lib; { + description = "A standalone just-in-time Faust compiler"; + longDescription = '' + FaustLive is a standalone just-in-time Faust compiler. It tries to bring + together the convenience of a standalone interpreted language with the + efficiency of a compiled language. It's ideal for fast prototyping. + ''; + homepage = http://faust.grame.fr/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c804b47afe..ed900c8f464 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21345,6 +21345,8 @@ with pkgs; faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; + faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; + fceux = callPackage ../misc/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; From fe0ee602714fbccc56a0fce36ffc3f609bde14f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 20:16:06 -0700 Subject: [PATCH 012/138] setbfree: 0.8.7 -> 0.8.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/setbfree/versions. --- pkgs/applications/audio/setbfree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 905de343117..1047734a2c1 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; + sha256 = "1ldxwds99azingkjh246kz7x3j7307jhr0fls5rjjbcfchpg7v99"; }; patchPhase = '' From aaf448ec50d423525231728e3e7790c96a51c474 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 20:38:42 -0700 Subject: [PATCH 013/138] riemann_c_client: 1.10.2 -> 1.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riemann-c-client/versions. --- pkgs/tools/misc/riemann-c-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 68d9df987d8..bbbb19fc200 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.2"; + name = "riemann-c-client-1.10.3"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "185wn6fqgrs16f9c0lkzw14477wmkgandz86h4miw7cgi7ki4l5i"; + sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 66540ba28f88163a6d9b55c68eb3d4f17f6055d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 21:26:48 -0700 Subject: [PATCH 014/138] qpdf: 8.1.0 -> 8.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qpdf/versions. --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 0aa39532325..79deb482161 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.1.0"; +let version = "8.2.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx"; + sha256 = "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl"; }; nativeBuildInputs = [ perl ]; From 49ac554094768bcd4dae028adca05d3b8fffc998 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Aug 2018 23:40:16 -0700 Subject: [PATCH 015/138] openvdb: 5.1.0 -> 5.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openvdb/versions. --- pkgs/development/libraries/openvdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index be28c84e3e4..c11a93373dd 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1als53dnbnwa66k16vy95h1rhpdzz6i80c0gc2g3i17qbasl6ni5"; + sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; }; outputs = [ "out" ]; From cf9faeef3aa25964fc2e332ff23cd2a13dad7843 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 00:32:47 -0700 Subject: [PATCH 016/138] mblaze: 0.3.2 -> 0.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mblaze/versions. --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index ff4507991e4..86f945f369a 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3.2"; + version = "0.4"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; + sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; }; makeFlags = "PREFIX=$(out)"; From c8ac6f7aae119d1adf99737fb8262a5ecccdd4a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 00:44:14 -0700 Subject: [PATCH 017/138] media-player-info: 23 -> 24 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/media-player-info/versions. --- pkgs/data/misc/media-player-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index dbf92ad066f..6d00f34e978 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-23"; + name = "media-player-info-24"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in src = fetchurl { url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; + sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; }; buildInputs = [ udev systemd ]; From d895f47d689f66b2467e5144d3fb1a2294a18f16 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse Date: Wed, 22 Aug 2018 17:06:29 +0200 Subject: [PATCH 018/138] alibuild: init at 1.5.3 --- .../tools/build-managers/alibuild/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/build-managers/alibuild/default.nix diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix new file mode 100644 index 00000000000..eb805dcce7a --- /dev/null +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, python}: + +python.pkgs.buildPythonApplication rec { + pname = "alibuild"; + version = "1.5.4rc3"; + + src = python.pkgs.fetchPypi { + inherit pname version; + sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; + }; + + argparse = null; + + doCheck = false; + propagatedBuildInputs = [ + python.pkgs.requests + python.pkgs.argparse + python.pkgs.pyyaml + ]; + + meta = with lib; { + homepage = "https://alisw.github.io/alibuild/"; + description = "Build tool for ALICE experiment software"; + license = licenses.gpl3; + maintainers = with maintainers; [ ktf ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cce255e3728..87169bc1f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22247,4 +22247,8 @@ with pkgs; doing = callPackage ../applications/misc/doing { }; undervolt = callPackage ../os-specific/linux/undervolt { }; + + alibuild = callPackage ../development/tools/build-managers/alibuild { + python = python27; + }; } From 63da731e27c0d81d6a55976c3e31aa618e3c5bb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 04:29:13 -0700 Subject: [PATCH 019/138] hamlib: 3.2 -> 3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hamlib/versions. --- pkgs/development/libraries/hamlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 9825d6ed64a..b9cd31432fc 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "3.2"; + version = "3.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "07ddsykbliiv0p717z1h5vzmvsx6lm75j32rhvmwqxp8m3kbap5m"; + sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 From ac2cbcf10eb26a80bb6ca9f121a821d22af357bd Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 24 Aug 2018 15:23:36 +0200 Subject: [PATCH 020/138] clickhouse: 18.5.1 -> 18.10.3 --- pkgs/servers/clickhouse/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index b5a2c61e23e..2dcbf6737e6 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,31 +1,32 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd, ninja +, readline, sparsehash, unixODBC, zstd, ninja, jemalloc }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.5.1"; + version = "18.10.3"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31"; + sha256 = "1fm7jh9cxalvlic6pw58gblisvmvb6j0jzf3vr8p6cv7iw9238sp"; }; nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka - readline sparsehash unixODBC zstd + readline sparsehash unixODBC zstd jemalloc ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" + "-DUSE_INTERNAL_SSL_LIBRARY=False" ]; hardeningDisable = [ "format" ]; From 0cce4fed12c0c3f1c81ac7f058da7f4a29cbc82b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 11:15:06 -0700 Subject: [PATCH 021/138] claws-mail: 3.16.0 -> 3.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/claws-mail/versions. --- .../networking/mailreaders/claws-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 057c051c625..9cf0a20d76b 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,11 +32,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.16.0"; + version = "3.17.0"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"; + sha256 = "119y6q9p8zwm2xqlbkgqd119a529kjqlyldmb4h940z6c2qyjhqm"; }; outputs = [ "out" "dev" ]; From 27d714e97d4cdfae8d452603cc5b9c05fd974637 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 17:01:38 -0700 Subject: [PATCH 022/138] cb2bib: 1.9.7 -> 1.9.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cb2bib/versions. --- pkgs/applications/office/cb2bib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1dd095e577e..e4dc86ebd8d 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; + sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; From 90d3ed0096439ca51648fa9378cc4cdae940280e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Aug 2018 00:23:13 +0800 Subject: [PATCH 023/138] go_1_11: init at 1.11 --- pkgs/development/compilers/go/1.11.nix | 194 ++++++++++++++++++ .../go/remove-fhs-test-references.patch | 13 ++ .../compilers/go/remove-tools-1.11.patch | 35 ++++ .../go/skip-external-network-tests.patch | 26 +++ .../compilers/go/skip-nohup-tests.patch | 22 ++ pkgs/top-level/all-packages.nix | 4 + 6 files changed, 294 insertions(+) create mode 100644 pkgs/development/compilers/go/1.11.nix create mode 100644 pkgs/development/compilers/go/remove-fhs-test-references.patch create mode 100644 pkgs/development/compilers/go/remove-tools-1.11.patch create mode 100644 pkgs/development/compilers/go/skip-external-network-tests.patch create mode 100644 pkgs/development/compilers/go/skip-nohup-tests.patch diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix new file mode 100644 index 00000000000..eddd16dc199 --- /dev/null +++ b/pkgs/development/compilers/go/1.11.nix @@ -0,0 +1,194 @@ +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, procps +, pcre, cacert, llvm +, Security, Foundation +, makeWrapper, git, subversion, mercurial, bazaar }: + +let + + inherit (stdenv.lib) optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + +in + +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "go"; + rev = "go${version}"; + sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q"; + }; + + GOCACHE = "off"; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isAarch32 '' + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.9.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./remove-fhs-test-references.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.isAarch32 then "arm" + else if stdenv.isAarch64 then "arm64" + else throw "Unsupported system"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; + + configurePhase = '' + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + export GO_BUILDER_NAME=nix + + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ulimit -a + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + + installPhase = '' + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" + ''; + + preFixup = '' + rm -r $out/share/go/pkg/bootstrap + ln -s $out/share/go/bin $out/bin + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ go_bootstrap ]; + + meta = with stdenv.lib; { + branch = "1.9"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-fhs-test-references.patch b/pkgs/development/compilers/go/remove-fhs-test-references.patch new file mode 100644 index 00000000000..1ea7f85d529 --- /dev/null +++ b/pkgs/development/compilers/go/remove-fhs-test-references.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go +index d694990..87fa259 100644 +--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go ++++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go +@@ -452,7 +452,7 @@ func TestGetwd(t *testing.T) { + defer fd.Close() + // These are chosen carefully not to be symlinks on a Mac + // (unlike, say, /var, /etc) +- dirs := []string{"/", "/usr/bin"} ++ dirs := []string{"/"} + switch runtime.GOOS { + case "android": + dirs = []string{"/", "/system/bin"} diff --git a/pkgs/development/compilers/go/remove-tools-1.11.patch b/pkgs/development/compilers/go/remove-tools-1.11.patch new file mode 100644 index 00000000000..cff35999a83 --- /dev/null +++ b/pkgs/development/compilers/go/remove-tools-1.11.patch @@ -0,0 +1,35 @@ +diff --git a/src/go/build/build.go b/src/go/build/build.go +index b68a712..b60bf19 100644 +--- a/src/go/build/build.go ++++ b/src/go/build/build.go +@@ -1708,7 +1708,7 @@ func init() { + } + + // ToolDir is the directory containing build tools. +-var ToolDir = getToolDir() ++var ToolDir = runtime.GOTOOLDIR() + + // IsLocalImport reports whether the import path is + // a local import path, like ".", "..", "./foo", or "../foo". +diff --git a/src/runtime/extern.go b/src/runtime/extern.go +index 7171b13..18a942c 100644 +--- a/src/runtime/extern.go ++++ b/src/runtime/extern.go +@@ -229,6 +229,17 @@ func GOROOT() string { + return sys.DefaultGoroot + } + ++// GOTOOLDIR returns the root of the Go tree. ++// It uses the GOTOOLDIR environment variable, if set, ++// or else the root used during the Go build. ++func GOTOOLDIR() string { ++ s := gogetenv("GOTOOLDIR") ++ if s != "" { ++ return s ++ } ++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH ++} ++ + // Version returns the Go tree's version string. + // It is either the commit hash and date at the time of the build or, + // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/skip-external-network-tests.patch b/pkgs/development/compilers/go/skip-external-network-tests.patch new file mode 100644 index 00000000000..5791b213cb5 --- /dev/null +++ b/pkgs/development/compilers/go/skip-external-network-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go +index 85cae90..94b4edd 100644 +--- a/src/cmd/go/go_test.go ++++ b/src/cmd/go/go_test.go +@@ -4946,6 +4946,8 @@ func TestBuildmodePIE(t *testing.T) { + } + + func TestExecBuildX(t *testing.T) { ++ t.Skipf("skipping, test requires networking") ++ + tooSlow(t) + if !canCgo { + t.Skip("skipping because cgo not enabled") +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 00a84d1..27f9ec9 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -968,6 +968,8 @@ func TestDialerControl(t *testing.T) { + // mustHaveExternalNetwork is like testenv.MustHaveExternalNetwork + // except that it won't skip testing on non-iOS builders. + func mustHaveExternalNetwork(t *testing.T) { ++ t.Skipf("Nix sandbox does not have networking") ++ + t.Helper() + ios := runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") + if testenv.Builder() == "" || ios { diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/pkgs/development/compilers/go/skip-nohup-tests.patch new file mode 100644 index 00000000000..1da07407d04 --- /dev/null +++ b/pkgs/development/compilers/go/skip-nohup-tests.patch @@ -0,0 +1,22 @@ +diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go +index 3d79c7a..6e0f7b4 100644 +--- a/src/os/signal/signal_test.go ++++ b/src/os/signal/signal_test.go +@@ -217,6 +217,8 @@ var checkSighupIgnored = flag.Bool("check_sighup_ignored", false, "if true, Test + + // Test that Ignored(SIGHUP) correctly detects whether it is being run under nohup. + func TestDetectNohup(t *testing.T) { ++ t.Skip("Fails in nix build environment") ++ + if *checkSighupIgnored { + if !Ignored(syscall.SIGHUP) { + t.Fatal("SIGHUP is not ignored.") +@@ -306,6 +308,8 @@ func TestStop(t *testing.T) { + // Test that when run under nohup, an uncaught SIGHUP does not kill the program, + // but a + func TestNohup(t *testing.T) { ++ t.Skip("Fails in nix build environment") ++ + // Ugly: ask for SIGHUP so that child will not have no-hup set + // even if test is running under nohup environment. + // We have no intention of reading from c. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 514f5ac551b..c71f178b9ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6748,6 +6748,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; + go_1_11 = callPackage ../development/compilers/go/1.11.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + go = go_1_10; go-repo-root = callPackage ../development/tools/go-repo-root { }; From 6d903a940752478dd5f6a21a36e3d9d7edd6f788 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Aug 2018 22:27:21 +0800 Subject: [PATCH 024/138] gopherclient: Mark as broken Package does not build --- pkgs/applications/networking/gopher/gopherclient/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix index b233ca4ab47..d36533fc9e5 100644 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -40,5 +40,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + broken = true; }; } From 9336e893eb7f2816707ebe70639268d5ff3e8443 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Aug 2018 22:27:41 +0800 Subject: [PATCH 025/138] buildGoPackage: Use go 1.11 by default --- pkgs/applications/altcoins/default.nix | 7 ++- pkgs/top-level/all-packages.nix | 79 +++++++++++++++++++------- 2 files changed, 64 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index f4a49e79f6a..95d79a8650f 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: rec { @@ -51,10 +51,13 @@ rec { freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { + buildGoPackage = buildGo110Package; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; - go-ethereum-classic = callPackage ./go-ethereum-classic { }; + go-ethereum-classic = callPackage ./go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71f178b9ae..c4bc6d4efcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -706,7 +706,9 @@ with pkgs; asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - gopass = callPackage ../tools/security/gopass { }; + gopass = callPackage ../tools/security/gopass { + buildGoPackage = buildGo110Package; + }; browserpass = callPackage ../tools/security/browserpass { }; @@ -1348,7 +1350,9 @@ with pkgs; gmic = callPackage ../tools/graphics/gmic { }; - goa = callPackage ../development/tools/goa { }; + goa = callPackage ../development/tools/goa { + buildGoPackage = buildGo110Package; + }; gohai = callPackage ../tools/system/gohai { }; @@ -2091,13 +2095,17 @@ with pkgs; dev86 = callPackage ../development/compilers/dev86 { }; - diskrsync = callPackage ../tools/backup/diskrsync { }; + diskrsync = callPackage ../tools/backup/diskrsync { + buildGoPackage = buildGo110Package; + }; djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; - dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { + buildGoPackage = buildGo110Package; + }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -2933,8 +2941,12 @@ with pkgs; stdenv = stdenv_32bit; }; - gx = callPackage ../tools/package-management/gx { }; - gx-go = callPackage ../tools/package-management/gx/go { }; + gx = callPackage ../tools/package-management/gx { + buildGoPackage = buildGo110Package; + }; + gx-go = callPackage ../tools/package-management/gx/go { + buildGoPackage = buildGo110Package; + }; sbsigntool = callPackage ../tools/security/sbsigntool { }; @@ -3278,7 +3290,9 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipget = callPackage ../applications/networking/ipget { }; + ipget = callPackage ../applications/networking/ipget { + buildGoPackage = buildGo110Package; + }; ipmitool = callPackage ../tools/system/ipmitool { static = false; @@ -3960,7 +3974,9 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { }; + minio-client = callPackage ../tools/networking/minio-client { + buildGoPackage = buildGo110Package; + }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -4194,7 +4210,9 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { + buildGoPackage = buildGo110Package; + }; miller = callPackage ../tools/text/miller { }; @@ -4246,7 +4264,9 @@ with pkgs; nnn = callPackage ../applications/misc/nnn { }; - notary = callPackage ../tools/security/notary { }; + notary = callPackage ../tools/security/notary { + buildGoPackage = buildGo110Package; + }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -5522,7 +5542,9 @@ with pkgs; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); - tmsu = callPackage ../tools/filesystems/tmsu { }; + tmsu = callPackage ../tools/filesystems/tmsu { + go = go_1_10; + }; toilet = callPackage ../tools/misc/toilet { }; @@ -6752,7 +6774,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_10; + go = go_1_11; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -12638,8 +12660,11 @@ with pkgs; buildGo110Package = callPackage ../development/go-modules/generic { go = go_1_10; }; + buildGo111Package = callPackage ../development/go-modules/generic { + go = go_1_11; + }; - buildGoPackage = buildGo110Package; + buildGoPackage = buildGo111Package; go2nix = callPackage ../development/tools/go2nix { }; @@ -12997,13 +13022,17 @@ with pkgs; mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { }; + meguca = callPackage ../servers/meguca { + buildGoPackage = buildGo110Package; + }; memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; - minio = callPackage ../servers/minio { }; + minio = callPackage ../servers/minio { + buildGoPackage = buildGo110Package; + }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -13266,7 +13295,9 @@ with pkgs; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; - inherit (callPackage ../servers/monitoring/prometheus {}) + inherit (callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo110Package; + }) prometheus_1 prometheus_2 ; @@ -13292,7 +13323,9 @@ with pkgs; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; - prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; + prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { + buildGoPackage = buildGo110Package; + }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; @@ -13670,7 +13703,9 @@ with pkgs; dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; + fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { + buildGoPackage = buildGo110Package; + }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -14389,7 +14424,9 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; - go-langserver = callPackage ../development/tools/go-langserver { }; + go-langserver = callPackage ../development/tools/go-langserver { + buildGoPackage = buildGo110Package; + }; gotests = callPackage ../development/tools/gotests { }; @@ -21931,7 +21968,9 @@ with pkgs; valauncher = callPackage ../applications/misc/valauncher { }; - vault = callPackage ../tools/security/vault { }; + vault = callPackage ../tools/security/vault { + go = go_1_10; + }; vaultenv = haskellPackages.vaultenv; From 06a5fb2adab413ff761a303d5de7914032b08ed2 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 26 Aug 2018 21:43:34 +0200 Subject: [PATCH 026/138] nginx: use a compression level of 5 in recommended configuration While there is little gain of space to use a compression level of 9, the CPU usage is significant. Many experiments point to use something between 4 and 6. For example: - https://mjanja.ch/2015/03/finding-the-nginx-gzip_comp_level-sweet-spot/ - https://github.com/h5bp/server-configs-nginx/blob/3bda5b93edba147d51760e900c2079828a7dc274/nginx.conf#L93 --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 355976c4b7c..4359b3f8b6f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -92,7 +92,7 @@ let gzip on; gzip_disable "msie6"; gzip_proxied any; - gzip_comp_level 9; + gzip_comp_level 5; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; gzip_vary on; ''} From bd075eb914ca16ce9f35211445733f72ddaf0127 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 26 Aug 2018 21:48:55 +0200 Subject: [PATCH 027/138] nginx: add more gzipped MIME types The additions are: - image/svg+xml for SVG images - application/atom+xml for Atom feeds These types are also present in mime.types. For better readability, the list is sorted and formatted with one type per line. --- nixos/modules/services/web-servers/nginx/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 4359b3f8b6f..17b169f7c69 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -93,7 +93,17 @@ let gzip_disable "msie6"; gzip_proxied any; gzip_comp_level 5; - gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + gzip_types + application/atom+xml + application/javascript + application/json + application/xml + application/xml+rss + image/svg+xml + text/css + text/javascript + text/plain + text/xml; gzip_vary on; ''} From a28dc898a5bb8a28aa5813009a8c43275d3cee0a Mon Sep 17 00:00:00 2001 From: Brayden Banks Date: Sun, 26 Aug 2018 18:12:59 -0700 Subject: [PATCH 028/138] mandoc: 1.13.4 -> 1.14.4 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/mandoc/default.nix | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 657e5696041..eb5bf0f54f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -425,6 +425,11 @@ github = "Baughn"; name = "Svein Ove Aas"; }; + bb010g = { + email = "me@bb010g.com"; + github = "bb010g"; + name = "Brayden Banks"; + }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 8a62ccffa49..bf665a122d4 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mandoc-${version}"; - version = "1.13.4"; + version = "1.14.4"; src = fetchurl { - url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; - sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"; + sha256 = "24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c"; }; buildInputs = [ zlib ]; @@ -26,10 +26,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = https://mandoc.bsd.lv/; description = "suite of tools compiling mdoc and man"; + downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ramkromberg ]; + maintainers = with maintainers; [ bb010g ramkromberg ]; }; } From 23bf21f2136ab18f43885cb5bfbb1b4da1cd7470 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 26 Aug 2018 22:40:30 -0400 Subject: [PATCH 029/138] lollypop: 0.9.521 -> 0.9.522 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index dc59ba6e01a..ffaa9457527 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,14 +3,14 @@ , python36Packages, gnome3, glib, gst_all_1 }: stdenv.mkDerivation rec { - version = "0.9.521"; + version = "0.9.522"; name = "lollypop-${version}"; src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1iwv0fj50h0xynv152anisbq29jfbmb9hpm60kaa9a9hdiypskcc"; + sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5"; }; nativeBuildInputs = with python36Packages; [ From cf54311d6fec8f21aeb5e58a9713554097da5ac3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 26 Aug 2018 22:47:32 -0400 Subject: [PATCH 030/138] solargraph: 0.23.6 -> 0.25.1 --- .../development/ruby-modules/solargraph/Gemfile.lock | 8 ++++---- pkgs/development/ruby-modules/solargraph/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 54a27076b7d..ed670c11c92 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -25,8 +25,8 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - solargraph (0.23.6) + ruby-progressbar (1.10.0) + solargraph (0.25.1) coderay (~> 1.1) eventmachine (~> 1.2, >= 1.2.5) htmlentities (~> 4.3, >= 4.3.4) @@ -40,7 +40,7 @@ GEM thor (0.20.0) tilt (2.0.8) unicode-display_width (1.4.0) - yard (0.9.15) + yard (0.9.16) PLATFORMS ruby @@ -49,4 +49,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index f78f359e158..00395518af4 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -118,19 +118,19 @@ ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; solargraph = { dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01lh5vibr277vhhrgk6zl09ivb262c1qpk54ahzhc40zs309842b"; + sha256 = "1b5dljgskjpkpv2l0jpb6i8j73hidskcbp2v7fhjp7kpx94x6php"; type = "gem"; }; - version = "0.23.6"; + version = "0.25.1"; }; thor = { source = { @@ -159,9 +159,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "145pbc0x95s6x296kh1wp5ykwy6srfcz946dgj83s35g8p52z4q4"; + sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67"; type = "gem"; }; - version = "0.9.15"; + version = "0.9.16"; }; } \ No newline at end of file From df4696cf2d606e2e55158d975d1050bb820b0221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Aug 2018 08:21:43 +0100 Subject: [PATCH 031/138] mandoc: fix cc detection --- pkgs/tools/misc/mandoc/default.nix | 5 +++++ pkgs/tools/misc/mandoc/remove-broken-cc-check.patch | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/misc/mandoc/remove-broken-cc-check.patch diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index bf665a122d4..f485cb95f5d 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -19,8 +19,13 @@ stdenv.mkDerivation rec { HAVE_MANPATH=1 LD_OHASH="-lutil" BUILD_DB=0 + CC=${stdenv.cc.targetPrefix}cc ''; + patches = [ + ./remove-broken-cc-check.patch + ]; + preConfigure = '' echo $configureLocal > configure.local ''; diff --git a/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch new file mode 100644 index 00000000000..580226d165b --- /dev/null +++ b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100 ++++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100 +@@ -40,7 +40,7 @@ + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC= + CFLAGS= + LDADD= + LDFLAGS= From 2f6cc8978722d9e79fefa6a8bbda004e1ca1834e Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 27 Aug 2018 10:15:23 +0200 Subject: [PATCH 032/138] udftools: 1.0.0b3 -> 2.0 (#45583) This path also migrates to the github repo. --- pkgs/tools/filesystems/udftools/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index b912bab6826..f17f9e0d2de 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, ncurses, readline }: +{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "udftools-${version}"; - version = "1.0.0b3"; - src = fetchurl { - url = "mirror://sourceforge/linux-udf/udftools/${version}/${name}.tar.gz"; - sha256 = "180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5"; + version = "2.0"; + src = fetchFromGitHub { + owner = "pali"; + repo = "udftools"; + rev = "${version}"; + sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; }; buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; hardeningDisable = [ "fortify" ]; @@ -21,6 +24,12 @@ stdenv.mkDerivation rec { sed -e '38i#include ' -i wrudf/wrudf-cdrw.c sed -e '12i#include ' -i wrudf/wrudf-cdr.c sed -e '37i#include ' -i wrudf/ide-pc.c + + sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am + ''; + + postFixup = '' + sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules ''; meta = with stdenv.lib; { From 213f7ec05445518eb9bec749439ffb93dd795951 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Aug 2018 16:22:47 +0800 Subject: [PATCH 033/138] weechat-matrix-bridge: 2018-01-10 -> 2018-05-29 --- .../instant-messengers/weechat-matrix-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index 85faebf95a3..4a8ffaaa261 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2018-01-10"; + name = "weechat-matrix-bridge-2018-05-29"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7"; - sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3"; + rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b"; + sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw"; }; patches = [ From 4e365aa4539ccd6c53349f90b7f65b63202928c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Aug 2018 10:43:31 +0100 Subject: [PATCH 034/138] nixos/zsh: make enableGlobalCompInit description less ambiguous --- nixos/modules/programs/zsh/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 0ecf2945a87..d30b3415411 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -93,7 +93,7 @@ in description = '' Enable execution of compinit call for all interactive zsh shells. - This option can be used if the user wants to extend its + This option can be disabled if the user wants to extend its fpath and a custom compinit call in the local config is required. ''; From 15780b518cf6cdb3a0a66d603da7842bd8fcec1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 27 Aug 2018 07:03:44 -0300 Subject: [PATCH 035/138] pythonefl: 1.20.0 -> 1.21.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ba335146ce..941803b22d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15649,10 +15649,10 @@ EOF # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.20.0"; + version = "1.21.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh"; + sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; }; hardeningDisable = [ "format" ]; From 866f9bb578d48e14814a7ad557bece77d4191724 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 26 Aug 2018 17:18:15 +0200 Subject: [PATCH 036/138] navit: add supports, xkdb, and many fixes --- .../misc/navit/CMakeLists.txt.patch | 13 ++++ pkgs/applications/misc/navit/default.nix | 65 ++++++++++++++----- 2 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/misc/navit/CMakeLists.txt.patch diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch new file mode 100644 index 00000000000..7f8a75f319b --- /dev/null +++ b/pkgs/applications/misc/navit/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 763f75b..defa74a 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) + CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) + CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) + CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) +-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) ++CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) + CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) + CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) + CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 4db5ed4f8eb..5d591243f50 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,9 +1,21 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, -libXmu, freeglut, pcre, dbus-glib, glib, librsvg, freeimage, libxslt, -qtbase, qtquickcontrols, qtsvg, qtdeclarative, qtlocation, qtsensors, qtmultimedia, qtspeech, espeak, -cairo, gdk_pixbuf, pango, atk, patchelf, fetchurl, bzip2, -python, gettext, quesoglc, gd, postgresql, cmake, shapelib, SDL_ttf, fribidi}: +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib +, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango +, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc +, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper +, qtquickcontrols, qtmultimedia, qtspeech, qtsensors +, qtlocation, qtdeclarative, qtsvg +, qtSupport ? false, qtbase #need to fix qt_qpainter +, sdlSupport ? true, SDL +, xkbdSupport ? true, xkbd +, espeakSupport ? true, espeak +, postgresqlSupport ? false, postgresql +, speechdSupport ? false, speechd ? null +}: +assert speechdSupport -> speechd != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "navit-${version}"; version = "0.5.1"; @@ -21,34 +33,53 @@ stdenv.mkDerivation rec { sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; }; - #hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + patches = [ ./CMakeLists.txt.patch ]; - # TODO: fix speech options. - cmakeFlags = [ "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" ]; + NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined freeimage libxslt - libXmu freeglut python gettext quesoglc gd postgresql qtbase SDL_ttf fribidi pcre qtquickcontrols - espeak qtmultimedia qtspeech qtsensors qtlocation qtdeclarative qtsvg dbus-glib librsvg shapelib glib - cairo gdk_pixbuf pango atk ]; + # we choose only cmdline and speech-dispatcher speech options. + # espeak builtins is made for non-cmdline OS as winCE + cmakeFlags = [ + "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" + ]; - nativeBuildInputs = [ pkgconfig cmake patchelf bzip2 ]; + buildInputs = [ + gtk2 fontconfig freetype imlib2 libGLU_combined freeimage + libxslt libXmu freeglut python gettext quesoglc gd + fribidi pcre dbus dbus-glib librsvg shapelib glib + cairo gdk_pixbuf pango atk + ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] + ++ optional postgresqlSupport postgresql + ++ optional speechdSupport speechd + ++ optionals qtSupport [ + qtquickcontrols qtmultimedia qtspeech qtsensors + qtbase qtlocation qtdeclarative qtsvg + ]; + + nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; # we dont want blank screen by defaut postInstall = '' # emulate DSAMPLE_MAP - mkdir -p $out/share/navit/maps/maps + mkdir -p $out/share/navit/maps/ bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" ''; # TODO: fix upstream? postFixup = '' for lib in $(find "$out/lib/navit/" -iname "*.so" ); do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} $lib + patchelf --set-rpath ${makeLibraryPath buildInputs} $lib done + wrapProgram $out/bin/navit \ + --prefix PATH : ${makeBinPath ( + optional xkbdSupport xkbd + ++ optional espeakSupport espeak + ++ optional speechdSupport speechd ) } ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; From fca8135a877eb622f8fd1b7c1f64ad6c536303fd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Aug 2018 17:00:28 +0800 Subject: [PATCH 037/138] firefox-devedition-bin: 62.0b19 -> 62.0b20 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 40d9f07bda6..c0ba8e5e822 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b19"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ach/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b50d4951fd847fad54ea876013352712e983732278ab383d252416fe3ff18f27e8f9d5e69ba3e641af0863ec4b1fd7ca7d1b3f83950d3f22a6cdcdccb537df89"; + sha512 = "47f6ffba22960f16caa981e72d58c28f5308581c0740c15a6e2107431761e90f6751fbffbf79f2a03efbe7edc3e9f7078835d60a79de603aac1f06b09b0eee5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/af/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "db4e7f8b5731686452ca56247e989f986166f40d0f43f605cb2ac6eb40f2090ec4c49ee2377c3bcf00ffb6f89ffddb572244c3afec88faa9338ea53d6f5ba57c"; + sha512 = "a7b1e73f5f6de78b73654a153a34648fc6c65559f7489b6fcb88f763f8aaa6ea0238dcf71a19f3f97c72c4cf16a919fd1b47bf4dfeab0cbc96db8b22ee4cb932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/an/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "24216d7e0d3fa99a0163eaece6ae0c73666f75ca145fdff1c52ba91661d0b14d5d02e89c6d48688d07b32fdc854fc6fd6589f879f23b32386d13359c214bae77"; + sha512 = "626b63a3a550c92e6b8c8df8db925c3b0790cc835e7f76274bd8b2a12179d300fb2659fc47d394c8868c89f2291fdd7c865b034464a84fa454825d84e53f1fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ar/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1f34a59c7713c0b4c828abd83e288a85980d89e8e3d1d2862b67ec415510b7018f3ea1d70cfd10ede968fb999e7e1de2f9178d1cf2424838d69fcd256349dbea"; + sha512 = "14385896811e1b6e53d204caa9a3b8e56758c494376cf87309a25c4af795b34a906b959963fb96926143bc5bcd8c658e3558c5083642150fdfa3501feed67392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/as/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d5df954a5fd33c895a255b74e0933fdc27df363dc11c54d29b56df0c23ec30b50de5a4d301ee0a07a5bd0b853bddadf0653e7c1ae8f767fb8ec9b6648a8e8b0c"; + sha512 = "859413e14cdc432fb92e02d94212dea896c28a26d86972501aed1fee38610917ae70a0d2f749f4ef1432d543819f1b403d85ac3ba6563639bb1a6e6bbfb75978"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ast/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3b77ac9c8bc2871365171b35967664aa48de7ec05daa4b3b5b27580279e278a84fae727a05f7cffb1453f525bf786a41c0a105c3d5a8c36aaae896872ec481d8"; + sha512 = "139a2995639bc2fc6331f47cf1fc5d5e1df2c4f7c1d582c125c5320a54fa20f58bc0d8fcf94ef07eccb32cce6839b6e8ddc8044c2166242dddc40e861954df37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/az/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "212e319695696f777d41b9bd708401113e9acd9a6bcbd6bf671d5832642d3573198c4248c0b66444cd9ee0a8857698d1736a7f730fcc6ee679d36dfe147ebd45"; + sha512 = "b7785f29b4b6dd0dfbd325e6c51c9ea66f6fc34a6151a991506863f9169d4051af6847dbeabe4db04a7db70049b0b964ce9038c363749c3c728144037d7ae821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/be/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d00441bf268981f4e6c7cb7ff3f402e2e25b05f9a40bf02498bdc04727cf999cca5a13cc549490682aeae2bdabcdef79dcee277f783df5f4b99b20cef4692ee2"; + sha512 = "f246128a4473237afd5881eb088d334b086d2c49c79eeb051f9365f0f0bb5eefec7d0e06a67ad1d3771d81a3bffa7a665d270242155cad5b099b9d5890b7d71e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bg/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b092569cf0ff4031900b272ddbababd921d0e870b17ef0e37f39adc024844f79d27304871a7aa410f2bf6442457655c1e94cdac19c852506a5a25582280536a2"; + sha512 = "262eae9674709dba572674214ba2626c6e36b372c99ef8f278b1edd900c0a75854fce26f3cff80b669e56cb70b592d92b070582cb82ff47526c956d45f2f1936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bn-BD/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "2657869292dcc8788a3d9639ca6b4a29ca798c07c49d8baec8f56a5425c24479061e63e49537398e621cf4078b49d1718440efdfb27c622905191de42ffd36ad"; + sha512 = "69f03e13c99f621bd83061bf1cc8ddf9e761e05eb5a11c35e8a1e4a7d82cf258fa32292dde088ef5c383320ee59a05da8e46ddce6e6283aad3463a7ebfe68394"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bn-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "dd1f0055560511ff0bc4124b76aa133f113052a5a61ccd739c0bc013e13bf0a98fab82456158ca0bd2714bb7b5541eff56b80c7b9125e76982481645b3c66052"; + sha512 = "1fc385ea3e38dee112329e72b7397c031b4bff02bd1e3e863d673f96c98366115d2112ee5364da93a34ce3de631e81b156e0f51895f64c1fe84bcf3724b744c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/br/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "45cabc8ca67cec48fa17a78fbbb2f6608e33d74a5ce67895cfab1503eed6d111bbce954d18ae4640e2f65eeed8ec3d1db363138574464bca29dddfbdd617f2eb"; + sha512 = "45ee27e4889203ac4b6267388e5dc9a557713e044c5ede07dfe039358ddd9c91c4b79f5205f3b9c0f5c770232ac4ad16aa87c26d4a436a5f4e58f44c861649c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/bs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8c80bf7578ff9894fa4d9e4d324f8fd39520110c9a9740447981104833d59a6ff782da76ecc5f54ea30c9d59b53a06cbc82060a1fee78e4d71b93180017ba16a"; + sha512 = "a190925733374f1abd35c974b2bf4ff091d208c274ae59f04f6efe2cd904e607829212d23efec2f6ed1c297b1ee8eedb797b460b815800f18b4a3969589b33c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ca/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f1cf9a5917a7a2a79c6c50e3d66adf4c0c1ab82f7a27baeda58e8d068722a8ad7758eecc1f0d0f06b63c327fa4f3287c0b3f973c96ceefdcd9c9f92e8bd062a3"; + sha512 = "35fd9322687c3a7bd4163f5b6493bf4385b4a08c8060ae4be47b9d1aef18b7847977d32bc67579f7543549cb803a1a3a06d655c9e02e9203860316c9364bb26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cak/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7db5cd08913b24a76885bde03d64a29b65b215ffe4e0d7293761617096f27c77b10a1da31e964d22e71104f23deb1e40b200be7aeb2850d9f6b0a53cfd181f6a"; + sha512 = "ec3e12bc71fa7976dc4ed73eca01b4e38c3e4c69d257ed2a51c913ab1c7f24e14b1ab0cd6da90c76d432f2efda02c350f752293c41d62ca4fdac74ed7f94b179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bdc506d7c6426847b24eeb34ad2b25813c6093e6cc4b1f009f6516bba9a6845acad6bc658f28439c66807221e589b59434816d8fa3981d0a68e6e9aaa046fd2c"; + sha512 = "73af384a8a5f0efd33954e6dcd4cf1043dd7fd4accca1aaa93f58bd3742488e01ed4c4911694c21f45cfd4d2b4e1b213d7d18b233360a1eafbdc14e63cf8d515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/cy/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b66af4d78e65f4e19e0e4a4360448d978acbb7e4cb0707727ecf3bb9c1210f127563fdca8c4406987954ddbad4537fda14a967d316f1b697613ea80b4d6b68e1"; + sha512 = "07c8c875b8c3b8b613d4405de0cbbbaa5b1a3808e754e6135bd2ed368f674bec3033e5cc069dee811cb4b57ba884437a1607c9d1c0277b2d8aae6904b0dca007"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/da/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4bf65f71df3dd829316b998ddfd8491b409daae82f7f67592a557aa9a9726831d5f60bd4bc8a03f747f88410ae9f0947cbb111b079612b2a3bce03b64a44fe1a"; + sha512 = "7c65fa62a1f0fd65da54f8ddbd33b4df1f375a567c7c5daed49d28be1ce738c9fa7689fc7302ed3ac865db53aee7a287702936a9db623815febb20b7c04a627d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/de/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "3d287151bb8b9e8104245545c1d3fb3726c2452455f10be5b0237be9add9b8d831cdcb92c48108d1db7ce5d1d39cabc1dd1813d844107f6ce7b9f014e15f53af"; + sha512 = "0fa1128a70b4658a7a32cdb0002ecd069486192b2fec14664da94333627028e08d9d942d1d04a14c672210da3612170d7122dd91744c18e41cc0a67f5e333071"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/dsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c7e78c337fb10edc86e92cd8b1769ad1188004e269f382b0ff066bcd36609eb7040f37fe3c5a5f9132411eb8f622e2bc54db61c6270fdb5171767e6dae70c80c"; + sha512 = "4b79c34b4a56033a885837a74c9a7bd10a6117f7f184a0b9b0801300ccda5cebe94b7f19eebbf17cd12c86406df2485340cfc30fbd1dbcd7e1ba7ec6c62b567f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/el/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "20ad1a00a48ba6bd127a95f3b80f8166d868dd20af677d65c7ff416c193532ff0650fbeeb28ca699bc23462c11dd4a47479093353edde68b30dd1865cb985c5f"; + sha512 = "16695437f4a137f57c2ddd5b88cc0148737a419dedf09e16e0395a4595490bf4021f7c37726beda11b8144cc9b8ea194e82bfac379198f59b2f0e4097093fbd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-CA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "9650e47e17f0d30006738b5be3a2406464b2bd6e5245af45e5c4aea0465598cb90a40801c5dfe0d79859ba6f9b1bfb4e2881ef8aedcbb3e2f4ceb644de886e8b"; + sha512 = "6ce532e57b68579117c41299fd0dfc08ddd5dc4ed963d4a70260d801e4a07553199d87cdbe5f2742d09153b18fdd5c1b06948a990e1793a32ec718e46a62f281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-GB/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3cf3ffdcd06b6f13bae12e6529d849b4c76b3aea071df95375a4563e3810bf796c3bc7b77263f879e3b0d654831c0318dffd05a505c269c03f73c090e07383ec"; + sha512 = "f830812530c75a6d916196c445f494c77bea33419abda526abdeb534c533553387e156a43c749bfa3425f1233235f96b174abb7fc2bfca75956325816a7714a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-US/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7c380d593521b6c4893f77f8edf5f5f67bbd5cdc2d3d7e30a54f65ac0b21bc6e7190aeee4ee3009473763442efb7e6cf61fd269aa698b064f5bc8d9ae672c235"; + sha512 = "ba546c700ca987f07d05eb363e81c1a30ff31873643898f54a6dbe76647071dae4e0a189069066ad854383b39460f273358b2aac1d9c6b627eb89de089ca7bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/en-ZA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "835d7d6ccbf0877a576872a250f5691a3d6ccb959d26c3c0035eae4bc475561d98e567ebafd091c9e21a4239883e0d0cf10961508eb6ec1ddd59de5fff958f2d"; + sha512 = "ef5e08dc45f8f111a22753e52baa0c91991fe363ea774df0617afabf6805aae2d508d3d9c29afb0d30e8e81661ca283115b71155b5fac725fe85134813b06a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/eo/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "19a3143c9426ca4ba8c49d3a5ae334f4cdf8d898c35d3f16b410a7d30775ce80d5e3a1672dc8a89bb69e8e83ae76f2f3740079f0981fe00864e2782dbe576d23"; + sha512 = "7bc3e96d300ea64f6e871b04e980aee436451df9995c562fde3592c829b9f3824e534793d506bded7b7f82e7c6367ed4e09010d3b1bb845d5d3e0801230a7e6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-AR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "48a1371bbfb6124f94aeab3b66bcfbd960e58532828894246b3e88c62968fffbb97aa6e4aae6970b892673a7e5b275d33c55fa5b05658c511494d4bf631355d4"; + sha512 = "39a25d45317f7783b9f960c59435ac2c846142a272020dea9ad5c46a91dac8c4621b2d8b400b23d15bcc58673a1df9ec1129fc68fb06c39368a670705ce125fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-CL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d6d82e0c5746583ffe56eb51d9911551d4925c2614cc563531422d5b892ef59fc43e3c27bd02dd94e638341fe268533ab022bf7eea769e02797ac3b02446ed4b"; + sha512 = "fd2229ef1d2f64f2f602b15894322163cc4067a72d580c13eb8ac6113dbce4a2eb5e4a17a833ee13ac68e30bfefa24fe83739d7c820b48232af841b24e9c0c97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-ES/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a1fe512fbd0da67ee43808b35c3098cd750eb9ed34ff9d168098208b87357f831569dced36a93bce17bc65045520fc40e703f527dcd640ce5aa6560567c11fc6"; + sha512 = "c65a840ff3e3b5be0a3c74ba82f17d2a65f3071d91e71cfaa634bfdc92531fdbc7f6865aa8e3621d94eea626c4483736705ef7363907dccc3d7ee2ea643ff629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/es-MX/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "9d27baaf14441af81c3287d2433db9e270eaf3086655b6ddae6818fb6b62543b5f8bff3db69b9ffbf5d74c1737f21701206beb6ba908a133056f47e8890b945d"; + sha512 = "8a964e8832a9fecb6124cb1453ebccb0b8064a6d9306a92a6646fccf8ca23a058e3e2d99d3e3e10bce4de9f2f75bd32ad94f3486d1cf9597c2bc93ed70ef4c9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/et/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2328f2b77326302af454dcd0d6a51e416d2f5a9a0ab0955dd7b827bae5ff7cc456ed8e1ee54e18beb38d5f4f8689360ecc3f99b2ea392c494447ee81c8599ad7"; + sha512 = "13c7521af9e6ff3b6c1058c93ae84c3fa7e46482938a90f5aa489b3db99a87a6d25143d244c8c0e493a22e84cfbe831f5438f1537f78699a90aea476bba221a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/eu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "15a1cc490283e13efe3149932d4dbcdc1f6790d153bb4ba4ba45a03104a076a75416392797fbe505ab5b7a4d34e4f601f835e20b5c0eb88e702dde12e8814c48"; + sha512 = "b28e45e45a91c732db3fbef5ac249ecf6b6880d3f25d3151e9e0981556eefd4e98bb27b2312b9d4b0ec50e63ee8176401ceb6dbe36046b7ffb3ac80c3e09aa32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fa/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "8e43aab77ec3383c045d4571abaab9a640247b03aa924ebbc1ccf2de045f8a48b00e3baaf7bb72443273eb8a87faa09ad71ab39370020c199ca73e5ec47075d7"; + sha512 = "abde704eee0fdafa637ed4ac52f605c81cb6f4a4563ed4cd2cbbb7af31b40148ebb3614ffb6b3312f19eb05b026833f32485006e79ad577f4f1de3fa6ea83398"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ff/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "8b43ac14bfd02a9d1106c8df666b4cf9841e1dc76edc45253acc06fdb3128f7d20319b119ed2fe82ba1660ba184959afdcdd68faa526bd8acf8aa87501f89c92"; + sha512 = "2a16ba87e145740d055df33201510cb33ff2dbd6faaa30b894f71b960ab5daf7a24f1c3ecfcb984a5e20d525a70c2e72f4ccbf32ceb66c7879c8a238f5618a82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4605739c04011c0154a9c09619f89bf24722100e16d1a14d20f165ac1a134ec5b411e535fd7f3719128515fcc0846da17567850cda429cff87fe86d6e14a47da"; + sha512 = "06aafd066c312ec6d8163cb5cc773c0622432424516e70b84716c662e36ab68a2e4923b0a5ebd184a3ec50bc2db27a3eb98dce2a3d6046a929e1c499303b55e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d519b3613a97de7045138966b61b1b7723aad482be3b9e6add48b283f9236829e6370a08590d07bc88db5176bd2be76afee9b76bc48d5d98404a13a8e3faa727"; + sha512 = "044c2ec838104a7abdce0a9f4dbf3cdc0238505fb15ed7de36f197863afb606e4f1749df31bc1d2777acb7df874a8a1d4900b29a51877c53c5174608c330ed1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/fy-NL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5501069a571efe740c77a632f7309fe1c82f00ab4b26628655b9f76137f95d9061e909075200e12189d1612f0307c11b366fd37e00d598091c7c73989d5c9fc2"; + sha512 = "3023d86731d6a2174a638e3f20c4922447eb904e7b6350664eb6402724841197d19e1755c514710a46bf60b27ce107fd9f41bcff894a86918ab6bc3451f88e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ga-IE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f4805258476063f905c481fd8c51ea4fa2dbadc62fb64aa91eafc94ff3c3cfeec736a2912d8db09d3e09d5624019df97d3fb538878b2f24178589afacff40349"; + sha512 = "a901fd3e728500244de17055d7c9c543ce0899d3c8d0e6b0b16436d45c3a66db43c2b59368d23a1ad3681b365e07cb47e9414124cfcefa98251533e75789b7e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gd/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a8d9f97c92ecb74279fc4496f4d9b7a98d3587baa84f850c6d2a278cd47bf74ccebd9c35d5c9902568b6df4cd1385464687c5d175c2d96339bfb720b2a50b5b7"; + sha512 = "d96c4f74fc2c76e1012b98a75bfd70c17fd22966c6d4e2ca0174fdfbeaeb5500f55637df7851d23b34b4e1330fd010bff0da0ede28029a3fc92714bb14eeb30e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bf407f24cec21bc1cc8cbe306442bf8d3bb01f1898b103967b67ed2c99fff01848febb28b860f8aa8bae050af9892b527f8e6db7006e14e496817c0db28d5753"; + sha512 = "6f20c7966d71bda681412b3c9e3a782e3a6fe71e096759b8fcaf443f7671a94565de0fa8222fa8b2c430a1fbc28146567f47523e96e23a94c6ded0022d8b04e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5e78995a672af6195e4195f4a01f5c0c9d3e699f3db88fbcd4a56608ae6e92496fd06d952216abda6aad908e64763b664c22e177ccf8053e9f1a99a3138cbffc"; + sha512 = "bb5e2c63b2a48c3ec8746997a57d88b9a7f001e2b9b9f3c3e4d2913935cbe34931d9426d528d6336dc60ede140afb24487ecd3c93547113455e28928336169f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/gu-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "30bc61c0ea4dfa58de393031d7296fd2d813a0d9b23275c6c2542e4565b03a8e1e818cef893410373177d3880988f37f29a45695cfa466af3cbc80bd424d08b1"; + sha512 = "8139f6f236b5ac5d082c2c01f3e7950d312e6e241f2a1bc29e22a71238056546dba1ae7d5dab494662d82ac53b7617ab1dfb50375cf77eb565cadb3f4b074280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/he/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "8e6d00cad24e0250b4d8540f0f1ab01ebf1724228694652630be411474460db77cb737bbf104b1f75b1f40e0b79c69bcf7556e8b3269185032bb86d88c8d55c0"; + sha512 = "a311fb555c096a5c69c174da176881d390dc187147c46722bb3ef073e4bac236e36e307c22d856036bf52bf87bddfd02ebf3f90dc3cb9b7c707ecf13fa27e251"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hi-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c58dea84ad4d40de02a97a6e54defc84b709034220f90d176242d07ed412b7d0a9103e3574e91dbeb76fcd118e46bdbc3f8f6ffe520fbaeb26966323ce9d5c7c"; + sha512 = "56758751511dbf42d04a772a6567fe436030d4a272123fa8da8aaa7e8ed26f06bea6a32b35cc195674eb93be9f7b46b280e140dbe906292dd346912b433a2867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3dff0e8141c5d2a6c6d04c6213aa253be8016bf846c3944b97a3351576864544d130fcfecfb44c14b0e2a4e172fc7f200615a7596688d804a9cb6428ffe07b69"; + sha512 = "da29589e3f62f2e2d4441059393e84f79cf973179db7bda8ca9e632d6c0e2d83e30a32f93f02fde21fa74a4899d89afd4871cd1d3341b2b8ddbde8a10743f755"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c61286e752d0c24eeb96d3c3909141b5942f86aa28cc02519a96678568044cc32562f16bff0fea1d694f9254d4a05df8abcdb5bd6a29489a399207a593d83fc7"; + sha512 = "9846523a1d026b04ecebcee3534bc17093ae8ab891e7090b45c397355506d41da1261e69073d7b1a9e228be0909bacd8f6aaeb877f23aba0d2c84ed8303c9aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "94abc44fa04d59d7f92a890bbc922655083c532c28193ca264e902a23235db9f4cfdc37a5e978753b1f8e65a93760d579696bd4ff314df8983924574947c1f8a"; + sha512 = "1966565f1cb52a30aa941a28db6da2dd6232e8eda91d1f54d996da884dfe46b172a85606c3c33b8c5160667719d30fe710e9620b5332421742072debdd56e410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/hy-AM/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "631bce404fc6d8a891f05e4354586805088967ea4929d1206faae7ea5c8939dfc1b38e920e5a81004bc0f8e75f9ec5cecb5f4c955418b8ce228019a46f567961"; + sha512 = "367d11c62740213ad5161e708dd7a2cb3396a1f09e9e8b9426cc25ae3b32d70dc3ccf70b50542503818d50e62fbbe1f373f1328779f2be0d2ddfb143288187f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ia/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "8009c1d134be35413f7100147cd532e46fe9b6858e7cd491f351f9927461cd7cee9461a3e6a03785317b94429ef382279f689b0313cb18199a65e1b2bf8f90a8"; + sha512 = "6a0eaca21a2d110a12ac3e5ad8a453d8b07b122335da4ed7f33e5e20ccab69f01eb1b7365136de20aca83b670ecbd6b44dc3a750809cebdc2c9d9c76c9c55613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/id/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "6abcf53d5cf46ef24a36f64a47952f623d8fa86271e913f3dc1948f16898d671976d57fde2ecc1d0de977442f3c7670534b6a6f4e20fbf46f0932bcf9155b64d"; + sha512 = "d821c322c2f40fa726692d54d393a29569f38f66cdc0c9991d4800f7d2fc9366e9cff0123a47259274681b0a67b01501ae0dbaf9c7f96207170b92cdb91fe77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/is/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f052a55b65ab5663218d51ee52537bdfd38e01bddecb5da18e3657465ece8735e8c96b4f74caf687f441e2150db49e271b06f7ac0bc58580cc67054ca3d6ed3c"; + sha512 = "d5b2ab8bddac3fb0dc3351cd130c77249e4f5ca79815c96b41cce075298a181be79b27a1ea09bac48b79d8d35ddc710f3d7382ec036effafd974f17c7e44bd10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/it/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2f675645457fcc07813ee952b0bdc5963d9d8545e9e9c81b6387af9be106da1acc5bc71b1675ab1b1d896a94c510061ccca8ebc3f790194791255e7bbb792461"; + sha512 = "aba0b87b3605077cbb7362c2dd23514f8a31a61a69d7a054753e2e89b5388541fa7d356a13e7fb3d21540381d5b244645d305c88932854ff91e45acc75bbfaca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ja/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ea5fdd68fdd4886a2fcd02a55c9c69397a52faee68eca7da784972d348477898b911a2740dd29791d81be87f654fba782cfd80cec756ddbba4548f7846ec868f"; + sha512 = "ec5377009d64d2e2d625ba9f364e456c4a6d576cec8633164a3ea21a73cc643c31f74a27a64aa8cc9b2ec6313b6a5e25a78612566a11ad5833308eb69e5c4a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ka/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "269f521edee64aeeda6e87fe73a89f57fda2e91194e5eeb76798e2de87dc197de5cc29ffae074502e9a15fb6d2a0aa11aaff6413bdb93781b0c0f6ce3c9c445e"; + sha512 = "7362eadc3fc6cb0ab78948474570641a8f78a6d311a8035211e08dcdef9d035177eb25f679d4ffa9b6411ae4e2a3fd389814b0ea724e05320762539761cf1cae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kab/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ca61c3c1f8e87a1ce02a3cf561ec1e6b7e8ced9a9ee5862a52a7cf12614adbad78a0150e0f0e2612911ac1f29862e7090fa2dfbbe8d7caeebc81e99a84b086d4"; + sha512 = "b45027c2fe7eeefe582868ff307330e9691c9796a3fc792967399edce5d5cfc9387ca6e50c1d623743eff3350476eb2db7588eecaa00407a69fd5c5ec2aa3e81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "6eff5b246e9b629f78b6508fa2b819a1f8b6736fe14c9225950ba7025acd34447c6e9b62d014e491e58a3910ddc0af74d127408a3a5f2fb02b6efeab1c6d9cfa"; + sha512 = "f2f79ea3415f8f9db46d7a4c86be44e5d055133f0eeb2231c8f15171aa27133aeb7d7aca5e475af839e68cb09218ca96e0176b19111589ae643353fa7bb08b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/km/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c73434d11ce098b13d9b1b909bbf02d36ce9e8b0edffbc5a28bfcb38b0a1272007f966dc317b4aa89cd09193c6f667ce36ae24bb3f6d4aa621d3d947160206b0"; + sha512 = "fc573a0131b6e0ceb6e7d49347178aebcd902b61f870c8855e08eb7f4da29bacc9a22edaf612e4c00287415bcc18a8a8d5577e08ec324a68440f8f224819ae93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/kn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "2efe0b4773421fc03eeb7968f1d0a9c8e502f5d7ed03d407346f4e69be59f00fbcec6e785bfea0fbd8523e54b1c8c8c55d1573172e74fc174efe3ff83810253f"; + sha512 = "1fdb48b0e5a270182e337efb03819fec21f55f9542fbf6f9607d6b4f205742017d63531555244ab89b8171e141e600b6209508eb1b619062ea43c01719c28aa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ko/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8a04c65eb29196ca0b0e1929d55777cbb45aca33811469362f8804b81e9ad00fde7aeaefe93ea5a7ed5b9195bcd4e3444b87097e43cdf50a2c50430d8353fc97"; + sha512 = "6d101bb20570c5ec2229079982070da0338fb4b77694f3a6e75e0336cd645ec95eb085b9d0223e43ea14561c269b1c58d382a0128e4149bb6a04ad640d159845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lij/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "58b6fb1fece6db701c1eb78982fed9f55fa8744aadbf606263752323a105ec76a8a453e2b0b8eee776a16b8240d8c2bfb6dd2d1b2415a019bfe727e6fde7cfb1"; + sha512 = "970a52aef535b3ae87f295c3326d0217edef7c5e19fd8f155fac71d86b9eaa0c18c9f8f393ea4dae5811a6801caa38ba03cb432e690fc19d5ee559f576098540"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lt/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0c53245b4c513da99ff118618bd8b7f1182a16a01e7b17a2c6cc194109ef1003aaa3b121ba1b6876c5dcb46036bbac759b2c814fbc18474543d8a181f993260f"; + sha512 = "a9acdc7f4a94118f115d9cafcda0960adb82fef5fdbfb7916ae785cea3b541057052a027b0831bcedef43014a088b6ad3d3570bbcb467cb62411513f877a91f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/lv/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b28415f184e2d47fc180da3c28d7a08b38eab0a6828fbcbf5368906fbaa5909752ea5bcf6cdc72c53b26215b050485286c79cc44fca49bac6e0ac3f46be9c5c7"; + sha512 = "47d690d3e12c718d67877d4f37951a31114f6a3fe7bf49b0813ca0acc5d3c5c8f60b6c0b572e0e7e7e77c3d9e68f8d2f28d407ea62bf1976350ec4e05f05aeae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mai/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8a77764917f0c2e4bb0816b710b284907381e868d19b6f9211108e4e2f2b069f54b1cecfa34b1ffcc4f75e0f427999dafe6839c1df39bd86a08a21e6c13bacb1"; + sha512 = "1fbbf72a08f98df105b47c21c07ad98270e9b4bca21bc5d9a940780db040c3d51b7531dd00aedfc8f7c946359749a5718f40744695086c25f9ba0d6641ca26b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7400c72c3eb7d293f7eac768720545c85799b1aa333b8380d3f582d122cee197d5d37e5057bdcc59a0e7f03fdf99ab68edd068d0ba4a25262440ed56b526b4c9"; + sha512 = "64047802b567ad586cd3dac1a444f5fd510f9bf06a883cdd60d3bac9dee4fac12cced932d927b39fd579d60a256dd4a7c2cc52561edf477eb2d48f29a111f159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ml/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "ae6c8b526108c6d4eeaf2c57b7ac005267ba4b0698277b707f965dca9e8f9b7f72d1c070ae05f45478590ce7710b127e0bd74503e5902df8c32b7ae236908c2f"; + sha512 = "f98cf7854193dba3ea520eaf0e2c0c0f60f4965b3aa5d1ad442dae5aeb518d334ccf0edbefe9c4c1dfe2f7372188d64d17ba7cfdf41d7a1d715318a4aacf51d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/mr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "62738816529bd867a1a3237056a65a228c28f9060a8e6fd15793a2d5e97c966bfee6d6f10a4772ec16a9958333b90c457a5bf3c6b7075b503654acef19b33ecc"; + sha512 = "abb1425003da6faea70157e01c733a757c8a46b1a22304f86ea93a84ad3fd5777754e44873b70668ff2baaaf0402631e5b9272bb0a0711c6c03fb46a3ac2b607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ms/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a81ac8315dd06e8a89870d1279d3b1d19f1751333688231637f85f8eae9a4aeeaa081aca467ee2fc568ec3a2baaeea61a4d11e282d7dc8682001d4c13d91cfff"; + sha512 = "a96e18eef12d7067d4808e0b680773b192017dad2c95798c541ab2b97cb94990e010b227982b6bd83ea595ea5ee33fcb644fcce995131a5d7a46c880e27aa9ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/my/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "fe5d3f320424f1f2d79690938743006621b1134295077471f8e72076fd10ae132ec07c46e9f5afc87b2b6801d6185359f72e1b62d880b12590e4780e408312a1"; + sha512 = "53e6e08640443f40285f372b53cfb9dbd3c44757693a2a575479f71333951c5dcf9ef5f8b948fe493c40ad789233a17e89efe2d91a132b414e7809635a78311a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nb-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "fc58d444401d37108e0f28a212e690aee3ec6261642a85e34d8aecef757556c75a0b420c7222e260a63b6d8424f0f00655a08556425a1c92863fed127b73aab9"; + sha512 = "fb3883a509ce36e8d24a0f0fc7aa9774c2ecad35d66d37f093cc20af8efa8516a8ff75c5f8fc410cc4c3e616757ff7136869b218735ecc7ea9ea20265331f491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ne-NP/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bf1b3242a1d6a9a6d83dd4e07e5a8b25d3a4ec5c2b0902781ffa2745e4c440e7201290366f8d3e291a7c7746431338b45a6cb7a2c72c3f0790d94bc9cc631ff5"; + sha512 = "f12033fa6a5c2b18c2ceb96ca22cee6dd7842223c7baac09d235c8bbb75e638d38c6160750ae9a0cb9e5ecf04301c9da873dcea1891b436fea9ba0d9466faba3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ffe6d6454fe4598b1dafe1e167e50813a425180ed38c0e343c57b1366e99f1191eb45ae87b8a5a1c8c6d2314edf955d70a7d575a15f09e7c9d6e2b8ce41c9ce1"; + sha512 = "37126248ec02b357837f22909b6dbcfa7979ca3b3907e339558d8f213f92c5a7c8b89a4e9d7d069a99dd494fbc41c52bf66a4b8c2910f48eced058098927c6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/nn-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "be6c847d267c8fc281947f09e4a45ac4d4e462e625d18ac3df066d3e73e663ef94e4dc8861798533cfbee9429225017524242fb6a8bcdfd6e032f977946212c0"; + sha512 = "746da9da5138c7c9d0c0252aa4a679a3d8ae2e3ae53695cdf59355c7e943a4d0598bd691cd55e580b01536ef6779dc86ef17b1a5481e0a8d8d551695fb5fea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/oc/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "82e960f2a1ec8b989ace8b871143a43f00ab6d854927ccb2b7ecfa13259e519cfe90cbe4bb5578f66bee7e03c90d43ffd201e9ca81f1b3139c4f3b2d05231082"; + sha512 = "ac454a4fd62dcc0c8436e691e103859bc5767e679d876c445ad3e553f5afb4741460dc80e647ef82f006b34aa44436469fe66978917a6cd852fb0a47ced85fff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/or/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "65cb8748b22aa245e4280dfa839ac94bfd3617cbb6fb17aec26b354cfeaa1b0f80a75839bffcffc3bf7802a8895953b937495da5f912ab9b865fb62085d8bc27"; + sha512 = "ac11a4b4927eccbb5a3b0c823cba907dc32ad228e8f147d1d84f5670b1fb12638a1ce858ce628b486f41eb0e98ef8b7d8757facfa9d592c3edde03123a79a703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pa-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5959240644293a8bd3f962ba6552a55aac24c4824fdd77827faaaf6821c80bc237297344c50bdc8ca918733c707502ea5998332e94394d4d26117301de88fc82"; + sha512 = "396a14508013d7b6b8dd396d7d48fc26c68da3c1ad57952213a0e01a859445201dcef08d824ffeba6958f8a79b5c1af59b4f6c30e539f80ffe5568d6a09406e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "cd1048f71e413e8e6ec673ffabf83fabfb2cdbd102c73b8c7e13cd1115e0540e5f6539949838a1026aef6f6a4ee0889858ddc2b3ac5f5b108d2a5fd12858df26"; + sha512 = "67a17f065011d6a84cd455c614804351e1d9de4be361aab3bec5f34db43db378f1f594b4f76c35967181aa62f484aa84b49a05e129e6dc00b67caf68ececed60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pt-BR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "36d97a9428348303e5a7fd464904dad502e7e064d42d0eaa512db58167400ed7a0a23bd5eb3aa9d3a91b07ae20b00c8bbe6423c91f1991f6a83d800d324e17b9"; + sha512 = "caf1805b852a6f8b19251450d72701cacfd1f0c20ffe23cd65378fc2f99109246ff9f237c120f273902d6b9cb67d7db54a0bd5ebf4cbe0217ee13ee28a390136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/pt-PT/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5f716699dd0a14cdf9a5586e733ea513c30d58eba09b724907b2b968fa5105f45df8f38b88641bd395b1ee59132f74a946e31832a4a583964a45c113304df75b"; + sha512 = "6119fd1ce5695c4c3aa8d61cbc6748d656a591ca7ba6e3aa8bf52fd7da68633155897fbb739568c816c78b1c7d291544d747dbfa70a346d93acac951f21c33da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/rm/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "08f99141e1eb015e356d5678e7b1127cc458ac1b69ddaefa3b100e89a38944d3ba3b47f17c782077dd0a0cc095919e4a95051f85fa1164684818a6f8fd2e3f0c"; + sha512 = "04ce2405adb0be7f8a1c2fd9f5df38f648f704abf342ad7b7854cddda69b2ceb1d0f4925390f2a96d349c62af3f486cd587fabc5f42e555e83874d1b76b52922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ro/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "250f4aabf38576ebc99eb5b46776b74bd4fae7fccc422e95d2aeec7e09c27ebc0c08246f875ccb1e3371d9ed74720fc14a6f89b68e3906ffb4247120947c3e33"; + sha512 = "d4add282f611ca37aab7a43c9d5bc284b77384b87f941df77123a869ad1a9ac8a4de3db540167e1b67b61531441fe1ebe3bb01bab95abb60c483dc666365cdc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ru/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "70e2b7de93590ccb8a56b3647f1f74bdd1ed3c1ba5820c9277249799b6176dbd3cd70a1d3d76463254772197efd730f493435e265852fe4595c631dbc32a0b95"; + sha512 = "0ddac21be61e70542bc94e3c2541b5ff91991bce26596d4c7330557353db6d9d0670ec394a88c49ddbe08f862e5c53d74ee3ba23a1ba0d6cce2500873fde4756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/si/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "23fe7fa4d676e484533e726c73cfce2dc6dbbb14f13c78ace534940942f2f642c4d7ffdfbbb417efcd493cc6685d82b3f942d334d4447e42805a98886176b7a1"; + sha512 = "f74c8063bac884db58ee847f2f9d2ee366d72e4335c07e268b3aa22d33bee4dfb1c8ead9a02592178924bbf056d75ba05b12b8e79f2b10b5cf91e55d1b08d15a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e8248e7a4645d0aa44709bcb9e7a62c235c1de4e0c86916b4c6f0454a77eb0c4f0ef9a15381b5d2163f5bca9b38e0cf60f7c4f709bf129c95204450d5005e8f5"; + sha512 = "2020c4c9115ff890757620a2f3fd2da39ba989feeb2baf83af50627e9d22cc9f68a44f3f442d846910458f14523a59df78cccb238095feaea76bcee93fb066d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a9f31b6ddbda5636fd0b8da9dbefe91ae953941487a6a58847b96e720392ba04efe20a7a7cc0200ac06100d2d766a7b0619b6e5dbb383c7b019b6c59851b2be0"; + sha512 = "338b4ea7cb5c4ed7773eb7ed45c464da01e63768a9eba76b7c50ff2ca9a78c9580ad067f94e01b6e2d55f9b3dd76d7db9e8f0b5d3cdf023ba8e76a0a5060ab5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/son/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1f9711460d0c1d047b33ceac3c3a02a56c2da725a2bb7a4e5d7492e916eaee334e6e117a4c6658815185542fbf095512f2f3f5c5ec469518c12005e95f9bb2ed"; + sha512 = "e2bc04b99f98b1c22e92bc326de8278dfa57d9b54be24d8b3f0efd27ad4cace395565816f7ba265409f66f06c0ca60fadf37acf4abe21729b68113206d389f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sq/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9328ae5eddb1ca7257113a370a225911667b8ccc087a18751f471ad4a4f68317891c8ebfe13d4c841c0c094420c238697ef9911c2cbc87d50204bb4ae549a715"; + sha512 = "e430eb8296d46986ea536ada48db5bc3444eb381d3caaa44b22e17be1a8b6f05c06df85a8c90827d0bb87cf4864d1ab3c20ba43de8ea0622d8c6753fdecd187e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ea4ab10db3eec1ee433b3e8c3ff2395174960a70c710a743bb5ed136c21480345ab8745c53a5c7159f5a7e324ff47d3a9c4fbef4db482a863ca98f1f7dc59ba1"; + sha512 = "9a6558c6c21cf211b5d52c713a2136d55a39146954a580b6e9f304b63d28cd8c8fb9f88beab95998edf12cea87578ab6941a9e7b793d50eccb4678b57e283b21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/sv-SE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "aa0963e67ada3814d133c60f08b89d5527f0d108a2a0cdb68c78ce2609ecf228707c3f4ea770536e8830e6fccc574a43f63a77ee1518ec2cd80a494fa0302eed"; + sha512 = "55aa7f899a770bcfe0690df0bf61a209a5f55a90524f6bbe7ead517947a3884a48ea19f887bc4ac227e0396f6704b15eae9ae992b3314899372f4e41d8ab8f43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ta/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b044bae66e79f58a01589790b1c14797574dcd86f0981cbd1d1e54d123c57b4111f9b39682b613c9d29718562d4c38577c712089ae77d14b6bdf2998dbb1835c"; + sha512 = "61b6d93e433575fe3b5d2982cf558f165e11f02ea2009375b8da468efc641455ea028afb0c0c5e6e26048832fb9274344a607713350b6afdccc5b95cac3d318c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/te/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a7025734fea2cc7e80cfacbf854b7ddeb265c314534aa7db4305047685a781282a7498886aa6195e6e7d6e7c39498ea35b902307a810b757d253199853175e75"; + sha512 = "fd67b31ef7d18af1786c966cc011a909367b9700eb22130246f0bb66b3f3e2ee266612f1993e65b79bd8f9e7aa6e7daf7c50e678e0e7f0c67aa63adde0c155d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/th/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "155db0d35fe0e1c7c44748f3e0a9fdc62053692b4984b9dd743573e64e3c21c96944daeb09e7d86ee2cb910aa4379ddf46fc93b2f0afb0b254a3540e0636359f"; + sha512 = "35d657b0e14853def56ca6c15331cc8aeba7ba1f230f8b8669b6466ae257c362a4a97a1853d9b32bdc62902f3de71001e17d2859cda77642283c6f8a41e7702b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/tr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bb272a6d2fd57059962d42b5c95d3d58dcd18fa0fac9638ecb392b56b23e94b1f8d55fad313af0815a8f01d8e9975b502c90cb9fdd080733eb5c3d19f036ef16"; + sha512 = "1b562046ac23fd3a34b450042773afcaa255025972ae251855403865b4d2ce96e958f6a2de9d96267d17ecabea9a9e02d48314ffcd9986f1cc3f58f24fed310e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/uk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2dfeaabd2f679710c22c948945350dc04b029dba2c7932b4e80c5597a08b624a61674fa411a3b0a5cd9d5cae0a7bc2437b0e6c3115254e7b5f9dcce5ff3c2756"; + sha512 = "7adca8260cfa16067d0df3270602d01b19df2bb9a7e5a373fc39a0ad846239ebf1ab868e13f3240381465ab7e950898f4664cefc7907af4d66698ea8eebcc4d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/ur/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "44f7c5dbc914e7ecb62c4e42298fa75ee0c426149f66d9e48ff567c8d3215cc8dd4cf11e288b05f1687b7b7bc494d7575e5cf70707b12dbc34414364f3a7415d"; + sha512 = "b492ef2bc8447460f02db4646e8a489e9e0e880660fee94077306ed9de0642498c46a1a81681692a5cda8ceafbb1a5788dbfe7c46ae949d4a0b1d1e4be695576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/uz/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "15149fc5087348988aeff5ff0020d2a4c79f03d1c64670d4f082c00985cd7b4d2471c1a3d75e0b77c12e81ff6241c2403470cbf710ee964636178e0bc20eb990"; + sha512 = "b45916a341b82f95e983bb796d2316b77480982e3158d07c05b87dd8096385a9e8100995fa4aaa9b8fe1feb140c672e87b01cadc7861c8a057ad5b01f23fd295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/vi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f8a95ada33cb201a73f79b6b53d4f5d6cbd2b42b35fecd09198715a29f8f6db6e1bb7cafe086bf4ccd62c2c17436ee266ee4f6a179ee3dc7f33b476a1547c9c1"; + sha512 = "c04fdd2751851bfaa7d61a6dfa405820f422f456a6768feac95061e7fa24f05380c0808a7637b54a344fcc237cd135bf0a32e7d697d9252abea8bfe31e2659e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/xh/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "4fe10180109350eb7d437809ff1038add6bb5bf7d21bef768eec595956f017d5ac6a2c861566eeb6f9c9d433a0ec15be914a7e67de3c5dfdf0ed1130eaa2408b"; + sha512 = "aa754dbf9f04586c60e6406b26649955a273395c130c5955e6b83c2a5d7714de1f0afcc0c6904f01bfa5acf50cb03e848244a62214d4db241eed18f049320f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/zh-CN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "26e34ac878020371d5f7d53a177b094adb31633fbc7cae695767a49244b5c3f1c7d43eed48cd03165af94aef64ea0b8b3ed0650615933d1f5500af7a05fbc4e0"; + sha512 = "2b58c6806c8ae4e476add919f5f4d5e380252cd2a822dc0ebcc5caaf20f1797430fc8ea4747f998953f41e612491e41c6c00a9eafa98299f4a10571a89d6128a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-x86_64/zh-TW/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9b92ffe5b6f493c8eae40601e5da651c89e47325467b60cf471a8ecd30c7c960c5b6020bd00867225f0a5839b49ceb6701bd38806847b4e25a7903588dc6ca3c"; + sha512 = "8d744785056b3c423f42e337befec9983c1e914475eccef8ed43e8db87aa80514003fc20976a60fdeabae3ac95b8c1a4d8701e31158f2f811ecec1e003cb03c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ach/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "17ca79bd93f98e42c00382368b4574589f9d75775926191b7644fa2ecb5130e9ae484c98ea8c04433cdad4a7948af77d621f34f70fafb7df019e8e343792d69e"; + sha512 = "b89b8af1e22c88e1e6140e46953e15f25673bf0f3645a8af40a9c1be3f44e621ab469fc171538cc2d009d50c3bb9fee9d1653ea9a3291f3c535e3918fe25ccc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/af/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2aeca38267ac03b36a749de71425f6252fea90fd372a7aae64b08fa816aef7f7f4b3926d67f1ecbc4cf2768ef5985e10b410f7b2acb8325ca2f9671fcb7707d2"; + sha512 = "cb217f4fc3d817f25f76691abf459fde2b9d55e41318600ed822ead6ee1492396441bcecb898386fc5e6e6ed8a95736562d241b05b186dd0497bc0100cfec6ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/an/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "af2fd8362ccb558fe78370a3bcaa9a6c07c416b5babc31efc1ce693da17b01b1241a4af97db335c273b7d7b9da0553d8e85d674a5635f3e57a405184112a74e7"; + sha512 = "298f2737835faf98e688d2cca5c12f6c121e83ecad52f0fa6af06a1a0a823a5b1c9713742524b1495452bf099e82b3e1fc8faa30c9c8fc5221f11b514b165ab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ar/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "926678df760eac0cb9ed6244a39cf5ac082ea31f1f19984c8a39739d8ae6cd3c7be6a45a7951612fde98b800b3b6d86c2a29ad9bd1be613c1a0d4a5112d0c7d3"; + sha512 = "659908189fcefe7cb5c3a0dba1938d8dcd23336be2a728b0d96641a410fd9bf723e4ca4978649b5e01e13c3545ca3d8348a5a1451496c690efb663640961f6dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/as/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "78bbbf24822ecfba8c944f56a86206016a4d6cf56a7bdbc75bb93a1d59e26944721f576dfb74bea48567de0d45cfc5a4f29fe62782d2a195ef50206e3fdef184"; + sha512 = "e655389c4dea4d9db66549256ec05443a7bfedf508db46ab8943ad644229cabe2ec1edf8ab40b55bb2b53cdbc83832c3a39aa5c42950fe15fbce1152eb9ce8bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ast/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "74273fa11ca2f076d4e75ba38d0d0e5290d37e1da6875aa73461d57c366180a1872c555e949aa55c720f3a56cef8e2397307f342ad618b92b1f7659b35c933b7"; + sha512 = "7be4c535d4d63ae1c5f98e49b58c57af0adafc95553a505fb60d5a83523422e6b71054f1bbf02a060510d59a8f85f905830a02c2837fa3c3e5008494e3bbe74a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/az/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "aa98d47926924881177ff380470b9fe92e0dd7af10b92a32122d50f7ac9fd2bc3a763283c70f6834f0fe416c69324458537bcd73975ecfb783f8ba0544c6e477"; + sha512 = "2b13f55b90997e245c69b16f6c0fdc1df6f1f7cbeaf4af72cade86866aa7c4b1afdca46a705e5203b74b0db645a514995f6554c59094c2f21c13aef1f126b27e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/be/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "929ad032ff589a3c2e8d2c6fad331812cb8af22a8ff8c1fc2b681e01257358055ac8d677b976b8bf65c05da1b9780125d090b4e52d92a64c3954af248d166e91"; + sha512 = "d7bf4a8aad2adb1dc5c9c0fe474aca23b8f3b3e66374ef36f28cb3818c74932aa4c5c92b8c06c384dd4f200fc1215a8a5fc7a2c22693224d5955965b239754a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bg/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "679b340bef2041f7ee59d44dcd660ea8d515d864955fd629f311a8b017f5669ee5b5cdfb0052d97ecab8949f56ae1a4947eb4e0806271d1f543de2f14bb3e3ee"; + sha512 = "f1d9bdff18573cc004b8172c96f2766b42b0f0759a756e7dbea0aa46fc8957675a556e6b952b3a7562421a6ebb33d825a886c1cc96ad627e806ad7f0a097799a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bn-BD/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "94ed76078be93a0b2ce9c8f0182f82ee1e30e996858b921b9c750634f3eb67ccefc6fc067c94f92aeb25dbe6f918f53bbf6781d9efc9ef341e51cde38c638e4a"; + sha512 = "aa1509462dcf6c8f2718a85bc6fa00c572fa3f41856b50a7bc0e2fe1f50a7c6717c05ee674e7594c4d07ef0ff23395bf9cfb23caebf707e0d8b4112687caadfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bn-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a46107010721b99967aa09ebd5d8f867ff54e10c48bbcb1827abd7673e2957f3ff3ec2e51cf92e1b334ee738423c125239e2136203bb16faa006c584dca48204"; + sha512 = "e71b318b693a256dceecea4ea1ee494f5ffb9af08d72fb14a76c21a51b8f8796659a7f9a087e2b732f72cc8787217f14d17776c658c0affbcebd5e2208160a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/br/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "544a3896e39aa2ce5d0ded2310ad9b202f11acc3b5866bfd3ecb1dd2018704b0b1d58957e68543fbf8447b560082c8d4d37e16fd218c2ea482dd4c72204746e6"; + sha512 = "1c33e290074d0dae9654d30b21592360f3f7199069b070a791974f665388ce290d36bc7cd9518d8bf855bdfac97acaa90430f4cc4627e9033c169dc75bd79700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/bs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "8d023af96db42358d1d414a8eecdf95388010c2315e8419ca453b36f9f7209713fc3024fb45dc1fb180d2ba518472c45ede3930852f125d7c47dc34df095907a"; + sha512 = "a92dcbdc514f3b593f5c222f093f88953558388e03e71f851cb2c242b67f3d51ce7c891a8f183fa554752d13ad93152171233b81aa727c9c20a341e558b39229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ca/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2fff607f25c1a8a251abd8c17063a03593cfa6f269728486d2a8083106b762f912c8bf3ff9fabe3ffd24c31cfa07089bb81e6abf6b8f2e7ce20a441914061785"; + sha512 = "ecd961e322ba0b9b8477a52bcd1e31084a18109937ac50cac68d73333c3d62efeced2fb11ba63fa97e144c0b711f5e9e15ba346d957bdd4506dd9a7a85400e1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cak/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ff33295a3f83dfc435603bd8c66b5b8fdb0571733e32b5a7878a711fa27495714f5777a40bee1328341a35f1f96188157197bdd974d406df9173cd979942cfe7"; + sha512 = "d49f167dfac2e4ce2a3f5cdfe7b5651347e90f7a04d52cea92c05ec0325f67993ec3ed97ecab501d973f16da856e474321307719842da958496e07d07dea2b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5dd4ceccfdb400e97f7df2ac6f5a860d5a0a9f79f31670f2a8342f620b704a302a69a053081bc168067dcfed076da6a1eb73f7b1a651d3bea356a1bc4bc68ff1"; + sha512 = "04829e46c4d84745abac063114ea1abeaea8ec7f596e7e3850ecb8702134aa2164ccd11c98da7a22adcccc9bc21fee5886bc7c80652f4ef3682ce907f7e5ccdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/cy/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "82f3de3ad1ab8eadef4ee9e91da44aa82b998b2e0ca5192f376ab89d4a4d135462bcb917212e75a66590e2421f80ea3dbde9852f44c28acbf107cdebcb69f791"; + sha512 = "b211eaee0ca7f2faf073762e9b0e47a6fb1249d20f0ec96345104b75367066c5b671d3fd16cd1387fc773152c1f22f26784df14146e5b3ef41db61810d6ce317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/da/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9386133830e6e4118fdf258ca500d5666e8cef193feedb2dfb89d7b024f394f119784832e63a1424c55c34fb7d359f7b43de305b6a5be6086eb7cffc216d4786"; + sha512 = "46c7f949b5d306f1511ee68d624a276b4635edd21cbbc9f3b19dcb8f6fe7842acfbeb55307dbfb6bbe19461f093752d1d27abe908b394a013cdbbc68b36caa09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/de/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "371e2be270761524365a5918d09149b6c0a4405bb6c68408561c6af811323557812ad762e8354b1c580c40cb462eeddeee3b40311cd1603f6783b7a4c95fc7e1"; + sha512 = "d53f3ed49d59945ac711cca09a49460f82a74afeea3848605b0375778f3d94e2b0f8e473ca567a9a3326d847de97a83374b37c012b94d96bdff7482cadd45139"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/dsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c70803c2c407f5370a05a120e150941643c5cccee44f9e5a1ffad8a48a68b396e9ac62c9d691b5ee4450f9679a63383c57026d73c3ed7b0b6f1c782b841b9b93"; + sha512 = "e9274015c9a150ca2518358ed9847f060dce50f5aae902ba107eb07071b7be1255e3f034a8c3f8d9c29a4825d17d124da76b4072da20082364fca5ff874a9a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/el/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d9df45941a626c742e79a7d8fb89505542c15fdb955d72f16988738fc8c33062d0f1ce1453b6226daf97c964071505b24a204968998e7f453bed7f55391ddb55"; + sha512 = "8631f28be76ad3e16c521cbbc263f3c58df6e73cbcc9b4a5528934f9411faca0ed28f821004c901c97d925abb95fd597a34b901f97f33fdc508e99a3d8c4f689"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-CA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0ca220f6d9e6ae8e4f4ea9258e32f108f3c64dccd222b8680ca1ca3be01c9e0ad0c8803f5614c520e605722f581ddf7023dee60785c1a0fc81d16afddf14c774"; + sha512 = "1f70a550b4f7a6dd2578fd0a385a68b153954002d1a4d7e66ef58f86a1b5c9f33e153ce04a32737113f974e7caea5c2c6d338b69da94ced49a56dfbe61a99d68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-GB/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "191653ed0e193b61fbd65cd53ede35220f7d1f18447145f08034c935aca667a2adca43252d0f685c7ac1638995a0566de75899e41cb7fd1296db8800042ee887"; + sha512 = "473dc2bfc05fa24f4a5c88321d087604b81245b08e3813dc45a2a7bd62e2c7012f0d2ca1dcbedeaceab7549ef5f53d47208c04b0bbc9f9267f4319b2720a14b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-US/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bc9c9ff41f54d40953c136515e1076553488b5b3c8aec781869ba5a37017e6dd2ed8acc32e728797bf80e24eaaace51b3399c3a6115cdaba48dbe4b4bae8a420"; + sha512 = "317db45661d149e6ad123241b9b335f34a2852921a97ac0caddc7c49dbb1d105091990e99d538255359c42c5f12057fa728dd546019e710168f696b88ca202c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/en-ZA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "b0c3d3dadd8fbc3d132e308124c95225e3af3bf6263cac3fba6497654460bf08a38e064b4b57741046929480d2069fe6b13bc12657be1225340d8b35f3fefb0b"; + sha512 = "dda42571be54e4955cad1db913579ae7e5b002dea09eef65c47da53adeff0631667d34339bf102d2c779d5601066b7d403da03349dffb60efb9205cbf92678b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/eo/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "6ef35dc9382048e7b5f30207e6be26ecd679d8650b2ac08818c61fda60bcfa1e9d77a2aaf0a89ef11e3ce58937bbb504abe58fe192a524baf71661b3b79001b3"; + sha512 = "c52807336eb6a7acefd83053b13b9e5e6a8ce746466fc8a117e29b3293317d8d8aad86fa5f893b57713ae6e2d1a86e63ac3a8e00079542bb9d171d0297b46a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-AR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8a01cedb4790d513b9ba19e1312e4e1b5e01c165539d45a7cb4f53c16d4b60e5e9d0047656bd6f2e4dc7464158db2584661874f9661c92583195c1ae16e057ad"; + sha512 = "822524e73b1f49037b0e94b297fca1239dd8db130661bd791c1e5e213c9d3cc8f433af205b9cb3a2b3b983bc1470471f558d5e49e908ca582921b0f04d429472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-CL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ae7c1d179f3fd9873ec6f1ab75dc2e6b5e914ee5c316c54ea0e1d7affa5e1b3cc732db5a6e9438ea27df8856153835b509e8e29493df4b0f66951856e35f4a92"; + sha512 = "24e6938f719b0f369db6d2277017e976e3db83ad342ebfe3caee1c266e4832c0fe306018746e3b45bcf6a7a430c9083fd56cd22e57945966ff4f2943b828299d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-ES/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "54dd008f4a6afdf20b863b52fa836bee881e0edb99cb984147acffaec7e4e49be3c9089cec01e2a676c72282937d20fa3ed5c1733db3818225ef19e56e42ec40"; + sha512 = "7d97797796becc35a27bdcc461aed9f0165e49ff8010234ac9d2fa0274ce9270b2b69657d841545fd2b6b4cf7727ebea76ba3d5c2bab8c2f1a4612fa678828d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/es-MX/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5a249832f559d45ccae4e7b797debcb3fe1e53d83c661563b49def547be4a223fd173c60dd534f04a43aa4dc03b01f33a18aaed871d3f2b39e1e37f32dc34d0e"; + sha512 = "bcba9c47bf13b77679374f077024b62e6f4e6048980b71901f576492629ee4e6074f9e5f33b9260eb67476823a604803194f668c4ce1ad09bfe78aa5017ad9e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/et/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "beea97c45552577feaad9922a59cb46777140727b6a29a97f4700bed7bc4401809f9dc27d78fe4676bb91018fcefd01825cda15d99d2294e9460a73f652e3a9c"; + sha512 = "ef00d5c331d377d544c3f8acf87ed78c658a5e076db36a025a9c004366b27d95f2c82971ce45f2d48eda4cf34f57adb95c646ad21d2000e5d631aa2a8c2355ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/eu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4c384cfed1fd41dae30526a0204bf6fc2cbdabc98539c2be868c3e05d4b432c4b8b1a696d7138f05d91e56c3091d957d219e7939fab1798035a26ef3b1e25a50"; + sha512 = "7d83cca4b0f6de980d5e66b152bcbc72286cc7a241ac1869cc5999a7007f7b632d35b9319425fe1391cf0b16188709fc62c05e81fbf9d1bad0a338509cc7c529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fa/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ab331ff73db4406fcbb8a7a2fea04bbceb293d886b98af3813558c604972bda68be9d06d57b66b9dba4fb2f7d357e3aba9c901447c56c3723c7816ece8447df7"; + sha512 = "aaf6b7583a9c9219c4967b34c2d89d58766261178efa2d89f4cb7c9bf8018d908887ec04bafaa0ec464c243d301cf09734cfe6150d40952df532579c35abd517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ff/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3d4c7866bdcfeb2670069e616fc87c99fb6a36777932bbc9c891ff9ea8815c4441a8bebee56971b9d96275c01360604652ad999f0e6782888c0e7776420dd5e0"; + sha512 = "3cfb4321724a30c49e735b001dcc3b3b1fe2ea2872793b5287adaaf89b6821f8b81669761d8296111b574be14eb6bce7d0467a945dd22ed652f82d2ddc29a46a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ba8fe71e3db9295c17985512834e40d81a8c78796612c3116a0faa8d60b9422f6d45f86cf7e4c737c4729e87a16d544230ef874d70d10c77bd1b711acbc7bc74"; + sha512 = "2acdfd29ad1213c8fa5ffde258737ba2232ec1d2fbdd5285c913b7c383f4e30a2cda65a16e1f597c81f9ae0ea1b7fe492625eac48a92fc2f428d5fb0ecd5ef83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c3eed53c00258b2fde094d4faf2fea78b31643738a27452cdb9a0fd381d91bb03591f034c9a654e15972b23858beb38710216275871e780b274597be15e76634"; + sha512 = "4f18a80f38d2f8b2e828e58171a10bf0509275dcb5321867c52a818ce82b56ee564973f13fb222b049e0df3aad1d7b0f68a6ca24e88181553bd3ae125577eb04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/fy-NL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "a740cfde83de0fe696f49de31e9a49781a553fcf33924977663c087524934b03eda177b82d5be3ef8741b0c366cd8fdc296d1da544f0b1b52b50993924a9ab04"; + sha512 = "c7b18de94816353897423bcb35b5f5d88e998c5dac3d37b417e2887f5fcc7ea2c4233a5e603596e742e2710e345edad14a48f45b74a91810e126a14be803b7f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ga-IE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7b345ca7ee03c693d3eb8dd0d2177765a5771957ffb125192708f47d33720fe505244af85b11cc9c019c426a8b19cb0efcfdc4e8b8910f1eeafd1aa5ec046dcf"; + sha512 = "e1b070d63012e494a0fb380d7e97f8ca32e93dc3e8df5e2f5347cf829b6a94fa886dabd46285110b4e83c807f49fbdc7f792061ca36246b1f7c1c4260dc3d927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gd/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bf36c77bb538e039f5a3301680e702d8253e98b3d9f41426986d4778237effa613c670a46db534d968bff21f047eb2d710f31c1f136640b70315b06c2058d9ec"; + sha512 = "218450b49eafb3e13dee8d96cef0374423c0fd9ed9f3700428fdf0234a7f921138b4188dbdef60013062c6aa62fe2e13a6bbc219c756b8085e4b87f1a7400ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9d475dfd45134dbb3478375e0ebf7853e3f12d073b5c2a6dba6163e0accf570aa954e8b6cf18927351d6086e0e0e07f6ffc0d88851ca294975cbad5e0d3c2ec2"; + sha512 = "e841e13d8f9aff9c00e3d78f01c6a6145d87f9c6fa5fd6390080b1f0002cd6ae2e1d45a14624151f7d2a075a479281c534b06bea6f03d022dcdcf330858fb212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "11d3dcdfad7b9786329ab9fc4800d32f92f1d390b332e6b0be3f293d11fe7b9e981196dbc2d48482dab9ccb8d6ddb4d3057abe83df565faa1a04f8b44e2512ce"; + sha512 = "00b1242cd074fa385757a2059719fe680d52bed9ff74ba913f50fd3c7a6e2bdb16a2c0b63343bef47dd0fe2a7b55b5bb089e801feb3d4e537048840b453b9464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/gu-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "15af55c3d45a3c8d3334e4214870f38148762ce2401d0a10346a804c5bf361e7f785d21091f2828b0458bedb65277004f87c61c0dc87ff6e09f654d2ec1d72f6"; + sha512 = "a1ba413e9f9f9167d15f37854d91620cee806edc1d3aef95fcc8b067384632d07789ed7fbb90255e572de0de73096fe08147082e24fbad9373717d1388f275dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/he/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "55c14b14d1254019d20a727f721c027d2c46b68eedb49ed848347c13f58577405f98d180b751df8b4ac17e7cc3f531c3ed8dcd9814cfd5b3e84085a33163f727"; + sha512 = "6ee67f5d621666c3d1fe3bea325499f21be3c5b51b76dac0ce04986e4a780b2da6abfdd2ca2b0e135abbd5c085b6a58da3bdebd9aac2daac3921e36b5c823027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hi-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e68243a6011d6f5da237f0ae230cb23f02d91e32f3ec3943db83ec3db9280f4eb5f967e3cc6337569bbb5939c4a993ac7bb075b938470e2e5c3bf55d6158bf26"; + sha512 = "a6c674a0303589372f0f065509977a7233a0a64ec3eae0d6c33321a3f8ef39e8bb0c06fab28114c620560a5dd7748801aa01c59feb785250455ea5d3683aa324"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b87d5e15e9a703f52676fe85ecbc24d8cf5969222c2ccd26899b105e92d93e95ff038b12053c837c0e32a83a6d1fb07f6697d85610052d1e6ac389797adffbda"; + sha512 = "49491d5cfbdb63a0ce5dfeab0041f3ac188eea65d9804ad204eee826a745e7274b59119545278a76e1a69f239b2350835ce69aade82195f2c9e3d926849b0732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5511df205ea5143fcb5529840fb62ad66cd48fa4af473031b27ba85ae2bb8b98bd9bce0acdcd1ac5ed0f3aec71c11ee501ffcda2f136d67265d1f672163ea403"; + sha512 = "94a1b14a0307be3946abf0291be752d90ffb004742e27ecabeaf340c8a291a203a71152dfefb0ac8614f029763d0f7748c20a9e254763745e74bba7e00dbb752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5cb02f6e0e3a6c4a0e115b882afdf376e9e322d954aa7241e98690838e4ebbf39edf8ee7c6546d6c4f9b98681d48a49d5031befdfaaea35c95c6e25b8877982c"; + sha512 = "ad13f2c9b2e233b63685e5d259e189c42e03c20fa4635b1e3549bc993aa84b6b6f60db765d3d754d4077df71482db8a410b78255525a98484af90963d7bd46b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/hy-AM/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "da936656f0915a96364ff3db5ba69e8bd0918a201e1c9519bb1357ea7ea622300e3c09f35823ed15b82bf97d8f24f93116373e11753e5e83d36b8d0b9454819b"; + sha512 = "af60b06dccac40856fd7553853ea27f084db076ab544e02bb85608f54b7fa91b05eafc878ff453f5392a2dc642e1f8bf7792ea2393233814e23e65f4eecd39e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ia/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "1551ef7edc2bd31ba37f937b9af0dfb011ffa51d61bfbfc9cb4375b1fa9d306c51ffc8bf7daa79455296d1f4085a131b73d575fec4ff2d08d2a8506912eb606d"; + sha512 = "f1a8b6d609ffebb5152f0156ee2dda7452f56321852988ccc5f0f644c96477a0bdb8bf1645f5049bc404b0ebe17627b53db7467c208b7f2c8406f7742e90a9ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/id/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7f370bc17574002f931e4b75befb3f6e343bcb32e142bb8eab8be419ee8a83eaadc2439f93ea75f742eb3a76a889870aeeb450e11685b39550cb0fcf77876922"; + sha512 = "8b90571b48108e99021594d517e07cbbc897c96a84dbb8547c29a674f875fa7cdf01432af3a8133a524fe43640b7d6e6b6603627789b01b6cdcda0e3dc6be431"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/is/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "608c9f812c5836616f19bd751ac580a930475a0a9d567a349269f68eb56780e4c55162b18db851451e52aa96950d06988bd581027608d4e1209de7e05ac39c6a"; + sha512 = "85f59ccc1812b98df3a7ade05998e997180ff5e1fff189dcc08a6ce65d5f020d3fa1a364e36d363d92bdd9cbd8c30af38a159b304c100f65fae619371ea817c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/it/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "96dbaabcd0e07563f488fa6889950bd2a09c5ebf49898a04e0c77e303b0be97a26793db8cb500df2631cccf922b0f384f3871aa7a8d2b9854cb93a23405410e2"; + sha512 = "c6ad61d891ea8d26a18da6d53d60216ad51fb236a4e011d99dccb06fbc79cbe983310c406dc9aedd1cb6b9c15212bafdc3db23f4b63a05343509cef1f5e309a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ja/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d1ea35ac65a52a7744048177efb6cfa826821b3145bb100cba03e98ec97ab268a88a24550d901631c6d8365999cce794509e1a20e8accff6ee5b301ac6ff4975"; + sha512 = "0b802cbeba1f5ea66818f3eb4738e43f0c448bf7a33d02a656a1c5116b218c5e7ee915f788d8de19e9599a544ac335b2a2dd3734ceb1bf927517f55a331a9ff0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ka/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1c78b10bcaf5d1c2b8164495b3e5ea535084922e20219b3f4f1fb41e4edf1c5ccd9a49dbc3a7e9fe9da7bb6e86488c54abc177cd4fd63679ff3082934d0274fa"; + sha512 = "2b71658317f90bbb6beda188cb347e2ff413476e429709da08b094eb60363b658f3eb84dc58d96ccb2f16c9d7a692bbc0f282d28020dfe6de3ffdf554636f437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kab/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "47ff7f5864d4ed04c94ef0442f90c373a5c6a1cb5ee0c1300bd1c3577f1f5845c5fed6d19eb590ec42e4b9fe75de44a3e737a8f915dfffffcb33273cf814b804"; + sha512 = "129ff0155fea5269dc0d655633d6b807aef97a626e338b4d6a0accac675b0c7cda99a95a5989990ccc69cfd9137f4c2f907b833f650f4b789c7beb707a634f18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "4a4b9092af41e88faaee11586b6404bcfa1f31ce40b045415a1af8f6082158ca310b47f0613109600d53381a119fc695c746c1536599af4208e476afcabf09cb"; + sha512 = "8cf6ec86d8c60fac299eaacc9f046beb497205f1414334980e0d6ef2576a043f731df5610c3ad918b5fce0993410ea5125efdb769300387ec0ee6fc5c5beab9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/km/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c380f003bf7b71f60c83ede15c26018fa218469d98290107359c79bf4983ca0a7d82500bc90aab35513df7fb90060424aee055522d34f2f79832957eae763ed2"; + sha512 = "2b5a8415796d16a386de7c82201449c2929b7f75e96ca84b5adc25bb52ed27e76fd5f510d6cba14b04be26866d17b0cad026bf9dfbe49094cae2fbed984873a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/kn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "905a0c92409bda30a52f68005d65702d01121156ed8c450897f2809416280c3b734ea31a5ae0301d613746162cd7f039026266f7adc43e15d62c7d6ac7731ee1"; + sha512 = "2d6f3384708ac2275c5b372d33daa0e80b6b253d69e80e0f2ff755bac99dd8eb2dea9585e3aaf20c2efd6528f020089b0a29a1eb8fc9719958edec806557232b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ko/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "916ba0b88ebfb66da8407d1ede81d8a113fb2408a8fc1de885be541cd09db6a3ed65efb746e2946b862ce2fef235b4901ce1075c8f6bb9b1a47614d717797c42"; + sha512 = "dcbfc97a8f6f5292e519995becb41065c561395b7cd24f76b6717e8c920c910a5456ba382e079641988de82871b7c4545cc1d9b044157222db780cdfeefd9949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lij/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2d614790ef2d050bbb6b2728170fd658327b28faf193e4e02616858165a9ada67825add643f58594c94f3a9465191d6cfa9dd597c55c8b1179766ab4ba4a3a81"; + sha512 = "fddd4b5a341405ce2d7598768d53a51c37c54c6486286569d4ad06965f27b4c7249d769507b586f5c880ea994e67b0e51a2bca9746c54501939c4717dbbdcd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lt/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9659f84976304b84ae0b51f10885bf6caee0c6567b58466f394c058d0e47cb4a38f22f92086235cfc0077a3eae10de18612f178b3bd59ae830e2ac93553e79de"; + sha512 = "e6a11b4709c0578aea57330e43f9e7f15d7c1c9401a2fa04d909e373be7a6c80123f05ede39a9e72a33c8824b211e42483a96a9620de419b7748080cc9a7e998"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/lv/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "425ebf254d41c868960cf90a015771cbdbdf2e0c33fd17f6b038fb2b63bae8491379e4cf4424fc55904560ad53dc05928911ac908ea5aaeafceb5409e337c04b"; + sha512 = "f1c6e3422d6cbba13d9ad137523f06be5efbaefc60490f67456d5a604c4e9083a172c3299ab1d41efdd76884ebc1fafaed6a083493c00abe81888a23b2dc0c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mai/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "0d2204236c66f67297531c8602b5d27c86663ce47b37451d83a72e822571e6382ef5133c424b5cf0eb8a10a2e03e6779c605e735b0e548946fc51eda70b937bd"; + sha512 = "5e7368d6a098f90c6b550e0700342c1e036f69c7d2a28edef7511ac88601b5befae37f2fd279c22e383050ec5fe0f5109f22309af34914c98e120144f94a0345"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "54bcc2fdd892565306335c4bf15e75be16bee5856f6c618a9dacbe1f22a42c0fc635e2447700166dd1269459e6d063831c22abf1a51fbafa6200feb742867836"; + sha512 = "4294fbcd18dc778ac641cb29c64d242570c018eeac33bf21445dbea4f9abcdbb31a384ab2a73817be265f6cbb6e509b86b9fd132b7cdf09258cee191821d1796"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ml/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0f67cbd2ae4cd6c2e067c424247c95d6aa6260d762f3e96d6a9799cf8e8e0065b9d26c06716d62278940b271be822a94861553435d7b689bed9c61d7723688c7"; + sha512 = "050f90fdb97edde5a75b798af02a10f7fc5bda28a07bf5f0b883c5039d855cabff160b0fb7411726c5852584f96ca4135878ba7ea8c3298de2fb3af85b7e99a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/mr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "470213aa3e25a4c85ada8036ba9c7f81a4659a22022e67c887072a66c02a8ad1fc2cc42012f8a8ac75e54af5a173d6d80b2692c3cdb435bd934f18722a1b579c"; + sha512 = "a005fa90f6d301d1dad2175d58bd9de698f061226a6776dd5da82195eba19b004252b02fb464f004b6aaeb13232e8d80d511bec3cf955911f087ee40cfcc0015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ms/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "de30a81fab969e944de2336deef2bbde662561e1f8309a1befdf92bffadcc8f8b9544173301933dab54dd49993dfe252fb4dc6b29fc2dd383c944a6b7e5d8c8b"; + sha512 = "4ddf2b483f24b16a08b293a3c76049e62fb7326d3da7287bf0493eb838220cac3ba5a81473a0278c72a5c5e5391edb17304c0140e81c43c1b943b9135ada3b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/my/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3753ff41f0f5626702d600a147246fd37c7ca724c457217b11930a8f9d64fa4f54cfc61428ac7900d9297f14d8348291d8cdef64f16b51258cc9e9a4736168ed"; + sha512 = "23f2c208eca6472879e47a5bf3c4fbe04a2feaac0d220cdcd1985001665f65e8992a97998630e65cde02c6c87dee34fa10bb78b99beb5c8968c99b410b226a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nb-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "732fd39f7e9c6b56a1137025e9cbeadcf8f431a1c0b9d161ba1bc7679dfe4ac357abb8862ca58c681efbe8cc2434330bfff9fdbf3af5ea7bf03fd4ca0ec25b3c"; + sha512 = "22461cd2fae62819fe9a44a1b947d63ccea61d5b5ccfbc949644518d3c65c242e91770a10405fbcde24b2f6eef794b3014e9b6396eb6a945c904e762792e2634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ne-NP/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "7dda0f7e98d5b1c6296410f42025d51d58bbf17fddbaa0aaeec2ce87511e0e182d3374deb033b30edeb661ad477671c3457d36a5e2f075f7b44527ce6a5caae4"; + sha512 = "b499cb8cc7d5486d368b381ac6c0416861846568fe6b8cf83dd2105427d87fe12a648da5b36c42a4a22b64db48c9016828c14f61d4c6ccfce347095ac275deb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "605d948f8d0ed5a2264a6e93bac89c857319617f65cac841652ecca3aaf88c283fd9ca4d3b9d63ce436ae993d7c8145be92e5e1aaee365f36be147275550cac2"; + sha512 = "3107acdb8fcbba9629c0e3ba940de4df42d7b2d57328ae3b2b67cfba280ae2f97499d248c1c909630e795fe1f8b8c096a60e273dee3ba1bacecac8244612ecaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/nn-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4a679b681b01af5084265982d4cc89b435bd4bf4e58ec98bd1ad9fc7d134c6bff1841657cd9c327ac1cd42c2bc79fb99064e6c5aed70539b5b0d03051f753a57"; + sha512 = "bb5f4ee13acbed4dabf349fe8373a6dd36df5980c6ce4c4d8a2f59cc2a7e53c0da33370ecdb394c80e3e0738d9330690664e4702776a3d5faccd6fb041fcebc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/oc/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ce9131685c56cdbafc920c0d88300f34bda4aaeb3478b9ca3c19363c9ee8eece740e083bb86a5938e9a5fc3fc54dba46523fae6b1b0de43c2d4e0221bce91d6a"; + sha512 = "fb0ae7f6c96a5c3dab3c8b205532cf0963f58bdb6b5be335af6e04c583101d7e0769ebbe7af5a25eb8c8e0e52d29762660d1325bfb36f52ff118c3443b9c503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/or/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3ab4cd737c0c1e75f68e4483f9a7ed0cb56633427eacb8796d391f2f49606ba3a7d926eddd9a49298b13d1d3c39e01e391b03d83db23c22f835dc865555a5a7e"; + sha512 = "3a096af1920f5882a3c14623855a62bb21812a342ce8202dab99937c95bf2bb25ee95d6e8d8f83efb3a4a6576cbedc08fb1990f32aa2ff95e9db109b3e246a70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pa-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d84a947386dba337c172d8bbbe904b4be579a5bf9b5ab6bd43c1cc8e0cabf01b72e7178d2321ee1665e64a4e38b34fb864a6aa53db06135de1da7fedd27751cd"; + sha512 = "c078b293d2ed28fc1780ef5a245650e88f64f806b6beaf593da3f34e554e77e239626699e959c681f652a14143b46b13146a7d4fa04d3e71bbb9a55c0d487e0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "cef8df7a206a26af3299b0f17fc1b8d8f95c7702952b4ef8a25b640bb398825434a6984aec21a29cc17c3e97b9d99fdee2617b8d06c1982c12c9f4732fa057b4"; + sha512 = "6c528057f326285a7b41a12f5b60f6dc0c659d8475d1766b577bf3967bb0111bdbdc43a4c5dfdee20a215d12b9768cd080d33b7fde31633f41edb9019ff87a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pt-BR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b3f31d6c46e83cf46ee97bbf3875730d152b4db30fa59c8099ec2c977debb214b933f944e33132afa685a2f3efa86c7276713666e6764d66781eb87f555659f2"; + sha512 = "e8fc71862f83004c660168b0e955a1043384dbab038f3e959087c799088bb3307c102097f627925249a5ce3f316c102a0ccc871e313cf7efbd4d10c91b2eaea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/pt-PT/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "308948a335c4b3901c75e8ebe269844a6a75727213c4d08f00a5016407efdb0859d604c1d8d99200a4142291a18cded8bdc8b9a362ebce1964c19e0a7dfa3495"; + sha512 = "6c7881edfe14ad6cce5241e4de562e137f44abf23bec6c49e801c1fce5f1c417f88939a97f4484c37061063f7b13d64eab55777c6852634d3bcfb69954ca3837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/rm/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e115c4f369a9b668c0f5450ef3c28e3c5e66822686bfe5796a227459c5ce4329fb356bce408f906b11cc1e0dceaff6b941f12b0c041fd27b0f777f3eb4fe7718"; + sha512 = "1516fe15becfeccdc63f3014fa1e776662777f303e66f1d7aa48a39905eeab20dd646832bbdbd1e3b61275f02dd338255e0e6db6b0fddb159d480be4c89dc1e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ro/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bb26ebb73ea63c1cea9cbb2b62158236c98f0558ec953f7a5d9d17ee407dcfa2981b774eae319a825680b8092dd44fe6e9df796ac2982946f74c7ea5fd5df8eb"; + sha512 = "ac6e751c4d2be30c6e918ccc1562a8aefd0e02ac672e2bd3a3f6b9bd2c153ecb172674aeb6ac9607210250e6b9058e007626bd541c4c164316c77d98e7e77c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ru/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7e9f12559df60601676e76a38c0c99f0f155d7ef6e7a88f3086b048151c7fec56d3259bf34f37399b1c396def3ea4ac729c12b83792843063f645b13d94b8a95"; + sha512 = "92a7cec3b0e4783cf2bd66a2afc0db069b9e26b0359bf376abc36db8c461b68690a789c06275d7cf3407802e961bbe6d6779497a158872f3676419cbcb1fa864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/si/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2785c0a12c4a09e7263085741f59dbfc9d8ceac93992a0d1f7181a34a09b44aac8a7baeb42cd047dce6301c1735bdc64f498c9895363527965a4efd500294c48"; + sha512 = "d0cbce1d70714e8c4b5d61caf7f6e02b1caf43530b3a8d5db775bf164b74c273ab458262502cfcd6f0aa4a77a69b0fa3c6ec7bf9d3485c7ab447b07d8e534a28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "20e33d2a6ed8989a889e55f9439d5878d295f1b25e88ece5416b21902aae95a662b0b198d5a690067d04d83ba514bc944e8c4e5863dc0bca6fc2a6cf0be137b5"; + sha512 = "89033347ffc61f42d9dd9a2b50a24623f7e8b96e58b8f6baffb9f751e3b6b64041ebf4080fa7fe872f72e65982e860b04004b42b5c51aeeffef4129a3a593c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d67d23d6570bcd1d7914ff465aac68faec728d5afbfea2eecaf1faeb7165e5c270f5cde1acd2e0cfb8b00151039a1b92cd641d91332913c959a92cb5b7953cbb"; + sha512 = "ee4ddbedb3c5b0b7c11d277f84028c867b17bf7a1559b276340312415105c80aaac8ce468cfaf99368d55ab4b9171e0555b5ff6949bce306ef72dd029464d479"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/son/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6baa5392250b8738d10f0af54327da729650727a5c7419283e33b468ff1bc550a73d588cacfad429c924c700e92f1bfd28ca89a8876408d56a9d8e6e3c1f14e4"; + sha512 = "19a7e802542421b3147c2c0acf379d5bb8fe444b1dbf3ea41eac08065e11bbaf4467fd2bf0eec2fbcbcdeb8a24677b665035bc6c7e892bc762b5f8e01f9b9cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sq/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "205be0861e846aae214cc2fcc172a2bd77c9de6a7edec77e2bde2d420804982c817b608620c54179a10a753f10ead8069285559d8f613e340cb4d33414678ba8"; + sha512 = "32baacb624f9060d34b76d8aece1c52bb4dcef3d99f01d5160878666bb0b7a79501fbbcac8db57a2be1f8bcb243f323b52510934dfed36a96efcf0a23664619d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "0428925e3e1afb69f3610d8992ec1380e55e6688c04aba3983feb404665c8d2ae05eb8d2cbf2eee446e9e9065de493a7ac71cabed764dbdd9bf0f01c2e5d476c"; + sha512 = "307d847f3a8fa5dbf8ef3bf8fd4750b508fd0e01694d1b7312919335247274323806f70e7863a1cc66fd368192c8b7d3df53f5c0993fb7defa2723f50eb59ee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/sv-SE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "39a750b9e9edf2648133792002cc4bc5f9a8fd62bb1580c0a8da02f31ae23d6a288140056e3465d18165dcdf22612dba3012e9843475811a30b68a865f16bc8f"; + sha512 = "e7c257a6bfdf9d946174a274ff41fbb2043978f4263e78a7c4af67f030b70ac9fe3ff0944d71b002478c9fdf033ea4a252400819e425dcd707adb40d249a2df1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ta/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "3adaf77a893327d0f7f3ada02d56e9d38c64ff81357418e72a728ca2abb7284973cff4016d72284568cefb265a00ee0a1bb58b71ef2189c8ad36d4c701fa9b43"; + sha512 = "a47b5ba62065cfe25fb0bb650c46fe1b7f92b1c87ef99e9cec15cc9d46b7cd7eb33c74065a9becbc0555604020f7a3e61588e29f920c8a926fe90991260c4cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/te/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "e5392018f9e17d01623bd29ee28310764e93774d96fbfb73061d2c9281981c893e731bf3e4044514a4f05d81a4c03647f81c26ef4c89b32ec37ff71a0fc31958"; + sha512 = "0e54ec5597f42d4e6b04841bb0bced5e6129c966ae917912d3b91dc0314fef006a1929af6a04b126564713ee2a810a4bb9c1957803519ff7a64a9a05512b737a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/th/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "bfa74ea342566d589a7c1b52fa566f9ab7bdaac9662e5a3970c30eb7cf41fe6c99b3303992f160e79c441e7ca2c9582f71a84635f001c78d9638cddcf4b5d15a"; + sha512 = "c8ab7bdb4b1a95f08620a2788ce00c3c4c054826026966a2fb6407035e26fcdb685337dbd5187235683e7ea08234d685540f541b6a1c52f3e9f2a1fb5d2a7db5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/tr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "390244c6db478a32e58a8c4732b6035f955274f7b1d62545cc7eeac25ebc355eb701947c77f96e1f185ba843918e44d1b619ce9bd9acfd49b944890a973a8f47"; + sha512 = "35a4b18c459898b470a35ecbdcfe863ea66755de4f51842f2a368300e542eedcf92914d9630b9bb32c2c0381406b3656ec1860d9eaafb2d2ca1f7e315593b17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/uk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2eb8b9b3648956d54fb465c1d783afe160c6e06186165546654ab63f9a557da9bdeab18e1c9453a8bc2d9082f45c067d2538828b455283f42bc2935ba77b6301"; + sha512 = "854153f02ac9500858aa9da1f153b231ff71e372e2c9d2ad87282ac0fe981d959103847a5688be87b01b2c3032e486ecc39fc76d3e495c395c2cb88240b5d32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/ur/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f358018a9c2848930c70ccdaedb4088d829bdcd08a6e488e65d70b8ee878a477f80ea4736c55a61b3f58c0f7d5753bf73764985e84693a0e18804964f262644a"; + sha512 = "0434852668d46ae5a85e9a1ec6a4db9ccb801b4d870b28e500690be33171b1596c7004f23ba643d88183edd524a6d558f0f105b65d1356147648003a0b6b9355"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/uz/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "dca67812c686f46f74318802ce2ee334e5cbc38878e514631c55963607789673e1fa6d2bc4c45a130247f7bbe1373a27c70fc726a5338a51d391e40e040e213b"; + sha512 = "51e106c354bf253319107ee772619139413b4ef569ef3c97abc0fd26a5cc1c0eeada6a2924c3838f320fab51225e05e7ec170d61151baf018f9ad39f3de83f5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/vi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "71dc5939c88a9bada577621ec8972a9c253d51cbda818df47fcaf068ad41f25f89efa0280ba269a057658510ca668480524fc45b354356230b1a87f415792ec6"; + sha512 = "bd3d7a34c737e2b165de9bd893932e117d993c1ac396f7161221aa84c25e8f7bc5e528c0de710da46324bc05c18762994107b08291dec49e5d8fba58b4c10dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/xh/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1880cf34fe3ee330c1da83fa78e56780e175408f5219bc5d8912f2bc8cf7ca3058e759c40cbd5dcd2248d0752c2f289ccbae348176d8e3cdfabfe845f2343d54"; + sha512 = "3c339ca6230783dfec8df3b14709af1a849986fdcc05546447d698f84e3e8d1b006e0885ef90321cab8d44dfb0222e6ebf936d1f3934bd8b487ad941699392e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/zh-CN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "53f4d16c2e5f9f924344e4dbfb57246ff9056f6d41a996a6308aa8fc36989148d87db22ed1f2f29870127d560b4a711313e6d99dde0276a81c9e338823001c80"; + sha512 = "8c699af29bdcf3955c4570dbff4f3449b033360892cf8c1b86bb00fe6bbb778f6a80293627ddd0fdda8198e2f8cc89649e66f3f37bb0d2cc9a2730210ac0506b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b19/linux-i686/zh-TW/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7f59f4de77dd5f6f0c31e9062c26206e62c8920f7e2abfe0f7da72de7ac8804bd0cb5591cf59e13c7c44869440d06a57b62297abb14e72646278e98c870cd2a4"; + sha512 = "93ab2022e6fd50266e201352e37a158d2eb65c00ed76cbba5940d852af182e401a6ed85aff4b7e50ac62a461afe21654526b158787fef15f9ba4c71cae91a8a1"; } ]; } From 8f07a0b420f94d6aaf5afe2e0650752f2b325173 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Aug 2018 17:00:36 +0800 Subject: [PATCH 038/138] firefox-beta-bin: 62.0b19 -> 62.0b20 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 331dbc543ac..f3a8ca6f289 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b19"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ach/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "559274af510eaebab2cdd9cba8cb668bcf926fa5cdc583b1e26bcb4a50307cb318839038314ae17e0cd793e7c2173de5d69e606d90ae32f256d24714dfc26d7b"; + sha512 = "bcc42abc76f41f5fe32a1bf1e824be451d15686c05adfb58b85df6eeff39e29aac3aa18878023469e85bcd8e9d4f55cea9cd96d7b40a5b6918ec2fa572e32b7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/af/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ee291b325468c3d31ae0e97984da5a32c552050a8a9da8a075f5925b0fa54975066bd3bbcc57a15e0bab219e2b45a9fcba6b6e831109dc80a4f16728b4f19a7d"; + sha512 = "f371acf6a9435d6c673768270be5a950ac369cb04e91b77f8422feb77cb09e65731c6842e933aa5012402a69bfa4c01373419caf029e133408105b71d218a3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/an/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "49e63e03482753bcc1163229b6c7b00334255c11359482805eb26bb3ae30dfd407d9b667dd2c043019b5910b47d62d14c89b2330795c655778e6617ec1f8706f"; + sha512 = "79fa43b710bb99cb94ed463b845d7eaa993a2d35b27eecafac0e387f5781b77415375fb3d19256d3097f314d0891020ac929877635d3f26ab3fd808bd105cf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ar/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2acc91e3a22550e851714b4b1e45dc36f2bb61d79484f9a9eb2266fd0d75c356c461ad04af818458344c6bc6983ab2b92d84ddbe73acc39f29836aff36dd7bef"; + sha512 = "66b40adacfa9e36e61d9f4f77fb85db08cbce2eb162201fd65db48bee54c38f4749c7375d893727796c8954a71004e4f163fde8a3f701dec712d271f808c40fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/as/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "1fe5e5fd3bf2ec8d077937e24c1175487853467037cb10c22bd2022bbeb454dd860f3c1356a88e1d4fa9ed6b7f0539917b0af858bd6aa6b2be7bf77a82fc05e0"; + sha512 = "090f4b517d242f67b43bdce75e586cfd0eb58abb076cccae9c5cffc74d14b04ba06018764bb7696f2b43049ff8311f3a6b6d7207d3ac0f3432904f4ecf39e96a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ast/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "0a7680fab1b7de375462e35e1fca3b07c2f75f4a8526c3a7f76a213b14d5089c00165c84fb76b701ff4a8efef16eea067f5dfff53653cae6f996cdd9ba1a0d43"; + sha512 = "309b5feeffbe980b06bd04b4a6db6f4677d131c7ccdd138cb8d43eebfec61b423e30d5f7d5776827f973f6c7fd995f091263839e811e1496b7d4def2f97ea922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/az/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "afbb90dd5be84771a417e3557e155b0927bc78210e22375b38a9aea4d41ea6d815ef46f2db90f7efb403b01c7f2b98b17ebed4c04d7011cbc20c12899562ac2e"; + sha512 = "6b64a0346ce7a5854c878317a34dd91c044456f823fc5e55e8dcfea55663600a2bd1c9471f01732426397674303919125f69ef0d61d77fddcaca0d462cd8e084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/be/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6ed275a8b3610df1ce7aed24d8a7dc196ec50f0b57944ec7096a04b14993161f50f55d7aa5ed266aefeb042591a3f883548d1c59568cfdb62aa9cf68033641e"; + sha512 = "9553685556a1def24354972fafe785ca9ad180b0cda48a928b39a47011fae41660a4d046f6a38c11c148ac2b6a883c1f8a56d6aa4b6ada75365df2b985cbe473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bg/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e8e60dae4bfab73e41749eb4378bbdd2d16b7fa4e6c6e31816a1019361c09eee12b48ea60f1690e5e29b11ef69a22aa6b09e10a718cd1452ce966f4183692007"; + sha512 = "531e0f09ba97828a039f796b6166753a9e35ee902258b9318fb91838b956d92de6d0f86168f2945eb2ed6352307f60bcfb81740dbe3e3ebd0988c9a8fa59ff18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bn-BD/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "cd4630ecda7a4b7bc83470ce1ba0bbe6914e98fdd4a8fd39221f777c220e5950093207625b4d5059a9a7b8cb0bc8f6dbc8363152b7f8998a21417bd555f29453"; + sha512 = "545525b698e0bd93f6036b92e3723a452e8083cfb0cf7462c8c077ddcbc0210d25ab53d3b41b67dcc1dbaa14d1923fd0b56b3097b98bf84164ca367f1c07413a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bn-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "762336bb75dca428e918c08a23d85fa0193357f5b38bba355c977d0723b54c17252e18ea016f7def876841a76ba920c8e731e64376fbb941a565ac88d82c090d"; + sha512 = "95ceade2812bd3ffc084167280d4154331fe5239f167f79b9c29a43646c2c9f5c7a4e22cf6d814985dd01e8d60661007c66ebec27bae9e19a85895ae9610f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/br/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5c3c1d88f8d133abecbe67122dd19501e06cbe87a6166733fda64e740406ea30b8a2d5efce0215c1572de4416f8405db4750b8315d50f5c1e1038848ba857053"; + sha512 = "15153f5e0222d3d0bd716e7595e2d5ad7b84595bd14971153ca809fd62955c55ef99b01b8687e32e3e3ba65b030f4e93beae90938efeda3b5bdedc9a2a012c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/bs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "71c23e6794978a9750460e107ca173f1755987215023a6399010405940de741ef8e1731b6c23bd2ce62b39d74442824530b7812b2e5da52ee9f5b6810d249166"; + sha512 = "6f7b1f882ae6b9d95fccee972962e98c9c722194bb08c466071333cbcf5ff56b149c07daf1d6abf808fe0e07e22af78a915c94268fa356412c88a9f35fe5364b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ca/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "1c3c9bf9cb9f18e5cc0851c7b98c9975e4f961e38de03c40044db3cb9473976f68d76afeb1a4d3481a0e5814662a327b7b42f07db98c6cbaf54acf914fea5420"; + sha512 = "dfc0cfb8f95421e8b60b91716a68c6a5db1c0630c298c2b76c80b3a24308d852e056e552530b034f9889b87c72e581590ad018ef0b0657baf14895f383a594ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cak/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f24816ae06ca74cedea0e19d43fdea38d79598f9416f3fcc8bb23cca9ca6c1a662d2fb631cef9e3290a5f819b5c634f639e671a81825cadf703bc977e929132b"; + sha512 = "7561a94f9bf8edd5693c9e961aabc316056a76f19c8b3d0490f94d74ee1bd8cd0b49aecf71b48c7e90435a2ea2efd716cde53303c73a68a1a6230e51445f719a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "73c65012f8a01f798a5bf3f77b336b811ba90a0d339880484db7b95565c74beef2be731d396491dd8cd79f7cc3256f5731ffbbd3876b15eb0f5c6452341207f3"; + sha512 = "cf2f2b8cff2951cb71454f3d0351e157606af1bb306b65f0fb8930a9257e16ed5f7704be09114bbeb37c5c92d12feec1371339b2fb126c8766aa8bc8034d07c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/cy/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "62b170155a39e292363307ab969da2ff9c2e82798aea7eb2d04670d5326d6d7d101b2cc935eb920e6c617ff1ad9b6935607adb5897061f9dddc108c5b322ba87"; + sha512 = "05e3f84109a47790bd88cdf248c32eddece4c95ef9c5cc46cf67b013063441106eb0b4022cfaf8501593c6c4e13f84684ae1b8f48ddd3704ea52d520d1f9a185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/da/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "eed60cf7ac7ab8497204b322d416c783aaa7300f607dcefa2bcfeb92d0ed7a9368379dda2ff72b309ea39a68dd02d5888a67acbd2b524e3785ea9ebbf18a4540"; + sha512 = "cc8dbabf299e1009b180ed8201699ebc773351e4969587df146b977da3a7a1bedadd0366e765488d2e16aa81e768c3fb0892972346d6611c29a1d6eda921e672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/de/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "58176c23d3b413c3da7f019ab36b9e2f79c9f97e08b3bfdf6316ff3b657d3c12d0146618520fa02d7378e9e36cc519e14e78239d7f94a6c1c6925d3bc79d45b7"; + sha512 = "a69c1786b2b5455fece6d49ae0a8408cbb448c4b6c3f394401c2eee20a5f7d80db09d982ac50e4893877d876123586b1e1cf844e72495d5b1a5ed2349300adbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/dsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c3f4a4406b3dbd466f26dfd239b5e8eda062718fb4683925471980ad403d7569aede2d20cf1bb74569c911253d2aa372d21bfa2842988a4652e6a09672a0fa24"; + sha512 = "b464c71a4dddb8fd864f1a4c7ab2ed6e870e0cbbf3213255965f3534b2b776d7da03e997d78c9f4e794da7201c92f0e9f85bf5b5631131a2355224452112ab0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/el/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "03633de8e557ead1b1efb62862f55e306fdceae37cc963a2af28b6dfaaa685d2d05b550d25f62188e6f5b1550b8a2daead2a62710b8080d7b7394baad075a82e"; + sha512 = "9578203045825c12c8efba6f3488771efb52452f3a1f57b8a3084fd0c83998f0733520f1d646b1b847ffb76cbcd4d3e184cc0fee0ca01684429396dadd09757f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-CA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "eb6ca404f0d09af7785f9ec9d069fbf69169bb219733e7220bf9b93d9825158ead1709d8e15e50f9ebf1442e9cd1024c6f1fc02bd0a1e0c71c8b110acb92b414"; + sha512 = "d316262b3c08730782a741177224e3aa269843e1d65ba7f1487e947be73ebbd4fb88f0734bc98e840951d89ecca8ef0a62cb5b8c456e4203da1d11a8a4a1451c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-GB/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bfd59902d24778e770731c22137f7932531a340c99d4fb8e9461b68795a50a41a3214213eb234bc32750b0ef28f6f9804314f6d0660e209104d8f659dc3ab176"; + sha512 = "fd43c18250362b0f18140d123eec2d87578e29acb864ea1513498ec47b7696f0138424e8be33f8af2b77cefa11d7a5ba368b3fbfc85205272d9ed848ce2a9f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-US/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6221bd0514aa1a634d2bb0f62d970f4bf5cbfa71544c9b5468f04440ddb98580ee43c4f270f947da838bfb984cfd01b4a4a85a6690810a96ce42fe1356bff4bb"; + sha512 = "f5c6b847ea22bed95aec68a6e4316e0217fab7a4d7426d4b6b57ec0f7f4a6fb3b07e9aa330ce41f0a2c24d500425696bd475583c849556a6011b2b9169581f29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/en-ZA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "6b5b135061467e3d24f9c01e8b01c56ac1fd4b9109e0c4e36852e5a9cc693611e54c8a4df06eefada33ba3fbc7d9cfc88b167905a0ccbc32582ab8bf6ac24cb6"; + sha512 = "5bed0853937d3777307f2a432e8b05f7fd919ee0f781fd88381e6cb81c43711c2c12b9fe05d85c22eeb70b217710ea3d44e1f599e447c2212209135f796eccdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/eo/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "1ef1e7e13d70cf874c4d49e3be56a02628ccd8839e55eac5ca1ea8174cdc321b3397ab1771dbc343fd24652c96eaadc2f15c45d17f3232d8b9f0644764487576"; + sha512 = "3881270a0874ca0094b27361cdf228e50c01c326f931062a54b5ff774e0c88e36b3df7087f11faa3f7f6add2d4156d385fbf30be4ce30f73102b47e280b3f006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-AR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f5aa44b03039562332b3b7074fb1605e4b48b8422ec17321ee22f85a8e02c844b58b05f8b776282855a33bf6bcf79731b33ef8a0594cd8f437f52dce5a3e7958"; + sha512 = "44191518ade9f6c7c5f72296886d90b2c649d59a0f64ce7e7b23896f858b95ca12f3d1c91e4dfabe94bfe1dfb91dbeaac536cb121d7e497efc77f1316c323385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-CL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b79887f5d70338a35703afe3115f8a86dd2d094657020924e3344a1de83055c200e090d639ca25f32916da352a08bba9971ee3f7c4ca1a038b5e05845c0fe3f8"; + sha512 = "628e49819bb7e98f685412ed024e980a7934c1dcd3968709b8a1f23f449c493a0c8a0edd646f80e131d49d0b22e87a93c6671f892684e677e77207085cc84b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-ES/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3c0a0d67c7705236fbf4f5f5714af97c9dd94325cb8c391b3c660d027fb536112d1d82f26a78ac660d46c226404672cf89b1ca7c762a32cdcbbe844cead1fa54"; + sha512 = "ca0edb153550ffa62cb56686bca81970a6e15ed0f982db35f82e69068e1c28452f69ea09df674aa26171e05832dfe39b47d48d0b25205b689455b282b679c6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/es-MX/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0d951f4918505bf3d8b996cd036a69b7fdac7ed9b85f38dfb0a056bf23bb8b4bd2ba3609100e510034bfe02849701e24559fb7f42dcea27f34ce7354199085b3"; + sha512 = "28c26551beb43276c8bcab443e88d52921a6861796bf2c0fe5519bc2e26cb6fdd28e3be54575e300a53186e96238749c61394aeb7a71f6c196ea6e4f51cb73de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/et/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "819640d6696d631b08043b88aead8491951005149a06e40cc8345c10fb2098cd5ff94360e33fb85ea5fd9e1f93c35aa2831d863bccf26af456c219f5f9468189"; + sha512 = "f26a59f6b75d1b85da6e13d02a206a41754e7e8214b41240839f0852b3fb4d38aa75a22556239262ec5551f551582ee7a374121dc57ef32fbb466a089e8bf98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/eu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "12346ca24daa896c6eda4bbe5cd337894b043150ec6dbcf912a5faba3f8efd3f9c74d70694a799701631ae543607a1042cb7f2274df1188eb77c45a55298373d"; + sha512 = "60ea439cb2d5ec6dad00e6ea597d5ca78e0f56001703e4f4e8099f695b5e557ff945cd83e48356fd7e78c7a054030d0f23fd85ebc15fd72030e32db1d78b7b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fa/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1b526ca30f5d92a7fda1d91efb4818d21820ab459c347747060881d7871e8cd2be5504c960659c142a629faf8a267642f4318a504c65a48ecd4b6db484814d82"; + sha512 = "7d0454ecb645438b79137acfba79d8d03cc9d44a3a70edcbf72b628f430b83d5eaaf7bf6d5a5f04f2f592cf6750dfd7667a39907a29de398a926e40b2a36b31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ff/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e8e364711585c47ac2bfd8ec4bd3aa26faefa51ffce918d6b89c2fe62dc21984bd85401b524c150b5a8930cbf5ac9a7c85c6ce12c98c561ea4fad34e0ae4471a"; + sha512 = "c1f5e4d7df8590fc18844e5bc67e28bb2d5e88c3eca8b1dc8d3103d49f333ce9dfca7bdee432e190d01688ce7b8c58fb1a2a3fea0cc71e5a007d11e411611d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e8d7b39b9fd73d398e69eef421e62aa61251d53e60c9d08f78fb318fda82704417676195a73724f8ed118461836f4c934b201fff1f4eb3fa4b070c068b2f70b0"; + sha512 = "a848315e5f0b259e6770fff8e275f29946a0daa8f432135ae2d7d94ebaaf0f7bbbae7566c87f20cca78ae0fb512c7c4434dffb322df78e568095ef3b166f7f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "5f06105264875d98108b4261824f4f6385615f56079fe2ef08b8e6aa6991fde738cd7e1d45b582ba025ca6308e706dc4d487ac2128909a419bf47d9ec09f3f71"; + sha512 = "1a65ba7d442436ef0a8de3c7ea18b765eb933c59a211652a4a472f10e73db987aa2888a9e0b33f69586c6152da5213f1ea1d9a0bf6919a3a5a4b0a352f35e421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/fy-NL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0a4fe4a1cf40247399c9d5b4d8cf275f122f19d37ad8e2c8807c28a7b3eb752ae6a6dd01e8901c2f6feafed32367eee4f25d0d21b65d1b8196b971cea1292f4b"; + sha512 = "0871b3adc369c1125e3b4532122610de49a9a4a8a309eed73e4b76a86e4c0f25510c6ab5b37e87090e68d6d72c07519f1044403fea7144c84b6e003294f86e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ga-IE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d9f9dea5bb8c1e854ef359e5978fbafbd8c07a2fc1eb3238a3ae22dffcb88cdde0c4189c1f60bbc50be58f16447478a3adac9c6d6c60d629cd2a2e66b94627aa"; + sha512 = "c99aa21fe8e3f835047c3d9caa167401f7b692ba4be1b7c43a4b22d61eeac1a2e2e5a8ad2567730f310ebff73dbd5cbcf1032a13ff454477a80b30421e1b4abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gd/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "cb5ea6d8af9ce3653ce73b0bb12c6f78c3ca26d49e88f076dbd1fe1e9a667c091657d4749594566b2cdb9e488792e7b653e20307334bb1c25661a125fe15bc9b"; + sha512 = "8906f71ad07f89647eb43940da7ffcaf97d10845d7ff0a9a89e60601004aba148a5f49d8343190f9b559741213cfbfd840d17e68c3b67a61183647b8caa7d6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "252c3a82913578e069a76331c95db4335040b8f2fe194bea259d74b05804b65f94a7ac878c9c822790d00e1c1fb7df80904328acd45fa5f2b4534d42f3a8c00b"; + sha512 = "8865ea0724ea9359e07f59ce65c0a9953710ef963a440ca86e0fb2bd612b0129c86436f1c53b803ae0eb87ea4a710cd49f8fce9ba128dfa36b2af703c274bf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7dd1adf33f8add5a2996edf1f674b502813fe4ad069eae5e520f413f069ea37ba1fa9dbf3f9957229824f0215db312075c5867a6d98ebd92cdec8dd49aecc816"; + sha512 = "dd9e201889a78f8c779aab5da5112c11bb57fcc2e1294bfb078c90ce7f4b81010fe014d5af3ad4a3ae9ae3af7260c1d33a19f5c9282577e5ac562e4493102fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/gu-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "41a28b5deee2a2b2b57734269d14d124e0d9300415478a21ebeb04a94ff50645bcfc0632368f8a93cef1b1936de9fcf34e76da2e8ded871b79094b050f2bdec2"; + sha512 = "53a97afb17c1a64248c7c0fda8f2a412fac892b075d9b956fc92974dcb6fb2f5fc25377d215cc565d10e353b2e34554a0d4cebe73ce45780e2d5bc93a0af4451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/he/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ad4fb9b564fa24151212447e4a7dcfb9da9e074155651d5b7473184206c4682be451fc808e27866861bbf1a79bdfbbe22cc0561611f1e9c5f8511fc5b7dfed38"; + sha512 = "084ac6281fc2bae1efca509e3f1c2306640c54ae976cb747b6a8bbf6c9f5a962e9a37a3e1219df29acb8f25436782f72e2b388b4d1eac69dccbd628bd4304956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hi-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "deb7ac4c0bcf397366c05fbc1e5d0e77de4abcb48034db982d3380133b8309d4b2fc3609e782310e2b1b10c04669ed8d40182c983e0cbb155d8300a5449d7f64"; + sha512 = "05d91b4e6b8411e9a979222d42c82b7772a39653e621339c30698fc5a41d58696614c5677cb41c20b9224d3fcb77501ac436b1681b38c104ff505b1d1ed95945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e7b086a0f1a1ca666ed28b772d77590b564bffa1c5857c1f4b2a10a0a20fa22d2902a91477f9a881461795108b2cef0ed36feff8c9d891cde3c413d7b514b01a"; + sha512 = "6b497998cd3d038cddf0b1bb3e940da7993b95c711bcc369a0aef7f4e8b757a3c606fd5c0f109adf4f0648acd770327a5c4550338afe065ba6f85f18aecdc62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "de55608a2937abd2ea8cb3d01cae7d6fa1a0be8d2c8bbd9629a15b5957da76c43e078fb0a3f7b8826a1070b43c93724a7111583d427303f962dd73d1d3bed778"; + sha512 = "6a06093a377b8ec417edb4183bd19707971d35bd1792ba83cbf7ed801f4ab050f7859f4e47278d39340c25b15ca2506594ab70210d62905f45a764e28adf81d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7e99bde3de39561d63ef5d1a41142c94c39fb2a7d8d7755cc41bdd641733dbf7a4ec672a80d2ef55cf2626ae515def5d87f53eb75188c9e640285802aecdb300"; + sha512 = "2fb808e6938b525e5c5af4fdbc4da7a4191ad8bb5f488d50245662427e4295898a7495b4e94066ea04e4f68a4fca8b09b621b5503d4e51949dcfd682f7bce1b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/hy-AM/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "03d2beef09a95715f257c6ee252aa9f5997196e5a07c10233e885916a3ce916498c28a2febb0422316fbe437699371ff2402de163c4038bc5d4c28fe8aa9c783"; + sha512 = "b17e2ae6e42676ee01016f2e90d73d4e43968224669b1a9c63aef86ebab479bf7d10ba29d6102e38db7317ad4befa3d66eff472905a9372aaa7b1519e2c71189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ia/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "bbe947e8b37dfa3786f7cb7418a0c10d0ac53f3dc4a3556d8122f8b0a4a174c9c192d6ceb66eb004114c205e131ea0d20691861a80a5f339d76077ba99255d42"; + sha512 = "8cbf136b34e180efc01d2dd21bbec2a5802ed0fe3cfe742a3f4760668cb165bfbba009eef26944a186b1ca8b3bd7b2a4d467eb0665be8a5ea0bf7e57bf9c97c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/id/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e7b52633455b8b198a43d869ce853e4b389d6a5c01d2b76b4f1b7b0e1504201cee008e226efe2be952169cf28ecc56ef16fa167de0106e15a590a5b27928d5c3"; + sha512 = "ef9a54d8895242d75b6f0346df227ae3b819a85de4a4c6fd658533fb2e5f32a465374a80e70ab0614c9e833cefebefe44413767ce0295982c062633dda81b466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/is/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d5f838c5e11e92fe217cb0307df38cadfa2a88a06c8e17f40df6b421fa111733ec4d647d0b51b5e2f5beaad53db7a9eb9cec2c44cd10e47c8453afa69e5e8d54"; + sha512 = "ec2e9056cecc69516637d8a8d5da90a199dd4f287f85af19dd6fd8cb4d29cd85802b5c578c44a9fb1aae8f7f3e742ca071a2f09354b41e113f64dcbdf78cd82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/it/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "fe08835cd8f14cc2fc5f2be5b06ce031fbc0e2b5c72554e499f60de1856eb7111338159fcf9b89ae2b3d5366ed69b9f650b4fbad220b397e14d21627b3d0f489"; + sha512 = "1e70e9bfdd3b9346fb8815b1457ae89466c97b22150afd32d60a92c2c51e72ec7e151780398399d4d3a410a3e7d0871b6107018e8ed629476bb6fa23e2cb0c61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ja/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c65c8f19f2fda8ffe69f1d0fb0435202f2ae90aa52a9a2d7f6f1d48a3e5d5f2553746c58dad462aad3141f91e60f1b176e25d63eb00305f6f6022f7c3b30d784"; + sha512 = "83e5d827c447081e073daf51a1c842c42a86ed984dc0961548b04b4353e1384b6bf6dd75f60b0058a31281b51401441bc79c0d0acbac9407af6fd6fb62b08752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ka/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b3be04d82c5005bae51643fb2974d34e2c89194730c2c35cec6c1f8aa093e2372f72ef9b8819b014141722a94b6851e5986e47958871b4d72acf0e4c5326cda7"; + sha512 = "036c2a3ce2342ec50c3c2227f49c4708785ca4b7afaa9324d2708b1653ff09cf97b08be9c7e8ec5cf9713badb0db9ac3b2b1f36fd5e941cc5cff8c8ec9a72f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kab/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "717e6f91898b75ec0c549a750707d2ef7f637128bf3bb5697a90a7728879843a11d66cb28afb7b06abd71bc49d990505ac4f41d64208a081b17d2f06791cdb16"; + sha512 = "fced42ab596fa0eed255e895a115fc117acaeed0c32204c9625ad37fba62b64f9199a97bd0794d5d91c432776abbf533cac651ab6156c5e7d1d34998ed97d760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "bc686871cb2105172700cd94c2c7804a1737e2ea7dbc951ace99e202785b28e952600a3ec73b3319562ce3975c3c9ce24535a6501107ca87fd4cd7347d681eb1"; + sha512 = "89c23113f22f4a16977c91bd5728514b31bdc5ef8c75c7946caba06c7db64a7c1dcbbaea194addccc203365b91d284066f5a68be585873a1d05aad176cd9f3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/km/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "59b63ffea55056ab7b6b4aee8b394c3ffcd00ab9bbbc46167378da2de8abe81c4890d6ceb8f7317c9a4bbd7c81a644e21cfa3f0641acc0895a8e04c027e1f1cd"; + sha512 = "2b97795dd8ca4ce7d934df392c6863ae7a1824b63e8c8a97ea923d0b7324a1feb42c39cf259b83302240e7ab2f0fc84ec65aa5b72ef36ff98e9316a85eeb348c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/kn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "97430540beb955cd74b0e47c1c0279f0cbda9543e8b20f1864adb569147fa2bdf52f8b09bad64d7d3f441915197c75817cf54ffee8f8efbc75cd7a19a0189628"; + sha512 = "b53454c825088debd764988e3217052039ebb516b1e9df4a06d411d4b69270303a8617fc83eddfd48064dd35f9712369f5cef2e12e4c01e35da20aaa9f53ab5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ko/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "5f50c47d091e096e0f493710726c6b38c5a0abbb819c90487127a58362de97014704feae87bdae27772a2cfc8dd2ca67b91421fb420b23ed89fedbe0d96d8243"; + sha512 = "5f40c6f0cab40af75c473e4579510847ffc69b1364af264ab90c9cab97872d685dd62d57839ded440dd34fc6b431c668fdb927d9a58c76f2540239c490bbf465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lij/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "eebfda03bb276f2b0b35081f45c9d5a8de533ad38f76767225af6aabb4b5324ddf8713e82e5085bbd1a70ad39099cddfb6e33d06e26d0357cd73154e0bc557ca"; + sha512 = "772d20d98fe64cae50ac856e2a0d085cc823cd90e8d4824ba51106d473ee3eb530cc49e8e77960ab5585439b9d82bb809ff1c899b3984274525d0cf0f07c6769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lt/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e16d392173019779498a44831d8aa9cd0170953592e225233104f5296f6189892692ede6b72511ec256a6254f4a6fd6e5b2f609f16fe64e6ac812ac4e37f4906"; + sha512 = "62c55ce5dfbfb14124b24e7462b18e61a7a4e6b5afb2d5da3c79ea9069b3875cbf71c2d9d28f499630ab4c1603bdb0d71a90d30c39beee17c70f4de5931324df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/lv/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "08554205118cc0aab0c353fb332b9c9e3708be8839ad89fd643af34a036904b43d5dedf9739e560f7497d0db133f09301562d15fbb49b59cd86ad6b9795658ae"; + sha512 = "d01e28e410b7325b2710c04127666fd69e047ff78046b518d3000271a89d9536ece6ec365248bd3a925e13078ba0b750b469a082b7273bbb02356c3318c46c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mai/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e0bbeb51d8f2d5ba1ee8385ba8445c1a3608f635b916fb8619151a9fbb12b0132a805a2de39c4eebd4ad217c150ef4382e049f4af903ca2c5ea05cb45112059a"; + sha512 = "501a76a99b28dd3d33c1023c95dd1203f321e9ea82a789f56c27fb63ac2b0dc1c4a758535b81cd38fa2a6f9234f5a854899c5c9af70b6afe0db0011d1ed144f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e12cd61155b9bffa83b30c3d26606b4b9731a51ef24a50388bc8893595a31f7fee1f8cb0d3d4b5d41568825413e8a8a72fae474936e053776b3820a1b7ba24e2"; + sha512 = "734804d2b15cdb34bfb1e3e51d3b4475d0b23ddcb0bc7e5de536c6098e9f5c2debcc53bcaf9ac76bfe49522ceb345c44d45721d4440b3763054c2e0e195ce68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ml/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "019a00e838f66e2d2171be66c48bba8e3fedbc6b1f0ab71d5fee7657213b1042cc3160619e997334275aa77625a7cb47a8d10448401ef5023752f6d4904d06eb"; + sha512 = "97eaeb4382199859ee8c8d5f92322bc30eac9aecbea4a00fdebb63ec93172be9225d7269b99d7284edb93bd2b98ed6542cda6e5d65b45f97044c1a117cba53ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/mr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f68f2c27e8140742a7630b1b45634877e54cb44f72f7b6e3db596583b89669b98cf9196ca7b9e50b37f6e44b5ac59112b568020a700f7bed3b98684e47c913b8"; + sha512 = "1d1677c48b3d829673fb5140891d1b52ac9b9f075b2348c527c5e364d0a3fcb6eb5cae2c0fb255a834e7d94bcb7af03b928151ad397a1fec13d629a2cf37d44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ms/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "d03a130089b7e07e6e793b9da023a3917b6766d8b6a60176c9dc78752fd0c7d6dc655bfca770a624d4554ab472a321f124239dc160b40c7f6909fb78b580275c"; + sha512 = "70524b569d00964c9773560996972a6f96079e749389849ae6615a90f55ebe458d0d857a1ea7df89b51d39b5cd8e0bfd65bec6b98ba5500419c8e17e269713fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/my/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6fa7d8c3f771b84607b84c6cca74264d1bd7ffdf504fc8e1d58806f964d604de3782244281f18d6ec7a1a90555b195319dd42a9782273d3dde633dd405298a9d"; + sha512 = "19fb98e2f9622ee33d828df12b2f2ed035abc7c66b8d8c4cc5bcb5d985ebc0a7a42d5d793b102e247da395d8257f9070f3896531e507d50c21575b3287792f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nb-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c7b21db1bfe32285bdd51af80b48b6b96da5066f65c0417470f091a26916512b0312b7d7924f84f29b06184de974cf485a10565f9556f872f7abea02b59e35d5"; + sha512 = "a5073203319b7e778975c86dda8930fc5f7676b1cd124d461ae0d01d9fd7290a8a87f2303bdb2ceac78eb562955b06eaa86a4111098a241513023cd005cc450c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ne-NP/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b1a3a6c26ae756c422d3f09eebd243a228c03690e5eb2316dec4c90b9e08d444ceed95bb39e794a0aa9ec038f2d6c5fefa5b11a4e1f3c12ad558624c4074f68c"; + sha512 = "432b527c41424d34b61bc9ea3c691349397efbf26fd5b9ff85b1e1701d768be7f5f61f621d1f920a696579f5e4d0dacc0e3f91642e2c24b725cb0be16e0f4283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3fb56ee294992191b4fd1a09e2bc4e8905708f7402f25a8fcc6321b2d3771ec3e46344610e51faa7ebfcc127d3ae92937fb01184b596f46bdc1b9d32be190f85"; + sha512 = "27bf6e9aa084cf7ff041c0d4d9e380f9becf909309317bfc2fb8f99af81a849975575f8e12c83b4abcf0b1706987f29ad313b352f5bee7a73d76b3c8ce5eb95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/nn-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4ea0e6a353deec6cdc17331d8f4a7291fe189bb6e1623c1e11e59d0e4590b7cc6d29e289249acaa43b5e7fd2613de2441b69bf94a957400623ecc4b876cbefb9"; + sha512 = "62a187309f01f6d0d7c2b89ae77fac381d14d91ebc864990f897ffdc45d068a7d51a5af3371e4319c0719dbf126f25ee4445a8cf30badf02c89a8a756c44f83f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/oc/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "6b3803eb5fc2c73093457fe2626baae476cb5af514d4f3ae7fd640ff70e5c1deb7c25a54994afe0bd07041d39f397875ef772927035c907c171e3d70f0c20d33"; + sha512 = "a5d2fa30167f19b9a7d6f05ddc2e374cbf9918da0eb2d12a121c442f48106ac369133d42bf9ad4de83379c315d0e4ee4820365d43191563da07e3908937bee01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/or/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "720e95e295d1c9238308bdb75f06470ec82538a0396eb8be3949ea6421502b17837501266c729655ddc884f56688423890db504f809c207501c60ec31a3fa7cf"; + sha512 = "9aa6f12da9a63cd135b7196fcd579b2115a6a3d0fd7dbcd3896d5c76caa021f64e5622ccc298bada1bbf1eeb78dd5905efc79e779c4e46ce96acda18b0f54576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pa-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7caf36cf6ffc5106762607b4d8f37e911af9d1f98de6e32adaf84888696c4836a3f812c0c74dd89f1a1badbc0a74e1d723a82c9459ac5e360626f01a0b65b0c7"; + sha512 = "c90b483004ea2ebd3da65f4b8832990894cd20230aba256ce01b38148378831a7950ad9366ce420d961a72c4bca682bbb5f9ceb027021cb7527530d7260a7e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "81d5e92eb1f04df384a79a31bbbcd3fdd3f950547d3560bfabd2f98646de7626a94d9edd6a7286cb339cb08e88f4f03826695153c9b97f8778080a4d12148d07"; + sha512 = "35b67fe4b6a526256e0c7b0669a99409064dc7e2f8a1e7d46cf71751b6c2074207a592e8fe263ec3634601a793f56d76b09de8233b94fa410ea391d72db5174f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pt-BR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b368920ef21571a92b72c6d79cd5d8feb263eef62d73d18ea57d40ed654d03c4d3a45e8e9b966f4962be840b97016813f503873653620ff829c21e312ed9f2a2"; + sha512 = "ef30ece766447105ac86da1e324c7a9818ebf7c0a5ea93a31f20ee0e22e3663593824be9db040f02f424cdb6e9ff4e4bb121a57505b0019a0d7579a12ef7fc0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/pt-PT/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5ea7f257217d1c5566013c867e6f405dd9d2f407ed1e770d228108df9e21b1895865dd8a92e39d1dec402369e13373d812bc0a37af85014c55a2742e2e6402a8"; + sha512 = "b6a571f6c019522d49824554881684f38fdd5df7c518daa35950fdfb7f481ab8ac03d90ce89909e4c6a9112c8b965ce321ece7e317d176394f700c4e0d24adc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/rm/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "188cc208d61eabb29e5251c3c4f4684887efe9a3ac87a76f3107cf2059fe9b0e9525dfe4526793741bffc3f9a584fdc1953310d53acaeb3e2529d0e462cd7393"; + sha512 = "d72c24d58c415f02b85b9312709050cdbd975f0febae57e39db118d88741c5691f82412e6607cf8c440295ef2c55805512d60a05013ba3020afb4c6723c9419b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ro/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c8213f5c7afd67bc29d549767dbce002becc99e24e4ce0752efd1134e5a217d819a72d00c5b2ff83726e2a31defce2ef9218cc7e4d8e0d7472e898670cc4bb64"; + sha512 = "e881440fceaabe3bac8b038e3bd4569019c1f85a27586f4b4e16a7b2d2f55f47f520b317ab5e1df238ad41529f00b004b65b104ffdd4ca6055cb07e2de439801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ru/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "071ae0f78c8b8ee711183fbfbaa1d30e085006533d5ed29ed5fdbfd3ff3ec828d5203da0e1b0ee5246ab1ae7810e7ceb68d1431ede48c885e8cbba8fbd4e9b46"; + sha512 = "777d3c168580d3686f9b58fa6ce83b3941c3fcfd17eaa84ec31193192019c76345ffa2b416d081e974f050c14d485eaa5862245bb4464c239290c27bf9cf8299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/si/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1ff0dee05b433548db1b894fc8aa83864139dbe82576cbdd97340500270465a29c35c76fa5e757e1b9ddb4cb79bed51db31897970d3206f945d43a6053a7e761"; + sha512 = "aee6dc0e73a06f3aa2cc7ede2890cee4a72d3711510eef89420cc6cdc09380e30706ca3706b14823fa7c7b53d57f7257aa5f5692bf49834178322015b828a969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "37e18481fe4963ebb4beaa8d5c7826440df005661e59e4f7ef54ce93d50021e6c76d31a3d7e7d7e28c7802fda00d36b4db3913f925413ac5e3515eacefa330b8"; + sha512 = "6063a5ef564f2cc7b54f89002a67a2e8488a6b62051a61e545c43ea123c95d3a51fde6eef2165a983266423af421d1c915bcb5a80c63aa4bd16a27eb59c27245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "cdc077256eadff717b81b554a58795b8f86fdec1401003d8d18f33dfdbe7f9f8b7feab2e1c2c6ce0864ffa53f0090639201d1982cb14b278b7133552a5664ca2"; + sha512 = "76fe24bb152e4d89e9d4a4409bee5c2555e42ef2dc49beae13cf9f26b4ab5c3ac2d7d8bea9d1d257f2a7ac4e68e520f9e7c00529aef46dfc7436cc9de0b6eedf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/son/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "ed35fdf2e0a90a8fb8db4f6809f0460d8d7be384d0c67523ccce6d666f7c2bf94a44890a96922906a0c3743fa35e78ae04d811d8d50c559fff44ba7ea03bb5bb"; + sha512 = "f641b6ac0915678b88e18d8a4d4ba49f9a303252024ffbc21641ca5c337c8d3d4317aefc889e9ee9c647fe51a10c3755146d1b859955efcce2ea2d2f5e9e4a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sq/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "265b3a88e73f4fdabc2bb1dd3c43d4430194a6238f3cc8e9da4726a916794b20a03f0af1d350a3c74e1befd33a28f2b93eb2bc2c4dc8ccaf5759b7ed77012ba0"; + sha512 = "773904cae848afc33b0b88fa835db0e0ccb62476ae71628cf5edc1190b70edfb2e91fa6583ea473c6632b8809f485e34bc55a5a86f61380cdba5ea4e99880ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a2da5dd3bcec2df69585ea4d74a6149e1fc95a6d121f9fc4d32af8864c01aee120b2ed4b60babdcc97839a72703334e5f053b4eca1471f5cf068d7cc9c7e3f42"; + sha512 = "dbc995e9a6c690d66e6cecea3012ba6c0825124bcd1f49073ad0c70e740c7bcf7b07a565360a881fa31d13988dc88a7e2038e13f229894d532ba44d0f7f36f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/sv-SE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "33c9ce9ff4639c4fa6a13c14122b0c6fb028d7a63c217f63a8455a775b099318df8d938cd3a3f6f3b769f63a8c10163f98d9743706bb147ce0edc5d51f266e75"; + sha512 = "94664f3b8a5090c71d7bf5d66534567af5e88aaefb1b96bfe68398c1726dfd3d139f1b106f1fe743d480c857828bba7877c0d77d3b1a582e9f39762e2f2600e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ta/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "bcd817de0f734d5d493bee08e754b6caf9868a828627e18eed7ba933be54a339d9c819a107182f578c6449f6161805f98d50d14b4b6341a0868c3a7eb817bd17"; + sha512 = "05f938e3f3d380e991ea61b774c0afa60681cd90e193dcf3ba99c2d8f783c265f6094b0a3f088639ab2b060b07a9d1f90396b65cd9bfa2480dcd366f3f05a2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/te/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b3018073b1432b3b4ace7ea0214a8a354104bd5567597743a9317d91ca77defb3b25ddaa46b7fcad81291b53165e3bb47a6e95cfbbf6bb9171da5e4bb0a9efd2"; + sha512 = "48aab49101dceacc974792ba8b355bacd40569a6571c9e7fedb72574b09b019ae3e78fb8ffaf1f7809f121e7cad7ff581b5555847bfa8067cd7441f131d9b973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/th/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2f8fd5f93e3e19495182d7490cdbed7999603205b6f0312ef387c27d735e1374dec9e3c947f30ce5a21a5223284f31b4ce7f2b69432456a7d029f4de59367b25"; + sha512 = "1d6dac041ffabef622b1e71b1473a8acade169f567e98906795c14146f8ec800ae4ec5e5a4ef06a800dbc18a41400dbea6892a9a0cfc902d9d7348a201ae3548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/tr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b3962d7eba1a25c150ab87d5278c4b7941e420c12e0ab252f0ea811d37575e16d6964bcc958d50a1b1b99f82cdf1c32bae015499e686bf8f04bac6b0323dabfc"; + sha512 = "0f6e4854a5f6a9540d78e14090b4204bca5de037fa15077bc6417bc422f6f7cac6f0655b61f9062be6545515a1eb38a54ef5e7d0fe347426424b48686d6928bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/uk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8eceb4fe4244e38ae3ffe4a42d5fd12c3d6c3ee654584013d1c903958a05d228f07d3fb83c601de4b9a701c6e9bfef2ae9cdccf7df753128afa9804840311461"; + sha512 = "2288d8d209a6392646f10f0fdd2229b281eca6ed9e830ef4102127b74f9f314b9f3d67f03d68aea57c8c99814e46c87a2c27c6d1ce5b31e43e427ade1ea7535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/ur/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5aba832961f49f96c5e3aa189d13f1cd4b5abb6aa0d253be110f0bab59ea1bd819a2e72528608f35f03f28437ba9423a12780b1da5af1aaaf7a752d04014a4da"; + sha512 = "a1cdd10df63e2306a0907686de28066c7c5c6241dc594350eea456a9684a288be20bb1625aa7017e320d3f5bdc961d8f0945220126448c54ee57699e67f5aac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/uz/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "cd26c9e56f37be7c93f754aaf40ba3f29471a0017b52c422001d556710a011d84c67af411dafff61a26ba8b1388ba4811bd8954064df4331d55a1d7f775cb4ce"; + sha512 = "70905785d613426e585ef75989f90d4ead06f267e49a668c986df0bca93ca5bc409cd1f62d1b4b23de0659c18155075e05aca5122fd2ca7d22c748f94b34dfc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/vi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "4104e9b2ab3f4132834c9ca816ea9e2b4c7d08fa90efec940a1701358674919c700f6bc6862006b6b4d830bc086db0a4b1aef738801854c505f59ec9a10de38b"; + sha512 = "9ff2e67f2be33356054615abe599acb7d192f6fa7525ff20307818c7cef25cef649ef7f26c231d75afcb7e0babdbf4df9ed4f56d5b749a884a0eb17335bc1919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/xh/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7fe85c144626b904a0daebb6db79c2c2c66d11fec892de941584c6a93f8112673a6c448f4e77c215451332e31e78a9bedb4e83eaead4f34b7b2ab247662fd77c"; + sha512 = "39b0d603092198f6b06fb0fceb9de7f5787bcb24d3f8129888b00ad5b22e171c396c679a945dae43e8088a662ef2abb2aa94c2cba0bd1037a7f4f5dd3ca2df1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/zh-CN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b669904183e607e4eef3cbaa96749924771d8e67ee142b5ce0d855c11a0e24921711ee42382993ae2b8dfc2978b7bdc84a4cb934122286e93b94f762cd888924"; + sha512 = "f0ae1486ea7155521095dbb2ed764365cd01bca16e7a9520810950699e3a6d0b191488c929a2b9980783976b90e0df7c5999f1df8b67b8f851e133fb93dc600d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-x86_64/zh-TW/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "111194874160ec7bf004dba3a74acd726aa3b0d464a1ecb2b031f1424a56d887c718739633e830a45f9f4c11be693ecbcb3b9fac716c1d78a09d83af32e09048"; + sha512 = "7d970407678c320e731de0a4f00438ad7faad0dbc375e0eb12c3956a543279ef379b8f1e009b3f866680ee2122f6383da232f2bd1bf06ababed3ba04e453d065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ach/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "42080230edb95635ee3261ea3776957dd5dc5ab9ad80146e4c5fe5f288aa1a7910747738900a067960bf10b1cb37f2150c4048540364bb3933d1f95478ffcf82"; + sha512 = "04da51cb7580a716ce70f46ed48b6332342a7c54548280d2c2a82bcac01534bf6ec638bf6090f61794b78fc3a1445dec98fbb420103f2b942314d9aa3db85263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/af/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ef31f65054f4e970217e2e6c7d507a74e94a44ebba7c11b43fb86ed0ef6b85589a7d4e5acbb186445c0bc1dff05d67b598de0edd06e0b80d263bdcd200992e9d"; + sha512 = "1acf9dfca2cb878c4fc3ee1ca56a87daac9248a42295d0d0ae11e829768dc4dec8655fcaf4c0843fc916e58927a417b9ccca4ee8886ac5238c37cfdebf8d4608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/an/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c4302fa1bc3b635a960d095eeff62055b1148b433cc9839b54daab9162e87a5f59ca47b091ef40ca6eeb78102e8e9df2e90b2157a05ae5819044640648b4421e"; + sha512 = "81897f7babf614ce6951f402104bd829e770fe88f6f64335181fc4283e73c6c01c45d4078b70a933525a20d8ab1f4c3b3b23eb9fad5304f0b35513e43b79d15a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ar/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fb98616ad769dbf08403007712b0230379159b0f2c23e6419597c5329aa856f04060f75fdf465ba4a9874d19c41305eb88acbc7381269c95bca33391754d4195"; + sha512 = "67beeb695048bb70f2e613a4d08e00d2d5ea5d7748e6c8606ac7ead43a9d2f870e72c3ca1dbbc3c7244068ec29a916354ead91391d3cc77b1bee5184c25bd75b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/as/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "628d9a2bed4f46e80e6347862730314a5e4e776d8a40835675435a5645f416b8efb05841a291d49392a75f93a27122448db5bb87e1e5f02ad7cef0ebbcb7f2dd"; + sha512 = "6d39b86898ea8169d47f801058874a07a32c2da59d59c0f101fa020b4c118be720fc221cfb59fbe124aa278edd49c828142616b714be0053b1d74beb8dd88b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ast/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c8d108583d9e5308d5ad351c2cb5db989d19a7386a2fc9c0ae334ca42c1254c1cd0770271c2eadb1dfbf8f2fa214e3d9a62ff48e1f02acbc10ce9b37120cc91b"; + sha512 = "552d79448ad366770d1f759793f1f792265d1630ecadd87a011eae75f2a17243a1636ddf483afc10e1a59874f1466e8a9bcce5b2b8e31f2ec72be831c9e2d7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/az/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e2a5dea9e009fa90f5ff50ef32db243837df739a4adf4e91dbcff516011372d80c045e3c399f44cb155212d7221f1ae2c9dd8ce3633c62aa6b4756e6e2bcb32f"; + sha512 = "16eaf530b848b2291fe2ee03489b9414d538693024ee12be223dfca2980ef3536d560b698ff8f99744bf6101138fd1303ffd42002d2272b2dc5fbc5f97dd4138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/be/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1c3f4a486b72382c23d3c515b2b0fc4cc61ae9567122d1346c4aa519cde4ddde7e0fe14f501f854b54731e78ed25de4860fef494932216c912a9e5ecfb9d45c1"; + sha512 = "47565829a3f5859fe1e640263d4c46e2584666fd5e388c4e831b6411c5af0fadbf4e69c14c730ff2adeb14d732ad71031a2f903e86a1c0ebc26eee3126739ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bg/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4f06b5db528b458fa7ec45220fec6304b52b2fd585f036c5f61a96bcc97d2d4974227c492c453e944a2e359dab438235122e2a9abfe6246d58fed2c253549807"; + sha512 = "5ba29e660effe660301e9c9f009e3c88c12aca3b79553f8480dc01f99f5858cd838fa9a7fbd0105070f5186a10476719c753514f0005957fe774d845e182801a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bn-BD/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "afe70d03b7df384916aaa9e43f8d7776b04ed3e9af0ae5910ae476d10e340ed5a12c705048a17c428d6ee9b03bbd76e4f4aa6f8f0ee860742df50ef9f6668e2f"; + sha512 = "ad81b92e79e754b1d88a2292643699d6b66c34259ba66f460017cdfd4739326ef97610ab2be3168d0db88cbd1885a2161f708e2c1b889e5b5f1680ab2ff4a1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bn-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "f22dd9777c64b8eea423bc3d2f44366493612f48b973f37d063259e2c06772fd3e8dfb72f78d96adcacf4865c86ba1b4a2600869517e62d20995c1ad19657819"; + sha512 = "960b40181a3f4a31844a7b1d63b2211c296b1337d4c072f259e80a368fc5b6554808683eac530068e0b0a155f72292d6a4ebb717d3693e367142841fe325a827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/br/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8e917aad4e19c063f43e68d184bb55cf87cd076dc09a0df5339a8d917369e436474f773c5340684a8968a605beae3232efaf8a8bd7b9d22b19997f7c4e437395"; + sha512 = "4e1fb7c0155bf06af57abf0dcd10989199063030378ef6864ff5f4cb7410fa1af780c038dabdf3ff6fee5a26aa27592dfb01911e353dd300faae04a8782e4408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/bs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e3c7de9f737959d8810f4dbd20739a253a020cc31e4cf8129652e6b7e592f3d20e0484d189e8422e8fcda934773391b2d4ed07d2aa9e041e0a93eaaef6c31b92"; + sha512 = "7af74277d78647ff61ad05aaafd1d9cec295f63198bebab083c5bd8817f3c00de6f5ff49d7548fe8b6d2d7e06663255864e6bd6852ee769c465577217366d074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ca/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7d0756d779432b6e697d974fadf7a8dcfabcaae00381d032d815c05a04aae6d5bafecdb007772ee35eae9365664f11bc92aa67148e6c6e10e4c21c4f4a7e22a1"; + sha512 = "fa050db4fea78126bab3c2ec2db4514f826a22a98e2986c8a779c933641bbb722b223e76b6d7b533cc43f5186a8c978af34603ae4ba1987ee1fe383004079232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cak/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "63bc5677a50241ca97c81b4e899e71d7ac2f6045653d53fb245c676976dfa4b76898e362b10dd9a4ef1e688ac1c938cf822b1d8ae2df6849b607497f9001563f"; + sha512 = "c69d394ef30975c4e546978dc9e64266236727bc1703c5224e721b12476d73e1455197380dca29e4d71b741116a29ecd441423422d398004cade9b009deecb7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cs/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "2cb381c40cae5f09879f10a8482bc9c5cd9af07e2fe965638aed7bb4ba2ebbefc2fab97aee4504020647fb60f9468fb1a955bffce2baa0b9579970fca6c30d51"; + sha512 = "b5d4a689fe6b475fc87083ef7be7a31bac3569063baa160b0c6ab8847a12807f8a1e9c3e6d0c2c3b49ba74f3b93514211c084a99b9406bee369d0bbb78678b71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/cy/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "091e659f18372351346a20eadd9368f63cbca0fc7ae3b235e924ebb9f3ff7616e8c3b2d89595101174c37ea0a4c1b6ea5279b300126981274524cd19695270f3"; + sha512 = "baffd6932c5fef0b4e9a652ff4c892be693abecdaa0757d8ed1ebf5aaccfab34d0856a8a156db252892b8721093302a03dda65ec510837cb31713c3a803a11cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/da/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "344bf81550e658e8ece8b915edc699ef9c59567f1bd202993c1a038c4e37c34b1029d399f1fe34d0bfdc333c464547f32c8fdfd90187c6c3f0e2ad25d3227446"; + sha512 = "bc4a2a7eec60f6d4ef8436538ff4067a34fa6ead9d75b4f88b24ebb6d3e7712facad4386423b3c2dcef6ae183891bc71d0e9062421fe5ce7725ff564ac042b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/de/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8d1e587498a304639ff876d764da49bae0d58746ccbc60964a708d6987381a4b6150ffb8526f6bc053b7a4fe5495cf0a898628bf6f45ed62f6360458a3ed462f"; + sha512 = "470d8758e2407781308814bb581b68ef6d46bd918c2a7e2eb2cade73012c79ae01796fc2df8848ce92ffc3953d180a0d742d1da315025190d1795e450004cef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/dsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "bea2f50bb8d6e2483710bea0746bb746c5c38fd43a48f33509a0ee1c823691d7aeb67f6f594dd3ba0ad3fc684fcc21a3ee375f6a9bdd7ee9d20e08d6f4ab5e17"; + sha512 = "14f9beced9df9de025550b06a9a418e4d37b8978025068570b955ab80dc1a5a87e43f93b92e145287668082024eaef91916232ec1736070af6e415bfad9f6c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/el/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "bb9419efdcf6b7d7cf7a05c352ef386404dc1c1b096f9485d8b7f2ec9d2e893ef4250f01939423e4f69c2fb4a3b95abdeaa2072e2e73467cd6fb7f499bca5a85"; + sha512 = "a52072b717f8d557fee3e4536cbfa436ccc87fa9568837b58494ffa6f2b3d153ee43378ac871f99b7afe62ec6adb831805ac7e1348b2b395360b79d94042b35e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-CA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "77f186155dcfe94ae672e48f5fa56e2fd96eab65af5ef745b68282aa03a399c038cd8f9f6d26f672e85a007c13c29258a10456203bc46a117188dc04e965be29"; + sha512 = "71cadf96c97c236d0c9d4bc8886368ea5a9220f5fcd63a4e54ccea90de606391037bf87e4fb8deab4ff3043c2a0c8d641ade107f60ac5e7793ef1e85c031c525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-GB/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7d6520ad23eaf42148d5fe297f4d59d88e33151cbc1395aa212b2486712e07b90c6662d530221537375421daac1392637b97a81726277687443fae41b07395cf"; + sha512 = "0b7a55f1172239857ddc9d75a14061e7b5feb5855fe8d5e07088300f64a1e4c0c1521d1db5a8b7b05837223d1ab43ec5730d8e706953a14c9fd13ec3c73020a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-US/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bb8d7fb03a95d1eee6f7f1861014b727995ce4594095e0cfca224902645c2ac1acc853fb2844584745cb6aba60d7e9cc99073c8c365b0787059cd385c18b6b69"; + sha512 = "1622748e3b656c8703ebb276f7a8bef4b2f6a593590eef50bf0e9722466d49a33ea31be107e3879073dd7b2c4e7ee3e2eedfa89b3e723108ced6a34ec3007868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/en-ZA/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4696a33cf8a1de84da0df195b3b79bef21046fb3bcfab7a2fa6e6d30e047e6217f0375c4b4540f32815ac02feef89f5ecf4df87e0324b9fcd79817c8a4762325"; + sha512 = "d5186d4172f636ecc4c39c60d32c80592deffbbcbdbe518e88eb67d3c56d8095ba440ee82af3efe138e78d3ae40b8367f5281fcf2900b913557734978f741354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/eo/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3a37a36daef69c66927bfd572ff64943ed5c6eb0e76cedc730d408bafae22d118c60dc1132238f369363d7c3ca259f8421615f5596df1fc11a5fe08c447f04ea"; + sha512 = "e0686beaaeb880be30604a8a5ab0acc541df1020dc2de3757d5fe5e43a1ad6a7de603d5c137569cb42f5dd1f2845c75392cd276815512231116991a5e54f1af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-AR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a5673b3d24446a486c1e301afb0138ce754aa56c28117cab53b21f70203f75880aa2e4e5f5e7dbe3d511f5f730a9c754556dcc657063fd762e8611439bc5e0d4"; + sha512 = "5816049b91462845cbc4eed891aed168836e86ac2935bfb8d27485de30a7dacf83bd765016b528465b7aa559dda30034ef2195a98756aa5b17a25b96906b4573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-CL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "a5e152cbee8a6c96e3c4926bcb62db406f1387b32a98987b2c7d94a56f044b0e453c956e4b6f5245221b2e4e7325fdc1521276112014d2022ebc574524cce597"; + sha512 = "cf1b7bdb35d5bc8d30c805c98e3a0843f714cdc2f79ef8478277356032bf8eaa4c013901f46662712b4b628d62e2f6b1e9520e868f39badcb0dfa56581862699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-ES/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "02b8006faee84aef78de4c10d7ed66d949094a20ab1d6ed22ff6d305a9052dc47779dd8421ac414fa945d13bce1f2764a549fd2804c4069ec980e9b20dfa9c9e"; + sha512 = "ff873d670ce9b20b8ff63bb8727a338b3bc0818f0568675f1a3fc6bda13e8f4097d1bdcf6cbaf651ca89163c8676f9492103bab682a8f9956b43c2686a51df13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/es-MX/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "16060be7efb5aa24fab444f5a0bf2e108af054e867cd1414e85519361046058d3054a353add6f28091ba1755e3fcad063cfef287cf199f4c9b7f0b4b56304848"; + sha512 = "253c140c390c3107ce16a9c2f73c41a71e4b080eabd049a5c1f65c8fe895bd3ec669eb653c8bad55b00bd65e97108d85be18e1edd1ba7457374fdc0b9d82d616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/et/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d594fc3d2096ffe94c4688a9d987f47cb439c8c177155658eab4544b89b33f7408b4fef9eb47bed9de3df97fffe840f3db7f030cbe144aeddea3f13bafa06dfa"; + sha512 = "cec92b0815fd530f3dbbf195104c6699e4d078a4a35353cfce2425050bf62811b093e4276052622eefb60d4f670fdef28919f8d83e273a27c7c9cd6b9725f064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/eu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "10cf4c333b1abffcc213236440c498a06bfab334526b38476ec0ce98417ff31f1d1cc7ffcce292faf00a86d60fe17a8d1a09db9df3dc3158455e070efcca7ea4"; + sha512 = "6cf19489fccc70da26bb2b28f8d036a402214ee785e082e2be7b065f8420fd1057e3caeacb42436955a84467228fbcf2cbc62f871fbec959a4461d9555ee4fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fa/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1bda36454255375e2927596d9ba3f884728e3c47b51334f34e406ef28b15a799cb4bb86432c1e0d05fc4acb7cb8d812788a0b48cdc55d7513a7464daf2e3a6a5"; + sha512 = "5d540a7f403ec92a884656279cd4e7bcf7bcca72f25246894295f2f0d7271b756b6851d68d925f1853e16be14c4f9607b2284a642f4438725384a2ed18e8def0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ff/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "763e2f24bfe6800eb35b27baa22a2827264b37fda2ed7274f488fb92d086f5f52f4978d958fc74f38dfae5e4ca2a269cbcdc42c96f59916f95423d63d2eabc84"; + sha512 = "65b32a30ab5bbe626cbd1276eb0fe4bffb60ac5651ca6437b0887a0bcbbf5201aebc74c3a80c92baa1a56e60a6852b32fe7ec7228de99e9296deea976c6c238b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "96908ebb5053927f9cc032c673821d8d8f24968b26cde657fb0cac264835c66ff16417bd4149dff58e5ce577c57207f1fcb113d9e8a6495cfa1f0608a8cf7783"; + sha512 = "00515a094f79ef0817bc3bc392ab9d4effabd68748d0de0f6c0cb14e7996b97fa48df200e1444ccfc2810c80252ceb22b6e87037efc476dc58330f9af712bb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "43db8b673b6526e9178f5d50c641c9da5e7881ed6d3d181bc1440d314018afb9821c8149daf893ca7108724acf2405968309d2b91407adab87ad3968167a4e18"; + sha512 = "2a1f2b26f3f8031e2da3778e375b889793bcd87cc2e21b3f26f16a3aa2f4043225472e9be3c8e914578a59277f7bf42c929a2f0d5475041eeebbd8d722a67c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/fy-NL/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c79953daae0720d61be1a616ba72f70b38f772c45ff0ac8043c45dcc46bae939df0270534c394625eadf5834d9cbf5b80787cb3b6eeef227b8812eb6a303cee3"; + sha512 = "669f1c45e9382b81aac5c612fc111c9be716e662f0a87c7b0c9f536277d010203438c09ecaeba58c87cb91f979427ce389c5de9d55adab8366d36273a4926ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ga-IE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e7dbd35bcffcbfe39500fa583f1d3a80a51df1344c69086beee74aee9c1bc33c72c7667d550d0edfc190d96212511e95c17eb276aa29e28bbe9fff3cdd3cea90"; + sha512 = "c6977760950f0121cfc61e7d130f89965df9cb6d319389811bfc08b6acbce34eb6d644b3926f4b2fe4fcc735aad1a1be447dad8a160a85bc543d95d2db3d2b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gd/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4c11c6ccc84b3323f0c06e98ef16d0b7689b1032ab973ad9f9bc9ed7dfe8b295c0d1d9ea3ceeba5ef265ccfb84672b9f8603841563699639355508e222931bdc"; + sha512 = "cd1d2369a9609969f52d08012bab63ff82a795438ddaeca2c17f0df69a713df209b455eba32112cd571769f0a7a8cf8f8eab718a597b5f795f05b6867e88a382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b9168e7a2331d1ea1655822b2e52353f21ade6a51cbec4a174ea7e4bdc4082dda00a582152068ce89c4c15f71dcdc6c63d6bf2b0b777e0a645d1e80ad0d3bcaa"; + sha512 = "a0a3bce700746a50651a982ac7dfbdbaf192f10f0e443974ae088c9bcf0e2fe6eb96d3c406138bb236512bd6b1460b0e9005ed370f38520d4f618d090e58201e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5894625324cc483e1d258b35d95ea3d3edaf3a8fe3ac934ebcacfbf2dff5c133e25c1d65b603e8738138d982417414abf8abe465d8b393bc49f0f635aa7e59d3"; + sha512 = "d609256292a297f959793c39da5d91ceab2a409abe9a560b47fa51e8856fdef2d1af2bfc6a4b2fe870f4fb8ca175c369e9ad9029df6070b7ca12205b712a6e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/gu-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "605b74d8f95b3b1857e8c6860364d7446eafc1fb02477e4a6dbb47c6e911f0dec289c51015566be9af8856a5ffa966adf306e5190cbcdbbeb48e6a5d36026c18"; + sha512 = "c014f45aa1a46558a67d80b177f8f22a01f250b5658149c64056ffcc2f1f7953f43a0e6eb21b7c8ec5d4e7ce677f6620fd87454a7d65d145a3609e29c7b2dfc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/he/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3adcbe0d6943922125a088dc4d92badbf674adcfde5a38346cf4a1eb45c415cb74612d070e68e7ff1ae35fc92774fdace05f7afd0d3fc49303ef4492dd1fee0a"; + sha512 = "e65683aa8ffd57fe3563c8b7d13087fc473eaf240d1acad36a23be418cbf41a543ad4a2226df16ba65dd3bd6d309fd7cee162b60485c58ff5c4b61a1b2e25b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hi-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34abb67fb1fa3a5913c6a278401678a9d735f18ac1f5264f1d31e5f3cfdee617fb9dc5db864f9c089f481aad890a2fc2b7f133ea563134a246cb40a70771ae28"; + sha512 = "2125df51d6209b702c1445935ed44de5fc13b218e44f199300bbfd1efe51fcfa5123c47063f5e465a542f34f5a8f7643ace65aac433f76a2db9ce17a4a727c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e7a9e8e11c4a9b07f3206421386e53b906f21dbcebef342a7b76fc5f5c800cd0fd188cd5dbc5f0e1956329b749209b4ff268b913c87d79558df2c00726008c85"; + sha512 = "85067ec21e29bf7a055c5a089c829412a703985e0fa699579edad4f4e01a2212d5068212b93455965f469d71b99e374aeb512cbb8f83228b5bf66e392a5c26e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hsb/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "56f23d54131204ad093d256dcd2a81affaec5e8159ecb7d9454b01475bcee32ddaea1951b97c1cf34505fb0d5e1eb36a3316e1171821b0a663aa422fb759612b"; + sha512 = "5eacc1b187016d1d9202fc0755dc5eafded40552ceb34ba6391a15785a720bd13b01b5e451b5fa013d3047e572e460195236c6acd98c041c31e50b5f7ae1c0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hu/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "28b96bd1a025d886bcbac761410454c9a489c801dd11049f0a71e8754d6e7a5adb90046e9ee913356989d07b2c8d60657586259af2f6d6f175babb9e28fb56f5"; + sha512 = "b820778f6ede465d2047c2a8ef6e509983647fc0ce8d829ac38a269fd0c7ce9eba0c9ea6f1ff53debfe934531794e78a71c3c212a716a85c6f3cd866f832a841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/hy-AM/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "983a8fc5331a1f04ba31c9b6712d3c2678435fb6c219e47c370d5555988bbf5c07d8cb30c70c80ad47d429ce75894838fdca839750ffd71131b6fe4f88872182"; + sha512 = "6859c52b6a7265a14feee8c41d969d79c9e347a297dae320e6fd7ed17e8d306dbb4775df49d907003ba2c506c00ce774239cf3afddaeec78bf8d4738af555fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ia/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "03700bb8ff07f85fc2c305104fce031dc0206f3ce771eaabaefa9ddd4e3354ed821a597b4fe7973a333c8fe4e7e90a0189428a8cf2300030a4404e827d0e8953"; + sha512 = "20fcbce5d73e2cdc53f715876d5863725cd2645025ecc468f9b5a9c73aed58676965279834c2ac3daf9fd439fff6952ed398afb356ed210221e6c4cba0803601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/id/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "052266a6047be98b1c7cc5425643677768f9eb50724e6da5fc2810688432641c10b4dc64012313f47ddab8074f40a05e0fb0af204098369f969d342a67f10bb5"; + sha512 = "b7308aec549714ddd570fc0347db65ed8692df6c9ba8a98b01f51671976232c6ab6b3deadfe952a6371b05525a49e480fa34cefae6b11a11a81e0bd8c80e8563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/is/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "fee6a7bc009b857766481d858990d1a454d325de9f70e4096c1f5b026db0e6f75a4c8a829e50499af909aa3a17731e995b2168a876bb197cfa219dae109c1bd2"; + sha512 = "1a4b499fa6a14f2556456a2aca27a636a5396d01f5be9ffd324228c2f7c1a63e200320e33852436187cb3a301a0992b4d4ce52d40dd3b62360bf1aaa572007b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/it/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3cb3a1868f2702cd709f7e8a998b9e81a196bc2d83cce0874b1c32d4f8a0e0552d63141b65f10044ad8899b7892648cf92c0d68a40bcd72af792848bb4fdfb69"; + sha512 = "86bcde5aa926466b1c49c3b0e1fe54b011816a08772582b35b7d35c091809c4db9b8d63630029949172709302e65b4a7ef50a8ef60dcc31fa97696b08d3e7b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ja/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "dd2112c69c33878acc315f12851e1b8db72d3a3edbd7aeb1ff5a5704b95f80a74098eaf54c4b902f4e46f91167a07526c89bbb27e0306599448d3c1e3602ecdc"; + sha512 = "af6b46c0c452f38a66333b022191a37f25d24792bef794a34a1f3f5aeb9ec88aca4f7764e4221b4f05a7148b37214e1f8121058f30ce85ec639d56132e6f85c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ka/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "98468aff4d6eaaef0c3e88a97d577615b6d7f6cf240f3affee71b1aa153873def2f425e120876e942a0d4e6e81a8feeb26316552757890ddf47ed3425309f73d"; + sha512 = "3d7e18abd78e4525803ea45e7d47fd9157c1577179a449aa9224704a467afe4cea4b9c2c25117c05e91c8d4cdf096e5a3d9e478fe0b391695b535df74ad5dfa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kab/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "713c9e9557086a6978882be7e966519bca6831748474d115208e5ce3fee9b1419beda7662a7e7b690c1ed65fc2bcd5063a95b27698d89fe3f81af7d1c8924424"; + sha512 = "a8221b5079837075511af6e94a99a0bf3b30930683956ffc862966f4f3637afe11ad67ded04e98f609b885dee65c2f885daab91d4150585d0199ffc8cc5c9958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6143fa689d862e5be7f7cfba54d1dbfb39b9d0866203811962100bf4e3d4430b0a6fbde27c474c39e0c1c4b95b3b68128f71a3b17171e1ee99b1df2eb6786512"; + sha512 = "720813df718cb5a6a6fa464950857ca262ff6784d53c85debe1e172a992efc9d46092b55bda7a13df46ac453a4c65024c9fcb78d544ac19976afcd4169600e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/km/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "18d64d90a0c7991124efa0d1003cd1e2081b2b0001fd96713221dca3a36ab06b222e4b62192952f15763180ac6b570e866af4fdd8993060e52eb5345f41297df"; + sha512 = "1da32f65cb39f0289f3b68ed645dc6dba1604d0cdafcfbc41ee05af0d9468b49af8f0479d1391150284b0175bcdb5c0386137850afb7f026883597662f2c69d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/kn/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "946aa182fe0cb7c7a7337b75a922111deffcabefb02efc00c4e2131107f167983c4be80a16430dce07dfe8b9fc5ffa144cc12da52bcae7292e9af7b8536c714a"; + sha512 = "997e6a75633829c6a981f647a550a716232f72e385bb02da03e52533a719bf702db2f4d5972237611ce0c6ea320dff071094e8b10f6bcfbf4bf17613257853d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ko/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "849d6004429b3ad8dd767c3ed872e1d17f741f0aa472821f25954d54847ed14075ba54afb7b2e58c40d7f82ba2c83b35d4d57d7ee364002a6b3065cf8ef75f79"; + sha512 = "28bac11d194b40f94ac2e951a5a96fe05d21624d72b1210669c8cf2ca094b3c017388205072b90a8bb94207f9fd9d8beee93b61ca557837ae96a4c567704083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lij/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6dab88f19c36e6f253b6db7acdc049810d4687b90df59d40cd0eedbbd24fcd5639682b665542bbdd63583ca56977f053b87473a86bdd9bb4c0d2b14ad1c35d74"; + sha512 = "c3c3a6ae74919acad82a9c796c36bcda9c25627a173897f67f9270adfe2a6b44ce2f1c3dfe7dd76e05b9bd772df2f88b40c0d6794e4b355bea1e40b83b48688a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lt/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b67e464e3556b1b9703dcaeefc66e0997e6f8758553f29307fbb56a074cd49717dd2badba8b3839a5504ec4d5f39cdb46f48d3916b20e656ffa03f9d0e72dd9a"; + sha512 = "30d70a30c0140e89696e457ea799b5575e3be75ca02954c46158aac96f8b30e94180715608535c8e8c43f09506d218e253a5713463bceb03267004c5b82a6aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/lv/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b63d60992c4879f734075ad2bc149c898ce44dfe8d05fe02c302000694e89e0b195d30901403c618afc8ed842df5f2bdec967d946340176b65a4d79f60205e8a"; + sha512 = "4c089810bef9c3ef475a178d9e64c379ebb2f120f336240e8d004586ddac300050dd46671ee4f3872e0e6ce84cea09438f7035685362f8f66b3c2748194fa61a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mai/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "cd5ecfe1ca8bfb49ba9f7b8686de18e0a9fe7a170dc59213b53748d937331bb4e718f70a45ce988c2b9a057c7d561bedf4e571cf7e45e782648ba7be7b1bb7d1"; + sha512 = "cfe6c4676bbf009256c3cf9e7b4533236ef48404664a27f8767a37b40046eb3f418921f9c5c4789c8db5930dfd940628e026ce1dd8ba4ca245dfdd97fd5f564b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8a0cb09f5b360171fd1533a005837afde6418812511ec9d3a98f8f992b064b5b38c5016cc210ec48c570d777ea3de4476eb8017cc27fa1fe3162e2b226d7bc79"; + sha512 = "bcfef6667c8e7a7fa8695483d8da79c2cee101c6001f24a10ae1d1558422d4f250ab1c1c55370daf5c913742e2655ab826e0302cc91117d134fd124c51b18a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ml/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "7034a93dbacf468c74e52c9d11117f88ceedb081d8d5fbaa75f7270db50ab2b0a27b423c7910c5d12e8c8e5458649048aec3775931edd2ccb40fe03305dfe097"; + sha512 = "a199e177f361dacc07aebfcfa6ed5e28a07cbcafc766c7f7e86f83d42e33680d219ee79d3df3c55f0025aa3ee4ac2ef0ace1af1f83ee6ee536876aa9fa904015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/mr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e075bbf14928fa722d0cbaf20dee7045380a2b1253c7c2f1691f8291da038ba82c4ec590151f0710515fd71d9d7beb606a2da357ca3cc140fcd51abb6660a382"; + sha512 = "795079bc0cb4ed0d6ff7e4dbffd9ffc5cda8f5045402a22e10689f88a63e0684d99d74d896317dbaa7cf2f1b3c2a4701bbfef3fec1b5bb8f1e132b7848064a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ms/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "af676287595903e792b5289bde01885794d2a51b16cdeeaa479138af550f9f1e2c0a1531a509834935e3d26854b3e855d5e4d1670eff73599aa3fde43a5659dc"; + sha512 = "919828730ee86c893563673c27cc81ff99a9831bcf20f5d12b630b89306f7bcec3395c289b39d9bc41804e45c66addf8307dc6de5777f0138f397d9cf4d01048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/my/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "5513f7ff66988b4c4404ac7efc52c9ac4ffe916cd5a196d5fb2418e832de975b07737f21a55bec5d6f9196fde04a9311f1d06fbc31a018bd192d0a9bf71e70bb"; + sha512 = "9d0a31384a9cf43999b4edfe0904449e5c86c5f7a55f83403f5b612a3df260a24f78d8a077f27560d9c95a83680aa58fd1f0dc43b57de1f9f9eaf5d7125f1f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nb-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4495a163636dc90e49cf6cd77e193b25d157bd0079b7521af4735f81efad9002adade8ae31b80af492ed6dac00174fcca3343bfa580113274f960ff152b51439"; + sha512 = "0bf6caf24367e8a86692b3bab88a740f3aeeaaaddab7c9f475daae259c6348a6b61f20b01c2d8c611aa26ed61e87fb158bae8baeddf335849ec4168531306877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ne-NP/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "761e123de862289aa25a95e8f527ea9f338d730ca50ac848c53abd4427a3bb6f49eaa0df16e4ff235bdd2680a9c0dda7bfce125f3470aaec0ea184ab1dda65da"; + sha512 = "9a871db32e0ffc5126536b1de4647aac0e081126ca0c7a042188eac8ae3dc80d3912377714e42f2d5d851ccca3afa995249dbf58e9a4e2203dc228aab50f84de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6a4405ac9cb88ce172b3c7525ca92aa8acd0bc30a2b41d6ac7f0cd27de26026ce203b256006d65b1793b165f3835c70f98b6716bbb5014a7f3b973ee602972db"; + sha512 = "4a5e884f833ad8d7d66050f95fbf7f856513ed6d2fa3481df3b1ad71ba78c0711412890414dd8581a080156d05ef08118fde9ef2c13717cf4af4bfb67c7312d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/nn-NO/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f35f40bf4e1ad3706ef6b8088c94a2e33a5cc407e1609bf5540c0c62a4d3d4e7c48e126be1c6e716f91207532ce516379b07acdfd8ecc247a7a54c0faa84d5bc"; + sha512 = "3f2b4e57ad161cdcf31512b0207c0c3d7ca810bf897be5d6b9fbf41f4f84898b960e61cf881f19e5ebd886bcaec95612e11aebf78d4894b6c6cb6c6c1c7651bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/oc/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "0321965a798a4e321913d75b633d9a9a8211a894a30bf35036ecc796dd0eaebe6395733dd009ade0fac730704aef5256e6836ff0415f44840de40c8af20628b5"; + sha512 = "a4747101315a61f7b2f04b58ef36540adb1ec941eeee86ccdaa515f408b15b0f300f8edd3c7e81ac6845a80aeed596b0577c35d64e626f90c981002886747604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/or/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "2397be90b55b387ad5aa020b393dba5601127988b609929bfb1ec48d5097e4fa03f0757242bcf07a5a6ad21babe0162c8d7c20cdb59c55049a8608c042b9795a"; + sha512 = "93e76f3f570bf6a053551bf24fc1dd04e13e3032271122ee159d1bc72828a932c0ba45d8dd7f80d5f0638f39d5966a836276b2655e3e33d1c141dd038fbb196f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pa-IN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ddd62ede6cbf7a20dc9dcfbb4a3821bcd662c1054a10a457c360ef560bf351bfecaaa2b0e71f703939d66a450bcaef2435d2222bd0aaf799b82db38b08028c16"; + sha512 = "7fcbbd0526596f106f062cdc48ad61989074ca3357aa725df9e32254a74208f8b3604569c0ee66e1c9556fba19bc7c38958d1b779c1a2444527b92bafae0e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d6551c64a426f27f4c80508e3a358687fda88a886e7ff698c28eacd00022aedaffe809bda6985d1f52abdf2bf4fd10892366f4c31fcf0b95e78839fa09e05d35"; + sha512 = "d8e86a809ad774eb43a20f2aaeafd35f0dfc0710716a41338bbb0e75cc9a2bef5dc92e671d1912a902d484a77a5d0f578633d180718653ac421d0b744c3db567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pt-BR/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "dc45d6aace4130a3b44e02d16e1dac88db0774309a6b014c8029a432fedf0912bfce23ba5a143c3908a2c30ba2d65939a207c6e7fb70cb46f731e8fe4b9eb7d6"; + sha512 = "0b02882448b1c2c1b164ee5a8b79582e84e989aa42e03d127cde10087097db57887a31d7ffdf6960bbd29e8ab7316fad38dab61f7bca58893adac25e898f703d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/pt-PT/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c90188b1f84d031787fc11900e66540d1c1b41e65af9eabae2f9abe1c662b934fda18775b8811e0578da57388944fa123cf28a8c73d49948cd2841f791234818"; + sha512 = "82b714e304f0f358b66c2b8ec76d93aab65225c16afdeb2041e1eb6e2617e969dd7fb123158f186194a36c57a41eb9e7b25642cb60cd1ab6faa7c56f031736ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/rm/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "30ee0faf69f1d376bba25e84248fdfeece44b0b3e2c56b755add262fd0794a59a2e2ab22c2bc9f2dc6d0f23aaad7aadaf5e3497de38ae5e64affb1fc0ebb15e2"; + sha512 = "997e8d1311efce4fbe0b4ee9d76e7a9f6fb52eed6f64aa89928d62f251b38e4e7deee42312d6b06e417db7932b3990e9936f8ee2306e66d4bcc0200c747af2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ro/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "db4801605204fa133c58b2b79962a3d542f96060dd94a1213b12779bc84525072f71789f15d2fecc83285d0f3bba4d377ec7bf5361867fb794e2662f1f24e638"; + sha512 = "9a658f5d770fa0192374e29b82a209895b7f684e61133d6c7f83347087d85de291f8566fa4597cede1a8f8a5bd90b491c7a87392578ade07da911ee9dc4bfc8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ru/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a5fa2dc6543112f133327373fc5f7fcf84eec595f38233f1390d70ac8e38e968e3b03c47de13edd91c9e7ceb6b29183b6687e3ffa8659ae4c58908f88f3f8244"; + sha512 = "fae3452c17b0b7b4b309e1fc57c027b1c1ea24f3722c6e15bc3907d239891cef6f3696fbb901b76811cfafe566dd94b0f16c9f9335edeaf547caaa940f57c2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/si/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "48ff4167cf562c04d29316d877eb8855f02e48e2197705b3f924a8f627b85005b235294ff629afe56fcdac726a0e0b66fbded7090e29fa1997a94234cea8b944"; + sha512 = "a2b5133a8f8efcbc5ab1a6c36b95afcd21a89e048c3f3782760ab9608ebdcb0afa72d8eaf451579c0bca196346d4642ae96b885d084921388240eafab580a80f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "cc6d578518cb0de59880bab71c4888643cbc71f74fac7cc7a4cd1a61628fd6e1c775bbeeb9d5ba26756a0b6a5a1408723de5132c0d9013ec4e1157e0e91dca92"; + sha512 = "ceec1a45af1c9e05f327acb520ba6df722e0fa416a98821350cbf71f73e2fc9ff3172edc472772441236bd66d9ba08918dbf76e864dd87c9a028eb3d274350d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sl/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "433a0fecf6eb3da12ea04e15eecf3ed825eacdbe329bcd522ba8a1505dc8eb81b78b7bfd84fceb029565dfc1b09fb1e38205291c700fbdc96589476c00a93178"; + sha512 = "ba63d313cd3b75e341322ba40b38bf7da4b447f5e05c26a1ef6503ce8603ffc8a5c4b486d86a9061fd153f2997fc339241118344e54e75f6436dd8575bf4c191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/son/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e8ba4761a776dc2686846ce2597ed9a15d61a1973a7c0d952a2de64ef922d4f322ce24891bfbbff80a1b9a07ca3cc1d777807badfed7f68f7b5a3c9ec5836048"; + sha512 = "b938397f1825f9200c7dc490b59c6c649765c94a99670ca4604a0a1040bf307f259dd52235ae045ddc85fec1558dae1382858fd59a5b82c63b5a0e87a12233fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sq/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2fd023d89f493c42016f4ea3f3f16bb5879f2c1f6859cad728b6c649e7901dd6efd4f2f7ba5f161ed98e31d476d3f1faf7cb5fef7936bd88bc1ea283d144805d"; + sha512 = "66d7582888e7b8c6d5322955558009d15d243c5feb14cbd36a6d76e2308ed229255bf19104381e284859a85272e901a6a3185988c97a28d3b9c2ece77c36fcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c107e8c8b2f9afd708a498b190e4044cde74bc81867e66d14c4cdb35b5d356e25d94e9816d2bb21eedab6283029ee4dc29ea04704eb0ebc6ead921ea374b3bd9"; + sha512 = "ad28930d33084df204283f7ea1312510f02dfe4915018e7101873cd773291275de8e8307df6f099b9f6bbb946a49fe930a65bf6ed2791a4bae3477bd44da7809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/sv-SE/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "debda5bf7f2a275cb0434fba6527f396fa55fd3f154333a688fa0187aabee78b881e0bb1704604ac4c58fe705e54ce5480488c38a85232746631fbfb389be646"; + sha512 = "42a9f3612c5e2fcef7c67c04faf6279bd8d9de0144e03ea2325f2bb2b59d72dba78c69d3c3ea9768d2b7e8483c6a9676e53b6458e29ff05d215aa698d6df901b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ta/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "230f3253cac800fc268ca9c3507a2f4dcfcab220b719dfa20e1760be8a4e2f789ccf7a726832eef570afd7b3fc25b58a8d321ee15404252e48b49050bc86d851"; + sha512 = "8e9c36dda61507c313396a70ac2959f500b761a51d2423956ec4343a79b688d8a845358f880443d123260134627ed08f280c422129c4c87196ce4111d64f7c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/te/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d88dcc1bce5f33ce14c6577005f4e70b803c67437dc1e33928483fbb88abb9dd175c81cbf0e22947ed8b319d1b02cbfcc1d1b73958f85845768cdcca5adeb52c"; + sha512 = "1d97795b7b4e0a26f742db20de34a2551cfe9c0077560e4886e710d12fa9ed932e7bc532f66b9be9df438fdfb3d67b1a7dac481f66b778d32cb9772688048c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/th/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "134f6cc7de767b25e07755cea23ae35641d09129835db4659d5ed92536231a8fd57e857cdcb4871285dec93b4af764264a4ea1c36c35bf636682275139edca38"; + sha512 = "d9769f7a21189104cf53f6a837b3e30b8954b963c4d5b6751012ee1e0800de27321248a5c2d1b44bfc3fc28a2d7204659bf006b6681f8067799e94688e7777e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/tr/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "d42b3867ebe0de0e9a6ba14adf2203ee96e2bca569bed2e55c2b46d8149f5babc6eae898a855745cd9fc2e6e016297b7357d25e5b413c786bbaa5607a3abaf05"; + sha512 = "c12bd30cb85a2140c4e342e4996c8dc32c34cb14d64441901774313c3384aa1765fc9277f67bb2966f6509ed67fe5cab938eac18881f4ae003b354c381e146a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/uk/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "634636013a50960aadf383aab9ba75c3bcc679dbe300ca3eb8b804e066c9c9a41cc5e2d4d321e18903ec41bb93ba084bafd8c3c61681da0a7e0388eb52f93a53"; + sha512 = "5ae83fe9bc6e92d19048c6f3f4e9832d21be4ed4b648036a792f08af813e9dabfa48cb2450a3e49fd227bbf379784dd225b03a654fd54214a71ab9cfaff200b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/ur/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d4cb618f46a45354bdc1abfe03ed3eadfaaabbbbd6e88e90b4617ae27887c3ead7e2e46248c845c3d026e14cbdbfa4bc7e332653c89c621dc5711cc5b7decc89"; + sha512 = "bbd4e1ee235bb61dd7380e22818f692710d2354abc7d3b895ffd750bb5ead6d3e5127088c2dd11ee38f7f8ab4f89ef710eb1c84385b4e9fb4f7342ab333dd93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/uz/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6aed20b40c85d9901484982c81506b9ff5eb8bb2a0747db65287b4486cb43feaeed884de23a6326bc45009ca598c732e503c30e2f269f840da3d7bca3b64bee6"; + sha512 = "116a7914da2659bb40fcd8e06d12fc715d78bfe17fe8409756aae1d72010780f25d6b2234ab1e13a3fe69037b682b68e2cb9ccd5c156405426a959d9d3d954e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/vi/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "37c303611f1994dc3470f07fc95b53b1aae4586f36f616c24796fd25463900f85bfaf682397882be1cbda2703c1fc88e285875b6497d311ad1376dc869b6ddc4"; + sha512 = "e661ae440c5e01e77110a0f5969df213d33236589c9d6a7e5be2da2e5b0efb6d67dddf9d6f209e0fb5d0ba99badadc3460f4ff61e58de1f0a2fb0fbca5c7c85a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/xh/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b881dff8d3cb79351329bee61960eed91a3959ca1c6592563d12b50ad58ddd5f38157b372c2aa2a605f93f1ada1dbb6ace65c668697dca24637447e4532b0a5e"; + sha512 = "4c4841775946ddaebefeb930cb1277a800b814a6896d46b329c6550f5e1e9d1d1ec2041e7ec192f9053775bcda81f663e196968c6b916f1e5ffa962ba2935f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/zh-CN/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "994caa136ab8c9470bad545b31c0e2bd738a006bd4340d5d1c03987e43e000b233388449221b681a57bc036f5395a647741d119d434d8cafdcdfc8bdfbf787ea"; + sha512 = "d14b19d5566b7b2ff85c692091576d0e343fbb8aa2be3141693e8185ccf3e492cfde0e9eefe4aec1fc8773063438f1e65f6cb00486f7f95090df726563375ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b19/linux-i686/zh-TW/firefox-62.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0fb7989cea38a7efd2c1575d891463d806ad7a6e5af9c91205bb527b587dddd2a769a49491c82687c31df96a10a4794e822eec4c16c10ac2d28b781483fe6c53"; + sha512 = "71c96ebbb527ad8a83be94bc718d2eb928b78420335170e9f2dbdd3ed9de50b6229f27ce1d11131f4f35d931a95836c65b3a74c200f4c8f247df93027b6c6126"; } ]; } From 98edb207cd5a86cb3a848a74172e469100883351 Mon Sep 17 00:00:00 2001 From: regnat Date: Wed, 8 Aug 2018 08:54:21 +0200 Subject: [PATCH 039/138] bazel: 0.15.2 -> 0.16.0 --- .../tools/build-managers/bazel/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8d4b95c8808..72903ad8a5d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.16.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz"; + sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67"; }; sourceRoot = "."; @@ -121,10 +121,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh # --experimental_strict_action_env (which will soon become the # default, see bazelbuild/bazel#2574) hardcodes the default From e0d250e5cf6d179e1ccc775472d89718f61fcfd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2018 19:42:27 +0200 Subject: [PATCH 040/138] LTS Haskell 12.7 --- .../configuration-hackage2nix.yaml | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6057538125a..c5e1750aca7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.6 + # LTS Haskell 12.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -76,7 +76,7 @@ default-package-overrides: - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.5.0 + - alg ==0.2.6.0 - algebra ==4.3.1 - Allure ==0.8.3.0 - almost-fix ==0.0.2 @@ -244,7 +244,7 @@ default-package-overrides: - bench ==1.0.11 - bencode ==0.6.0.0 - between ==0.11.0.0 - - bhoogle ==0.1.3.4 + - bhoogle ==0.1.3.5 - bibtex ==0.1.0.6 - bifunctors ==5.5.3 - bimap ==0.3.3 @@ -333,7 +333,7 @@ default-package-overrides: - cabal2spec ==2.1.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.5 - - cache ==0.1.1.0 + - cache ==0.1.1.1 - cachix ==0.1.1 - cachix-api ==0.1.0.1 - cairo ==0.13.5.0 @@ -410,7 +410,7 @@ default-package-overrides: - codo-notation ==0.5.2 - coercible-utils ==0.0.0 - colonnade ==1.2.0.1 - - colorful-monoids ==0.2.1.1 + - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.4 - combinatorial ==0.1 @@ -670,7 +670,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - error-util ==0.0.1.2 - - ersatz ==0.4.3 + - ersatz ==0.4.4 - etc ==0.4.0.3 - event ==0.1.4 - eventful-core ==0.2.0 @@ -870,9 +870,9 @@ default-package-overrides: - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - greskell ==0.2.0.3 + - greskell ==0.2.1.0 - greskell-core ==0.1.2.2 - - greskell-websocket ==0.1.0.0 + - greskell-websocket ==0.1.1.0 - groom ==0.1.2.1 - groups ==0.4.1.0 - gtk ==0.14.10 @@ -900,7 +900,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.1 - haskeline ==0.7.4.3 - - haskell-gi ==0.21.3 + - haskell-gi ==0.21.4 - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.1 @@ -1065,7 +1065,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 - - hw-bits ==0.7.0.2 + - hw-bits ==0.7.0.3 - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 @@ -1079,7 +1079,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.3 + - hw-prim ==0.6.2.9 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.3.2.1 - hw-string-parse ==0.0.0.4 @@ -1098,7 +1098,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - hyphenation ==0.7.1 - - hyraxAbif ==0.2.3.9 + - hyraxAbif ==0.2.3.10 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1134,7 +1134,7 @@ default-package-overrides: - interpolation ==0.1.0.2 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 - - intro ==0.3.1.0 + - intro ==0.3.2.0 - invariant ==0.5.1 - invertible ==0.2.0.5 - invertible-grammar ==0.1.1 @@ -1354,7 +1354,7 @@ default-package-overrides: - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.2.1.0 + - modern-uri ==0.2.2.0 - moesocks ==1.0.0.44 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 @@ -1399,7 +1399,7 @@ default-package-overrides: - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multimap ==1.2.1 - - multipart ==0.1.2 + - multipart ==0.1.3 - multistate ==0.8.0.0 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4 @@ -1493,7 +1493,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.0.2 + - OpenGLRaw ==3.3.1.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 @@ -1687,7 +1687,7 @@ default-package-overrides: - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - rank2classes ==1.1.0.1 - - Rasterific ==0.7.3 + - Rasterific ==0.7.4 - rasterific-svg ==0.3.3.1 - ratel ==1.0.5 - ratel-wai ==1.0.3 @@ -1743,7 +1743,7 @@ default-package-overrides: - rest-stringmap ==0.2.0.7 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.6.2 + - retry ==0.7.6.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rhine ==0.4.0.1 @@ -1774,7 +1774,7 @@ default-package-overrides: - sampling ==0.3.3 - sandi ==0.4.2 - sandman ==0.2.0.1 - - say ==0.1.0.0 + - say ==0.1.0.1 - sbp ==2.3.17 - scalendar ==1.2.0 - SCalendar ==1.1.0 @@ -1838,7 +1838,7 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.6 + - serverless-haskell ==0.6.7 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -1918,7 +1918,7 @@ default-package-overrides: - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.1.0 + - StateVar ==1.1.1.1 - static-canvas ==0.2.0.3 - static-text ==0.2.0.2 - statistics ==0.14.0.2 @@ -2033,7 +2033,7 @@ default-package-overrides: - texmath ==0.11.0.1 - text ==1.2.3.0 - text-binary ==0.2.1.1 - - text-builder ==0.5.3 + - text-builder ==0.5.3.1 - text-conversions ==0.3.0 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 @@ -2113,7 +2113,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.10 - - typed-process ==0.2.2.0 + - typed-process ==0.2.3.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2220,7 +2220,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.24.0 + - wai-extra ==3.0.24.1 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.2 - wai-middleware-caching ==0.1.0.2 @@ -2265,8 +2265,8 @@ default-package-overrides: - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 - - wl-pprint-annotated ==0.1.0.0 - - wl-pprint-console ==0.1.0.1 + - wl-pprint-annotated ==0.1.0.1 + - wl-pprint-console ==0.1.0.2 - wl-pprint-extras ==3.5.0.5 - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.2.0.0 @@ -2281,8 +2281,8 @@ default-package-overrides: - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 - - writer-cps-mtl ==0.1.1.4 - - writer-cps-transformers ==0.1.1.3 + - writer-cps-mtl ==0.1.1.5 + - writer-cps-transformers ==0.1.1.4 - ws ==0.0.4 - wuss ==1.1.10 - X11 ==1.9 From 78e2045f6d747655062ed2ceee595b878e488488 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 9 Aug 2018 12:25:08 +0900 Subject: [PATCH 041/138] gi-vte: Remove from dont-distribute-packages --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c5e1750aca7..3aee4857f99 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4742,7 +4742,6 @@ dont-distribute-packages: gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-wnck: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] From cd35b1cc9c48d2c3b008d14e1bb32823980e4dcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2018 02:31:32 +0200 Subject: [PATCH 042/138] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11-7-gdb540bc from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d01233b4fa5a43a189de1bf13233950c067edb7e. --- .../haskell-modules/hackage-packages.nix | 2767 ++++++++++++----- 1 file changed, 1956 insertions(+), 811 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index df117d1a554..c1fb70ee2e6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5401,6 +5401,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Fin_0_2_5_0" = callPackage + ({ mkDerivation, alg, base, foldable1, natural-induction, peano }: + mkDerivation { + pname = "Fin"; + version = "0.2.5.0"; + sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc"; + libraryHaskellDepends = [ + alg base foldable1 natural-induction peano + ]; + description = "Finite totally-ordered sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -9921,8 +9935,8 @@ self: { pname = "HsYAML"; version = "0.1.1.2"; sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; - revision = "1"; - editedCabalFile = "1hnp2sqjvn524040m0dzvzyrr8kp4i49gdyrzwym66j71xi6ynkl"; + revision = "2"; + editedCabalFile = "0kxfvp899l06x3y6zhnnfjx7kw1mjb3c7g0flnkllndp9i9a3pkl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10950,6 +10964,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Kulitta" = callPackage + ({ mkDerivation, array, base, deepseq, Euterpea, parallel, random + , UISF + }: + mkDerivation { + pname = "Kulitta"; + version = "2.2.1"; + sha256 = "1r5pjlv4a99dpbqqnixyw8s99z5h1fgw6rdc8bdhjij1bj6dc5qw"; + libraryHaskellDepends = [ + array base deepseq Euterpea parallel random UISF + ]; + description = "Library for automated composition and musical learning"; + license = "unknown"; + }) {}; + "KyotoCabinet" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , kyotocabinet @@ -13665,22 +13694,6 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, libGL - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.3.0.2"; - sha256 = "1jnn4v32qyf0xfy4s2pgrzca2bnr855m4vkzbmwr7dwam2xckcpq"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ libGL ]; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "OpenGLRaw_3_3_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: @@ -13694,7 +13707,6 @@ self: { librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -14536,6 +14548,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Prelude" = callPackage + ({ mkDerivation, base-noprelude }: + mkDerivation { + pname = "Prelude"; + version = "0.1.0.0"; + sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj"; + libraryHaskellDepends = [ base-noprelude ]; + description = "A Prelude module replacement"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector , containers, deepseq, DPutils, hashable, log-domain, OrderedBits @@ -15391,23 +15414,6 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.7.3"; - sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_4" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms @@ -15422,7 +15428,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -15706,8 +15711,8 @@ self: { ({ mkDerivation, base, Cabal, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.1.0"; - sha256 = "0sicq48cp9j5b5hpa1s53y505ny0snn2k73f15a4gwh1n5abdxzm"; + version = "0.6.2.0"; + sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; @@ -17085,17 +17090,6 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "StateVar"; - version = "1.1.1.0"; - sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s"; - libraryHaskellDepends = [ base stm transformers ]; - description = "State variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "StateVar_1_1_1_1" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -17104,7 +17098,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -21755,6 +21748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-generic-compat_0_0_1_3" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-generic-compat"; + version = "0.0.1.3"; + sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6"; + libraryHaskellDepends = [ aeson base ]; + description = "Compatible generic class names of Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, deepseq , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific @@ -22913,17 +22918,6 @@ self: { }) {}; "alg" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; - version = "0.2.5.0"; - sha256 = "014wrh4f58lq50n5ybdksr2k5lygs5qxsyxg48zpbzzz3p3494yx"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_6_0" = callPackage ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; @@ -22932,7 +22926,6 @@ self: { libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -26870,8 +26863,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.0"; - sha256 = "13l8biwl66pn3n8jbbc2fbj3vk1w6rjnzrdmiimxl0nd7zm6vk4r"; + version = "6.0.1"; + sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26890,8 +26883,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.0.0"; - sha256 = "1cmfda3dfg282a8rg6hkqv17fzfia5c7vm4gh0jdib4ggl5yxcrv"; + version = "6.0.1"; + sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26911,8 +26904,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.0"; - sha256 = "1i45fvxn75yd7fpypzz183j7q3n0kvrrxw78kr310a08fdngapn8"; + version = "6.0.1"; + sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26932,8 +26925,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.0"; - sha256 = "1km57vpm8q77lpxyvmpvgj6csrixf8kdxqnwxkg065ylk0cp1hw7"; + version = "6.0.1"; + sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26956,8 +26949,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "6.0.0"; - sha256 = "1s4cixqkflf3s8g6x75783wwrr5973wls2axjj8raspa4qfl2zsn"; + version = "6.0.1"; + sha256 = "1cjvzd47vprn916d1fks6lf08plns326xircfhc69qblkzvqzljs"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -26978,8 +26971,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.0"; - sha256 = "0fbkd7r8iq8sjfa0k6kv8clld323i1xhib5k7kpl2zlan4xfk2k9"; + version = "6.0.1"; + sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -26999,8 +26992,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.0"; - sha256 = "0xfaayajlzb9wvqnmlfwh990kzsy738qnscsyqnn07zp61047wxf"; + version = "6.0.1"; + sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27735,6 +27728,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "appendmap" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "appendmap"; + version = "0.1.3"; + sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "applicative-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -31746,6 +31751,8 @@ self: { pname = "axel"; version = "0.0.4"; sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3"; + revision = "1"; + editedCabalFile = "0ff8pi6x26wv6bp2hx92h3cs9iln1yj6230am1c2ygjhr16wfwna"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33988,25 +33995,6 @@ self: { }) {}; "bhoogle" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, hoogle, lens, process, protolude, text, time - , typed-process, vector, vty - }: - mkDerivation { - pname = "bhoogle"; - version = "0.1.3.4"; - sha256 = "06b2fc8667axzk58hpgb5wdbxd0lj1xrgkxvygsksq4q9wdwc8qn"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick bytestring containers directory filepath hoogle lens - process protolude text time typed-process vector vty - ]; - description = "Simple terminal GUI for local hoogle"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bhoogle_0_1_3_5" = callPackage ({ mkDerivation, base, brick, bytestring, containers, directory , filepath, hoogle, lens, process, protolude, text, time , typed-process, vector, vty @@ -34023,7 +34011,6 @@ self: { ]; description = "Simple terminal GUI for local hoogle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bibdb" = callPackage @@ -35706,6 +35693,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bins" = callPackage + ({ mkDerivation, base, containers, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions + , profunctors, reflection, tagged, vector-sized + }: + mkDerivation { + pname = "bins"; + version = "0.1.1.0"; + sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk"; + libraryHaskellDepends = [ + base containers finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise math-functions profunctors reflection + tagged vector-sized + ]; + description = "Aggregate continuous values into discrete bins"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup @@ -35814,8 +35819,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "1.0.2"; - sha256 = "0g954m7ch3lzcc2j49qcmpb7v4apdijq9km8d4r08qr9w6xq5pc8"; + version = "1.0.3"; + sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -38559,16 +38564,16 @@ self: { "brainheck" = callPackage ({ mkDerivation, base, containers, criterion, lens, megaparsec, mtl - , optparse-applicative, recursion-schemes, text, vector + , optparse-applicative, recursion, text, vector }: mkDerivation { pname = "brainheck"; - version = "0.1.0.8"; - sha256 = "01jz6j37rjdj3jcs8j27xgwcqykx3sarkb9759qn63v1ln5kv5nj"; + version = "0.1.0.9"; + sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers lens megaparsec mtl recursion-schemes text vector + base containers lens megaparsec mtl recursion text vector ]; executableHaskellDepends = [ base optparse-applicative text ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -39468,10 +39473,10 @@ self: { }: mkDerivation { pname = "bulletproofs"; - version = "0.1.0"; - sha256 = "1axm943r0hx5g8a36s4166sf1ifppbd8m6nx25xn7lf27fvsbw9q"; + version = "0.2.0"; + sha256 = "0njc7wd1vn6i9zw35vjzm73gzv20b6qn3zci61lpnp3zclbclnmb"; revision = "1"; - editedCabalFile = "08wgmhrlfv99zcgwd7mqjaz5hnhz4h3a3afzdxnclvzmmqd30njv"; + editedCabalFile = "0im8y3699rvl0ak3smwry3rafyvrypxan9jb5d39xanwmny2qnky"; libraryHaskellDepends = [ arithmoi base containers cryptonite memory protolude text ]; @@ -40163,8 +40168,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: mkDerivation { pname = "bytestring-short"; - version = "0.1.0.0"; - sha256 = "19pwr57imsdvjkjhmnaj9lxmv1lk3d8f8j3gcb7qsx832jah7crr"; + version = "0.1.0.2"; + sha256 = "04y2yfsvicgs5bf0q2cyyg939g09q212rmnj9n11vh5fr86m1gsm"; libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Backport copy of ShortByteString"; @@ -40862,35 +40867,36 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, cabal-plan - , containers, directory, filepath, ghc, ghc-paths, mtl, process - , semigroupoids, template-haskell, temporary, transformers, unix - , unix-compat, utf8-string + , containers, directory, filepath, ghc, ghc-paths, mtl, pretty-show + , process, semigroupoids, template-haskell, temporary, text + , transformers, unix, unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "0.8.1.0"; - sha256 = "098jjdjzkzpr4lgb78fhy9k80r5m96shyj39km69m5x4ls16cj4g"; + version = "0.8.1.2"; + sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base Cabal cabal-plan containers directory filepath mtl process semigroupoids transformers unix unix-compat ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath mtl process - template-haskell temporary transformers unix unix-compat - utf8-string + base bytestring Cabal cabal-plan containers directory filepath mtl + pretty-show process template-haskell temporary text transformers + unix unix-compat utf8-string ]; executableToolDepends = [ cabal-install ]; testHaskellDepends = [ - base bytestring Cabal directory filepath ghc ghc-paths mtl process - template-haskell temporary transformers unix unix-compat - utf8-string + base bytestring Cabal cabal-plan containers directory filepath ghc + ghc-paths mtl pretty-show process template-haskell temporary text + transformers unix unix-compat utf8-string ]; testToolDepends = [ cabal-install ]; doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41449,8 +41455,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.10.2"; - sha256 = "15yvw4wnbsjir0rniwkwi3snyg6laynvacqcn66idcffx8pffy4g"; + version = "2.11"; + sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41662,22 +41668,6 @@ self: { }) {cabocha = null;}; "cache" = callPackage - ({ mkDerivation, base, clock, hashable, hspec, stm, transformers - , unordered-containers - }: - mkDerivation { - pname = "cache"; - version = "0.1.1.0"; - sha256 = "1zvq5dwckkngf6kzh04pa59kgxf44fx9kli0c7zaz4g9hf1nyx8l"; - libraryHaskellDepends = [ - base clock hashable stm transformers unordered-containers - ]; - testHaskellDepends = [ base clock hspec stm transformers ]; - description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cache_0_1_1_1" = callPackage ({ mkDerivation, base, clock, hashable, hspec, stm, transformers , unordered-containers }: @@ -41691,7 +41681,6 @@ self: { testHaskellDepends = [ base clock hspec stm transformers ]; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-io" = callPackage @@ -42459,6 +42448,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "capnp" = callPackage + ({ mkDerivation, array, base, binary, bytes, bytestring, cereal + , containers, cpu, data-default, data-default-instances-vector + , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit + , mtl, pretty-show, primitive, process, process-extras, QuickCheck + , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers, utf8-string, vector, wl-pprint-text + }: + mkDerivation { + pname = "capnp"; + version = "0.1.0.0"; + sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytes bytestring cpu data-default + data-default-instances-vector exceptions mtl primitive + reinterpret-cast text transformers vector + ]; + executableHaskellDepends = [ + array base binary bytes bytestring cereal containers directory + dlist exceptions filepath mtl primitive reinterpret-cast text + transformers utf8-string vector wl-pprint-text + ]; + testHaskellDepends = [ + array base binary bytes bytestring data-default deepseq directory + exceptions heredoc HUnit mtl pretty-show primitive process + process-extras QuickCheck quickcheck-instances quickcheck-io + reinterpret-cast resourcet test-framework test-framework-hunit + test-framework-quickcheck2 text transformers vector + ]; + description = "Cap'n Proto for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "capped-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46706,15 +46731,12 @@ self: { }) {}; "cli-setup" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, process - }: + ({ mkDerivation, base, bytestring, directory, process }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.4"; - sha256 = "0mkxm1kpbfsiv3khp8d96j9bcq7j4zbidd5ks89r69bxsmrp1z7i"; - libraryHaskellDepends = [ - base bytestring directory file-embed process - ]; + version = "0.2.0.5"; + sha256 = "08lqx6nvwbjydjrb2gnjis1bfq9xcrhqvilzmbkbzq17lxcaax2c"; + libraryHaskellDepends = [ base bytestring directory process ]; description = "Helper setup scripts for packaging command-line tools"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47444,6 +47466,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_1_5" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.5"; + sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -47490,8 +47530,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.3.0"; - sha256 = "1zc7gcncmbq5ph17hlwxdikjvx6ccywkbs60523ybp7dagch4cfs"; + version = "0.3.0.1"; + sha256 = "0k8mv6fa2xzm3ppirhxr2l7vrq1jhb4mp20fdy2pliy4n93rfvlv"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -48365,18 +48405,6 @@ self: { }) {}; "colorful-monoids" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "colorful-monoids"; - version = "0.2.1.1"; - sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; - }) {}; - - "colorful-monoids_0_2_1_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "colorful-monoids"; @@ -48386,7 +48414,6 @@ self: { testHaskellDepends = [ base ]; description = "Styled console text output using ANSI escape sequences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorize-haskell" = callPackage @@ -49608,6 +49635,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude_1_5_3_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "1.5.3.1"; + sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; + libraryHaskellDepends = [ base ]; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -51026,6 +51065,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_4_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, semigroups, text, tls + , transformers, unordered-containers, wai, warp, warp-tls, x509 + , x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.4.0"; + sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath process + ]; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors semigroups + text tls transformers unordered-containers x509 x509-system + x509-validation yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -51561,12 +51636,14 @@ self: { }) {}; "container" = callPackage - ({ mkDerivation, base, containers, convert, lens, text }: + ({ mkDerivation, base, containers, convert, lens, text, vector }: mkDerivation { pname = "container"; - version = "1.1.1"; - sha256 = "1kmi57bx9bahr2vc0b89rgy68r26vn0y531m53fs4avdcadnjl9q"; - libraryHaskellDepends = [ base containers convert lens text ]; + version = "1.1.2"; + sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj"; + libraryHaskellDepends = [ + base containers convert lens text vector + ]; description = "Containers abstraction and utilities"; license = stdenv.lib.licenses.asl20; }) {}; @@ -52602,6 +52679,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "corecursive-main" = callPackage + ({ mkDerivation, base, process, unix }: + mkDerivation { + pname = "corecursive-main"; + version = "0.1.0.0"; + sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process ]; + executableHaskellDepends = [ base process unix ]; + testHaskellDepends = [ base process ]; + description = "Write your main like it can call itself back"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "corenlp-parser" = callPackage ({ mkDerivation, aeson, async, base, cryptonite, data-default , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell @@ -52960,7 +53052,7 @@ self: { description = "high-level CPLEX interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {cplex = null;}; + }) {inherit (pkgs) cplex;}; "cplusplus-th" = callPackage ({ mkDerivation, base, bytestring, containers, process, QuickCheck @@ -53177,6 +53269,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cql-io_1_0_1_1" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptohash, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, monad-control, mtl + , mwc-random, network, raw-strings-qq, retry, semigroups, stm + , tasty, tasty-hunit, text, time, tinylog, transformers + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.0.1.1"; + sha256 = "1kdv00fv21s8vbb3dfgzlgsrr0xxl4p2h655ga3q5cg47by564xc"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptohash + data-default-class exceptions hashable HsOpenSSL iproute lens + monad-control mtl mwc-random network retry semigroups stm text time + tinylog transformers transformers-base unordered-containers uuid + vector + ]; + testHaskellDepends = [ + base containers cql Decimal iproute mtl raw-strings-qq tasty + tasty-hunit text time tinylog uuid + ]; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53577,23 +53697,23 @@ self: { "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond , directory, exceptions, filepath, gray-extended, hdaemonize - , hsyslog, HUnit, MonadRandom, mtl, old-locale, process, QuickCheck - , random, split, temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, unix, zlib + , hsyslog, HUnit, MonadRandom, mtl, QuickCheck, random, split + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers, unix }: mkDerivation { pname = "creatur"; - version = "5.9.23"; - sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; + version = "5.9.25"; + sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions - filepath gray-extended hdaemonize hsyslog MonadRandom mtl - old-locale process random split time transformers unix zlib + filepath gray-extended hdaemonize hsyslog MonadRandom mtl random + split time transformers unix ]; testHaskellDepends = [ - array base binary cereal directory filepath hsyslog HUnit - MonadRandom mtl QuickCheck temporary test-framework - test-framework-hunit test-framework-quickcheck2 + base cereal directory filepath HUnit MonadRandom mtl QuickCheck + temporary test-framework test-framework-hunit + test-framework-quickcheck2 ]; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -54840,6 +54960,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csg_0_1_0_5" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, doctest, doctest-driver-gen, gloss, gloss-raster + , QuickCheck, simple-vec3, strict, system-filepath, tasty + , tasty-hunit, tasty-quickcheck, transformers, turtle, vector + }: + mkDerivation { + pname = "csg"; + version = "0.1.0.5"; + sha256 = "12zwf2xiqiq4snwqhwvk1k3fl1bzlfbcd2vc2hsnv6v61ci6shq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers QuickCheck simple-vec3 strict + transformers + ]; + executableHaskellDepends = [ + base gloss gloss-raster QuickCheck simple-vec3 strict + system-filepath turtle + ]; + testHaskellDepends = [ + base bytestring doctest doctest-driver-gen simple-vec3 tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion simple-vec3 strict vector + ]; + description = "Analytical CSG (Constructive Solid Geometry) library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csound-catalog" = callPackage ({ mkDerivation, base, csound-expression, csound-sampler , sharc-timbre, transformers @@ -59185,6 +59337,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian-build_0_10_1_2" = callPackage + ({ mkDerivation, base, directory, filepath, process, split + , transformers + }: + mkDerivation { + pname = "debian-build"; + version = "0.10.1.2"; + sha256 = "0h8nxk9pir6ic65vh5y29jnlz7jrnq8inqg22h7nvlphk7qbblqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath process split transformers + ]; + executableHaskellDepends = [ base filepath transformers ]; + description = "Debian package build sequence tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debug" = callPackage ({ mkDerivation, aeson, base, bytestring, clock, containers , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed @@ -60865,6 +61036,8 @@ self: { pname = "dhall-json"; version = "1.2.2"; sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d"; + revision = "1"; + editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61173,8 +61346,8 @@ self: { }: mkDerivation { pname = "diagrams-braille"; - version = "0.1.0.1"; - sha256 = "11xq2mx4mmg12cyhs2r7brjn00jy7rh7rwh15gr7piynmx723xhl"; + version = "0.1.0.2"; + sha256 = "1jrhc8k0n9jabhg6rz22js9k3nj3v6r6klxskiksf6ajbqbzqg69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63102,6 +63275,8 @@ self: { pname = "distributed-process"; version = "0.7.4"; sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq"; + revision = "1"; + editedCabalFile = "02b499kz94v9ls6l95q9wxh0f56nzfyq7rslq3jf6xp94ydcnhwy"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -63834,6 +64009,8 @@ self: { pname = "djinn-lib"; version = "0.0.1.3"; sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v"; + revision = "1"; + editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Generate Haskell code from a type. Library extracted from djinn package."; license = stdenv.lib.licenses.bsd3; @@ -68014,6 +68191,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "emacs-module" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions + , monad-control, mtl, prettyprinter, resourcet + , safe-exceptions-checked, template-haskell, text + , transformers-base, vector, void + }: + mkDerivation { + pname = "emacs-module"; + version = "0.1.1"; + sha256 = "1m6rcvhgdhlzzq86b4qhanbmymwl87r705jx9ih8s89fvsfgvq0y"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions monad-control mtl prettyprinter + resourcet safe-exceptions-checked template-haskell text + transformers-base vector void + ]; + description = "Utilities to write Emacs dynamic modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "email" = callPackage ({ mkDerivation, array, base, bytestring, encoding, HaskellNet , hsemail, old-locale, old-time, parsec, process, time @@ -68217,8 +68413,8 @@ self: { }: mkDerivation { pname = "emd"; - version = "0.1.3.0"; - sha256 = "0p8ww7bxdrv5xpy9gslzp1c25iqamsdy0rfm4y2n0p71l7w960rw"; + version = "0.1.4.0"; + sha256 = "0mrkyy6fn4jsy6h4acqjkkq1bvp7c8yjpw5zyk9ycnk2izb7a9zw"; libraryHaskellDepends = [ base binary containers data-default-class finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -69333,33 +69529,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, data-default, directory, doctest - , filepath, lens, mtl, parsec, process, semigroups, temporary - , transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.3"; - sha256 = "0c0yrh342682k47phy5xwc0gya4h9d07j53dakkwhnx0r4p6gjfn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base directory doctest filepath mtl ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ersatz_0_4_4" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, data-default, directory, doctest , filepath, lens, mtl, parsec, process, semigroups, temporary @@ -69695,8 +69864,8 @@ self: { }: mkDerivation { pname = "eternity"; - version = "0.1.2"; - sha256 = "0rjjdhr9cnpgm55mjvhlkgdvqvi5dmmzrr4vj0jmn9pg7zra34y6"; + version = "0.1.3"; + sha256 = "02kwd0zad4p762pk75784bbiv6klhy47g64lpxg8kscfryxrd3ma"; libraryHaskellDepends = [ attoparsec base cereal directory foldl potoki potoki-cereal text ]; @@ -69716,8 +69885,8 @@ self: { }: mkDerivation { pname = "eternity-timestamped"; - version = "0.4"; - sha256 = "150xqf7kg4131qxnbjhly4ryy251gni1z6vyqcsy477hig2yv5gr"; + version = "0.4.1"; + sha256 = "09s26v4gi6w5am0nn7nwqkja7g74jddjfzsqjq2bbafng4dxnmwy"; libraryHaskellDepends = [ attoparsec base cereal directory eternity generic-random hashable potoki QuickCheck text time timestamp @@ -71683,6 +71852,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extrapolate_0_3_2" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.3.2"; + sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate ]; + description = "generalize counter-examples of test properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -74408,8 +74592,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.5"; - sha256 = "0s4rifky7rswajc5z7a0kmmqyws3q6ryqca2h7riyh7xzkbxqfvk"; + version = "0.4.7"; + sha256 = "0ski62ndgl5ay9kbgx2v590pvfsn0wn0cx9h70fhvcrlsam01p5q"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -75090,6 +75274,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flick-duration" = callPackage + ({ mkDerivation, base, clock, hspec, QuickCheck }: + mkDerivation { + pname = "flick-duration"; + version = "1.0.0"; + sha256 = "0lhfbdhgz1m5cw4d5bkzb0igk5d240k4zrxdyd7kw64qr8pvvkfy"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base clock hspec QuickCheck ]; + description = "work with durations of time using the Flick as the smallest unit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flickr" = callPackage ({ mkDerivation, base, filepath, HTTP, mime, network, random , utf8-string, xhtml, xml @@ -80351,6 +80547,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, genvalidity + , genvalidity-hspec, hspec, QuickCheck, validity + , validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.3.0.0"; + sha256 = "1jmy41mqjh3zj512fjikn6vqjvx81cdvi9llc9f0yp2h2rkmw4hf"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers @@ -80468,8 +80685,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-optics"; - version = "0.0.0.0"; - sha256 = "0nx1qfi6dq0vikpbab4spkhmpm7lyvbvg5k7ni9lh71ijqjynyv8"; + version = "0.1.0.0"; + sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec hspec microlens QuickCheck ]; @@ -80575,6 +80792,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-text_0_5_1_0" = callPackage + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.5.1.0"; + sha256 = "0j7fx2zzv6ljqk87148h1rq3yg6vvy0dsl7kfl3f2p6ghnz7wggg"; + libraryHaskellDepends = [ + array base genvalidity QuickCheck text validity validity-text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-time" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time @@ -81952,17 +82188,18 @@ self: { "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc - , ghc-tcplugins-extra, pretty, reflection, singletons + , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb + , transformers }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.2.0.3"; - sha256 = "15lywyh7sdfgqhz0bpi2hap1ix2s8dsfvn7vwzsci8l0w5vl5bn2"; + version = "0.2.0.5"; + sha256 = "03n6ddvn6p1nk6yw141zdw60iqda7k3sbaacc9s04mmnmshvia1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers equational-reasoning ghc ghc-tcplugins-extra pretty - reflection singletons + base containers equational-reasoning ghc ghc-tcplugins-extra mtl + pretty reflection singletons syb transformers ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -83067,24 +83304,24 @@ self: { "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers, vte + , haskell-gi-base, haskell-gi-overloading, text, transformers + , vte_291 }: mkDerivation { pname = "gi-vte"; - version = "2.91.18"; - sha256 = "0rixrkw0k2vz59y20lsd8zw54n7l069mij0n76dnmah2bjjk1r7w"; + version = "2.91.19"; + sha256 = "1hnhidjr7jh7i826lj6kdn264i592sfl5kwvymnpiycmcb37dd4y"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ vte ]; + libraryPkgconfigDepends = [ vte_291 ]; doHaddock = false; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + }) {vte_291 = pkgs.gnome3.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -83371,19 +83608,19 @@ self: { }) {}; "git" = callPackage - ({ mkDerivation, base, byteable, bytedump, bytestring, containers - , cryptonite, hourglass, memory, patience, random, system-fileio - , system-filepath, tasty, tasty-quickcheck, unix-compat - , utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, basement, byteable, bytedump, bytestring + , containers, cryptonite, hourglass, memory, patience, random + , system-fileio, system-filepath, tasty, tasty-quickcheck + , unix-compat, utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.1"; - sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz"; + version = "0.2.2"; + sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base byteable bytestring containers cryptonite hourglass memory - patience random system-fileio system-filepath unix-compat + base basement byteable bytestring containers cryptonite hourglass + memory patience random system-fileio system-filepath unix-compat utf8-string vector zlib zlib-bindings ]; testHaskellDepends = [ @@ -84834,15 +85071,16 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers, pretty, regex-applicative - , text, TypeCompose + ({ mkDerivation, array, base, containers, pretty, random-strings + , regex-applicative, text, time, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.4.0.5"; - sha256 = "09z7i4h5zwgyh3gg5w0l6p0ch1lhzmsnbmk1yfbc9b21gbxna5js"; + version = "0.4.0.11"; + sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8"; libraryHaskellDepends = [ - array base containers pretty regex-applicative text TypeCompose + array base containers pretty random-strings regex-applicative text + time TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -84985,6 +85223,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_13_0_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.13.0.1"; + sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { @@ -85000,8 +85254,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.12.0.0"; - sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb"; + version = "1.13.0.1"; + sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; @@ -85040,8 +85294,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.12.0.0"; - sha256 = "1iimmphkq89h4k8iny52kgz1a0cq6lp8dzr0lkj4j5qnfaj65lhl"; + version = "1.13.0.1"; + sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85097,6 +85351,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-raster_1_13_0_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering + , repa + }: + mkDerivation { + pname = "gloss-raster"; + version = "1.13.0.1"; + sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x"; + libraryHaskellDepends = [ + base containers ghc-prim gloss gloss-rendering repa + ]; + description = "Parallel rendering of raster images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate @@ -85128,6 +85398,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_13_0_2" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.13.0.2"; + sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -88675,27 +88959,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , greskell-core, hint, hspec, semigroups, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "0.2.0.3"; - sha256 = "13nqmpga35ri45rvssfj6mhzafkgdbg5077s8m847ny1sz10xg0x"; - libraryHaskellDepends = [ - aeson base greskell-core semigroups text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell_0_2_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , greskell-core, hint, hspec, semigroups, text, transformers , unordered-containers, vector @@ -88714,7 +88977,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-core" = callPackage @@ -88739,28 +89001,6 @@ self: { }) {}; "greskell-websocket" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , greskell-core, hashtables, hspec, safe-exceptions, stm, text - , unordered-containers, uuid, vector, websockets - }: - mkDerivation { - pname = "greskell-websocket"; - version = "0.1.0.0"; - sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq"; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring greskell-core - hashtables safe-exceptions stm text unordered-containers uuid - vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring greskell-core hspec unordered-containers uuid - vector - ]; - description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-websocket_0_1_1_0" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text , unordered-containers, uuid, vector, websockets @@ -88780,7 +89020,6 @@ self: { ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -91781,8 +92020,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.11.1"; - sha256 = "07mgv88whga78x6sa7c1iw8l6k6p5yb0b38wpvy6cs3rzk4x2dx2"; + version = "1.11.2"; + sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93165,8 +93404,8 @@ self: { pname = "hapistrano"; version = "0.3.5.9"; sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha"; - revision = "1"; - editedCabalFile = "0g48v24byay41jxhyszy9j00s77r9gsfdh3x6dvwv5shb558w95k"; + revision = "2"; + editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -93184,6 +93423,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_10" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.10"; + sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -95423,33 +95689,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobjectIntrospection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.21.3"; - sha256 = "09smnzg6kqjyb7m281k8w3y6vabws41snp9wkh8449s0ya3ndbn0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobjectIntrospection;}; - - "haskell-gi_0_21_4" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers , directory, doctest, filepath, glib, gobjectIntrospection , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe @@ -95473,7 +95712,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; @@ -99813,6 +100051,8 @@ self: { pname = "hdocs"; version = "0.5.3.0"; sha256 = "0gkv4xy7jr2ic22gn5fpj3vd6avgd1xqblv96gg1m0fhfsj92y5h"; + revision = "1"; + editedCabalFile = "0dy2jamwd0jxai8hcfq506xqczi0hn9c8p7z4dbmq62d29fm79yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100236,6 +100476,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_4" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.4"; + sha256 = "1xsa6wgakmjhwz9s9fybbwsx6gxy6630bqyrai0sb4vmd9lnbxfx"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -101667,8 +101933,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.2.2"; - sha256 = "0xjh952djxb490nig2aj9y5461ka33d3qdlrfkxb7iz7pqmmr6fs"; + version = "0.2.3.1"; + sha256 = "178nr4k4jgl3xxlvds7cqg18qfmsak1zhwlkks6syviypbg5wb07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101716,6 +101982,8 @@ self: { pname = "hformat"; version = "0.3.3.0"; sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; + revision = "1"; + editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i"; libraryHaskellDepends = [ ansi-terminal base base-unicode-symbols text ]; @@ -102246,20 +102514,19 @@ self: { "hid-examples" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart - , Chart-diagrams, fmt, hint, optparse-applicative, safe, text, time + , Chart-diagrams, extra, fmt, hint, mtl, optparse-applicative + , random, safe, text, time }: mkDerivation { pname = "hid-examples"; - version = "0.1.0.0"; - sha256 = "0x8i9532w5gxlajx4pw7n31qf6hbqf5335lsqwvwvk12igww7mg8"; - revision = "1"; - editedCabalFile = "0ifcgqm81vh7qidpxzgkx5g3wcyif0zgclz7svsnvw5vvpij350p"; + version = "0.2"; + sha256 = "1rp6v40z8i2slnsacw42adkqp98bg8fml573lpz9mz7ipn05gi9x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base blaze-html bytestring cassava Chart Chart-diagrams fmt hint - optparse-applicative safe text time + base blaze-html bytestring cassava Chart Chart-diagrams extra fmt + hint mtl optparse-applicative random safe text time ]; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; @@ -103808,8 +104075,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.5"; - sha256 = "0mp8jhvf48173ixypqfm9vmsb2bsykfygxrxxfjpry6m5xqfh09c"; + version = "1.3.6"; + sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106139,8 +106406,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.5.0"; - sha256 = "089dqnnczknir9q9mwdh5z9jzb5wsw4bmqqi8spibxk8lna4cvqs"; + version = "0.5.1"; + sha256 = "0gh6kjfy9wcdppbq9ml5i2iz7bi12pbvnzqhj25sg9dy77iwc7cp"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -106416,6 +106683,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hourglass_0_2_12" = callPackage + ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "hourglass"; + version = "0.2.12"; + sha256 = "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge mtl old-locale time + ]; + description = "simple performant time related library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hourglass-fuzzy-parsing" = callPackage ({ mkDerivation, base, hourglass, parsec }: mkDerivation { @@ -107439,8 +107726,8 @@ self: { }: mkDerivation { pname = "hriemann"; - version = "0.3.2.0"; - sha256 = "1b0vyxkyz8qqzvdrb0nyni6x490rxqh5zlydjrn9pbqc6npz7m8p"; + version = "0.3.3.0"; + sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112516,16 +112803,16 @@ self: { "http-conduit-downloader" = callPackage ({ mkDerivation, base, bytestring, conduit, connection , data-default, HsOpenSSL, http-client, http-conduit, http-types - , lifted-base, mtl, network, network-uri, resourcet, time, zlib + , mtl, network, network-uri, resourcet, text, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.30"; - sha256 = "1m0wwi34fcsppn8sj46jaaxdpdf3jzl1bhf9q1gxg9p1r9xgvv5a"; + version = "1.0.31"; + sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL - http-client http-conduit http-types lifted-base mtl network - network-uri resourcet time zlib + http-client http-conduit http-types mtl network network-uri + resourcet text time zlib ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; @@ -112620,6 +112907,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-io-streams" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, containers, directory, HsOpenSSL + , io-streams, mtl, network, network-uri, openssl-streams, text + , transformers + }: + mkDerivation { + pname = "http-io-streams"; + version = "0.1.0.0"; + sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive containers directory HsOpenSSL io-streams mtl + network network-uri openssl-streams text transformers + ]; + description = "HTTP client based on io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-kinder" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-media, http-types, HUnit, QuickCheck, singletons @@ -113102,15 +113408,16 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, base, binary, bytestring, data-default-class - , http2, http2-client, proto-lens, proto-lens-protoc, text, zlib + , http2, http2-client, http2-grpc-types, proto-lens + , proto-lens-protoc, text, zlib }: mkDerivation { pname = "http2-client-grpc"; - version = "0.1.0.0"; - sha256 = "11ckgp56k6ypk4smc91909gs8cvlbqji8blsr48k8fbclhi5cqwv"; + version = "0.2.0.0"; + sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z"; libraryHaskellDepends = [ base binary bytestring data-default-class http2 http2-client - proto-lens proto-lens-protoc text zlib + http2-grpc-types proto-lens proto-lens-protoc text zlib ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -113118,6 +113425,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http2-grpc-types" = callPackage + ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }: + mkDerivation { + pname = "http2-grpc-types"; + version = "0.1.0.0"; + sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl"; + libraryHaskellDepends = [ base binary bytestring proto-lens zlib ]; + description = "Types for gRPC over HTTP2 common for client and servers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { @@ -113538,17 +113856,17 @@ self: { }) {}; "hunspell-hs" = callPackage - ({ mkDerivation, base, criterion, hspec, hunspell, stm }: + ({ mkDerivation, base, criterion, deepseq, hspec, hunspell, stm }: mkDerivation { pname = "hunspell-hs"; - version = "0.1.0.0"; - sha256 = "0jiqgs4akny8kcpl3hdkj08hyknw2p0z96dci6lwq2fv5qprj77i"; + version = "0.2.0.0"; + sha256 = "0wifkv8i83lhi348l1rkjqidpr81zss02zn6brxlva938ir2ncp8"; libraryHaskellDepends = [ base stm ]; - librarySystemDepends = [ hunspell ]; + libraryPkgconfigDepends = [ hunspell ]; testHaskellDepends = [ base hspec stm ]; - testSystemDepends = [ hunspell ]; - benchmarkHaskellDepends = [ base criterion stm ]; - benchmarkSystemDepends = [ hunspell ]; + testPkgconfigDepends = [ hunspell ]; + benchmarkHaskellDepends = [ base criterion deepseq stm ]; + benchmarkPkgconfigDepends = [ hunspell ]; description = "Hunspell thread-safe FFI bindings for spell checking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113850,27 +114168,6 @@ self: { }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-int - , hw-prim, hw-string-parse, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.7.0.2"; - sha256 = "1s0as4d1a80hzx47zpa7qjiwdbgwzg1j4lgqd0grri5scq0iwqiq"; - revision = "1"; - editedCabalFile = "1gvv5ryx1lrgb3hk362fkqz98rggdxfmjp7fy0id7mqvdz6lk2av"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - benchmarkHaskellDepends = [ base criterion hw-prim vector ]; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_0_3" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-int , hw-prim, hw-string-parse, QuickCheck, safe, vector }: @@ -113887,7 +114184,6 @@ self: { benchmarkHaskellDepends = [ base criterion hw-prim vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-conduit" = callPackage @@ -114085,6 +114381,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-ip_0_2_0_2" = callPackage + ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec + , hw-bits, hw-hspec-hedgehog, text + }: + mkDerivation { + pname = "hw-ip"; + version = "0.2.0.2"; + sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7"; + libraryHaskellDepends = [ + attoparsec base generic-lens hw-bits text + ]; + testHaskellDepends = [ + attoparsec base generic-lens hedgehog hspec hw-bits + hw-hspec-hedgehog text + ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, dlist, hspec @@ -114316,36 +114632,36 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.3"; - sha256 = "10sxa42bkrwfbqlkdhv62m1g2dy4zqpsp5iqyd1jx0hal1wlblfm"; + version = "0.6.2.9"; + sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d"; libraryHaskellDepends = [ - base bytestring mmap transformers vector + base bytestring mmap semigroups transformers vector ]; testHaskellDepends = [ base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck transformers vector + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector ]; benchmarkHaskellDepends = [ - base bytestring criterion mmap transformers vector + base bytestring criterion mmap semigroups transformers vector ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_12" = callPackage + "hw-prim_0_6_2_13" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.12"; - sha256 = "10nbmpq8zm5j1jmn45w379rrmjvcssl213pmwh9p4zbnas71ba67"; + version = "0.6.2.13"; + sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -115682,29 +115998,6 @@ self: { }) {}; "hyraxAbif" = callPackage - ({ mkDerivation, base, binary, bytestring, directory, filepath - , hedgehog, hscolour, pretty-show, protolude, text - }: - mkDerivation { - pname = "hyraxAbif"; - version = "0.2.3.9"; - sha256 = "0y9n5mz5hkbbdkw2h979y274x6y45pa9cw9wzbfnfczsjqgxgxs1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text - ]; - executableHaskellDepends = [ - base bytestring hscolour pretty-show protolude text - ]; - testHaskellDepends = [ - base binary bytestring hedgehog protolude text - ]; - description = "Modules for parsing, generating and manipulating AB1 files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hyraxAbif_0_2_3_10" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , hedgehog, hscolour, pretty-show, protolude, text }: @@ -115725,7 +116018,6 @@ self: { ]; description = "Modules for parsing, generating and manipulating AB1 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hzaif" = callPackage @@ -119148,28 +119440,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text - , transformers, unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.3.1.0"; - sha256 = "14kl6nx62qkm19fjn593m62iy4myjwg94yyr38kkbna438n5wpns"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable mtl - safe text transformers unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable lens - mtl QuickCheck safe text transformers unordered-containers - writer-cps-mtl - ]; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "intro_0_3_2_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text , transformers, unordered-containers, writer-cps-mtl @@ -119189,7 +119459,6 @@ self: { ]; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -119682,18 +119951,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ip_1_4_0" = callPackage + "ip_1_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck , quickcheck-classes, test-framework, test-framework-hunit , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "ip"; - version = "1.4.0"; - sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5"; + version = "1.4.1"; + sha256 = "0nzc2xb6xha2sql3aiwhchl2hhfzndlvdm1hc8pbrjw27jcz3hpi"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring deepseq hashable primitive text + vector ]; testHaskellDepends = [ attoparsec base bytestring doctest hspec HUnit QuickCheck @@ -120708,6 +120978,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ival" = callPackage + ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }: + mkDerivation { + pname = "ival"; + version = "0.1.0.0"; + sha256 = "16iffzyhqm160sy6qskfxr0wrbjic9bxrm8y9f1ych7gmzp3cdwk"; + libraryHaskellDepends = [ alg base ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Intervals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ivar-simple" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -121832,8 +122114,8 @@ self: { ({ mkDerivation, base, haskeline, hspec, HUnit }: mkDerivation { pname = "jord"; - version = "0.3.1.0"; - sha256 = "09wf9yzf9jzh4w2iqs0r33hi80ralbriipydbqpb0gx0i2sgwqay"; + version = "0.4.0.0"; + sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -121966,6 +122248,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jps" = callPackage + ({ mkDerivation, base, containers, fingertree, lens, vector }: + mkDerivation { + pname = "jps"; + version = "0.1.0.0"; + sha256 = "0k31r994cw1w79v2zqkj64jhbfyym1j96vawvqc5pvw2mjk1f5in"; + libraryHaskellDepends = [ base containers fingertree lens vector ]; + description = "Jump point search for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "js-flot" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { @@ -122662,6 +122955,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json-rpc-generic_0_2_1_5" = callPackage + ({ mkDerivation, aeson, aeson-generic-compat, base, containers + , dlist, QuickCheck, quickcheck-simple, scientific, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "json-rpc-generic"; + version = "0.2.1.5"; + sha256 = "1h1spyiq5xix3rbjdk37a28l6l46zygvxafdhaa466hyn2j7p4cz"; + libraryHaskellDepends = [ + aeson aeson-generic-compat base containers dlist scientific text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base QuickCheck quickcheck-simple text + ]; + description = "Generic encoder and decode for JSON-RPC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-rpc-server" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl , test-framework, test-framework-hunit, text, unordered-containers @@ -126342,10 +126656,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.2"; - sha256 = "1x5nm59nx2dwjxqrz8r0f6wg5szxcsvidqd9pjzh1znlxbzy3s6i"; - revision = "1"; - editedCabalFile = "0dzijl82zynk73ahd3rzkv7x86qpbn36hp558vwmcvd84qq0hbqf"; + version = "1.7.0.3"; + sha256 = "0lmqic0pwn1f5l5zm3830ipyfjv6cj799kzgx0ia0mdy9wh8pfg9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -126545,6 +126857,8 @@ self: { pname = "language-docker"; version = "6.0.4"; sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; + revision = "1"; + editedCabalFile = "0la3l8m32zmgb4nk4fwchy1abip0k1b0x1i9205dih136g1iaq62"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -127147,6 +127461,51 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-puppet_1_3_20_1" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, exceptions, filecache, filepath + , formatting, Glob, hashable, hruby, hslogger, hspec + , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson + , megaparsec, memory, mtl, operational, optparse-applicative + , parallel-io, parsec, pcre-utils, process, protolude, random + , regex-pcre-builtin, scientific, servant, servant-client, split + , stm, strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.20.1"; + sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory exceptions + filecache filepath formatting hashable hruby hslogger hspec + http-api-data http-client lens lens-aeson megaparsec memory mtl + operational parsec pcre-utils process protolude random + regex-pcre-builtin scientific servant servant-client split stm + strict-base-types text time transformers unix unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers Glob hslogger + http-client lens megaparsec mtl optparse-applicative parallel-io + regex-pcre-builtin strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils protolude scientific strict-base-types temporary text + transformers unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -128178,6 +128537,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_7_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.7.3"; + sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -132329,8 +132701,8 @@ self: { ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "loc"; - version = "0.1.3.2"; - sha256 = "1p8df8jyddma3mk54azgiqf6adlq0l4g00cjffdvx8bk30xnrank"; + version = "0.1.3.3"; + sha256 = "0vnnw8ix38r441czsgmcwn7iavvmy6v5c12qflhz0ah055ahl8xa"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; @@ -132342,8 +132714,8 @@ self: { ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.2"; - sha256 = "06yccmyxk7cvkxjra28ardxc61h6h59w0rw08d27llppfjh5bn01"; + version = "0.1.3.3"; + sha256 = "148nc6qy4afrw707kvq7k1052pfj717apsmr2b98x8w5xcc7f567"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; @@ -134697,8 +135069,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.1.0"; - sha256 = "0x1i311281pswpcgwgjfhk4x2576h8ycg1i3ira29hyph1q0r7a0"; + version = "0.2.0"; + sha256 = "05x0c05h3k8c1qrxmmi4dlj1wxpmfqj6n3man5cqpqp0sxayxv9c"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -134764,8 +135136,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.11"; - sha256 = "1s924yvbk89xsl0zlm1shpc942q6nzi7fqqki8mlhj3ymqrgsv1k"; + version = "4.0.2.12"; + sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -136592,6 +136964,8 @@ self: { pname = "matrix"; version = "0.3.6.1"; sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs"; + revision = "1"; + editedCabalFile = "0iy0gdgg68ldhgm4lzvzl5pmzflx0r4brdbdkq75rkarm7cigawn"; libraryHaskellDepends = [ base deepseq loop primitive semigroups vector ]; @@ -138557,6 +138931,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-ghc_0_4_9_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.9.1"; + sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -138605,6 +138995,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_2_2" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.2.2"; + sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -139620,6 +140028,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mixpanel-client" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec + , hspec-discover, http-client, http-client-tls, markdown-unlit + , servant, servant-client, string-conv, text, time + }: + mkDerivation { + pname = "mixpanel-client"; + version = "0.1.0.0"; + sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring http-client http-client-tls + servant servant-client string-conv text time + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring hspec http-client + http-client-tls servant servant-client string-conv text time + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Mixpanel client"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -139730,8 +140160,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "5"; - editedCabalFile = "1m4l42g519hnzjaafsnbjcfr0nrf28x1lmc1kjh5swrg6qd3kf29"; + revision = "6"; + editedCabalFile = "13cn8nkqj0zl26rgs01rspb2mz6gq1a6ax3g5bygdphvwzraswc5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139945,33 +140375,6 @@ self: { }) {}; "modern-uri" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-megaparsec - , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged - , template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.2.1.0"; - sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; - revision = "5"; - editedCabalFile = "089smjciwx6iav6wqpxhwdzlm0d1jdmgcgjv0r2c4vqrwdd1wb4h"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "modern-uri_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck @@ -139995,7 +140398,6 @@ self: { ]; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -143363,17 +143765,6 @@ self: { }) {}; "multipart" = callPackage - ({ mkDerivation, base, bytestring, parsec }: - mkDerivation { - pname = "multipart"; - version = "0.1.2"; - sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"; - libraryHaskellDepends = [ base bytestring parsec ]; - description = "HTTP multipart split out of the cgi package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "multipart_0_1_3" = callPackage ({ mkDerivation, base, bytestring, parsec, stringsearch }: mkDerivation { pname = "multipart"; @@ -143382,7 +143773,6 @@ self: { libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "HTTP multipart split out of the cgi package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multipart-names" = callPackage @@ -144251,8 +144641,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.6"; - sha256 = "1n7mdyz781cr0mmfcrj8agx3zdd6qh7hlb98kd63bz9msri4zfrz"; + version = "1.1.7"; + sha256 = "1887z2im418rzkqin2mk7f839qgvv4snnxm2qzlcnym89hspz37w"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -144941,11 +145331,11 @@ self: { }) {}; "nakadi-client" = callPackage - ({ mkDerivation, aeson, aeson-casing, async, async-timer, base - , bytestring, classy-prelude, conduit, conduit-extra, containers - , exceptions, fast-logger, hashable, http-client, http-client-tls - , http-conduit, http-types, iso8601-time, lens, lens-aeson - , lifted-async, monad-control, monad-logger, mtl, random, resourcet + ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, async-timer + , base, bytestring, classy-prelude, conduit, conduit-extra + , containers, exceptions, fast-logger, hashable, http-client + , http-client-tls, http-conduit, http-types, iso8601-time, lens + , lens-aeson, monad-control, monad-logger, mtl, random, resourcet , retry, safe-exceptions, say, scientific, split, stm, stm-chans , stm-conduit, tasty, tasty-hunit, template-haskell, text, time , transformers, transformers-base, unliftio, unliftio-core @@ -144953,24 +145343,24 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.5.1.0"; - sha256 = "1g8jddskklbcirgb35b71lbgkm492rfhbx50kipi5wrnh0r4zh67"; + version = "0.6.0.0"; + sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; libraryHaskellDepends = [ - aeson aeson-casing async-timer base bytestring conduit + aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client http-client-tls http-conduit http-types iso8601-time lens monad-control monad-logger mtl resourcet retry safe-exceptions - scientific split stm template-haskell text time transformers - transformers-base unliftio unliftio-core unordered-containers uuid - vector + scientific split stm stm-chans template-haskell text time + transformers transformers-base unliftio unliftio-core + unordered-containers uuid vector ]; testHaskellDepends = [ - aeson aeson-casing async async-timer base bytestring classy-prelude - conduit conduit-extra containers exceptions fast-logger hashable - http-client http-client-tls http-conduit http-types iso8601-time - lens lens-aeson lifted-async monad-control monad-logger mtl random - resourcet retry safe-exceptions say scientific split stm stm-chans - stm-conduit tasty tasty-hunit template-haskell text time + aeson aeson-casing aeson-qq async async-timer base bytestring + classy-prelude conduit conduit-extra containers exceptions + fast-logger hashable http-client http-client-tls http-conduit + http-types iso8601-time lens lens-aeson monad-control monad-logger + mtl random resourcet retry safe-exceptions say scientific split stm + stm-chans stm-conduit tasty tasty-hunit template-haskell text time transformers transformers-base unliftio unliftio-core unordered-containers uuid vector wai warp ]; @@ -146459,8 +146849,8 @@ self: { pname = "network"; version = "2.7.0.2"; sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf"; - revision = "1"; - editedCabalFile = "06pc3iybcn9dyvx7q3qh6cczalb0bfinbay8pjhcahg6mwvgf32s"; + revision = "2"; + editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -147879,23 +148269,23 @@ self: { }) {}; "nirum" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmark - , containers, directory, email-validate, filepath, fsnotify - , heterocephalus, hlint, hspec, hspec-core, hspec-meta, htoml - , interpolatedstring-perl6, megaparsec, mtl, optparse-applicative - , parsec, pretty, process, semigroups, semver, shakespeare, stm - , string-qq, template-haskell, temporary, text, turtle - , unordered-containers, uri + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , cmark-gfm, containers, directory, email-validate, filepath + , fsnotify, heterocephalus, hlint, hspec, hspec-core, hspec-meta + , htoml, hxt, interpolatedstring-perl6, megaparsec, mtl + , optparse-applicative, parsec, pretty, process, semigroups, semver + , shakespeare, stm, string-qq, template-haskell, temporary, text + , turtle, unordered-containers, uri }: mkDerivation { pname = "nirum"; - version = "0.3.3"; - sha256 = "0ilrhkfv1q2w49wsj27dssaavw8v5w77vyf2mynb5aam1yax3d3v"; + version = "0.5.0"; + sha256 = "1d754gn0ndfns4490ffiygiwqym8i8ikfabd5mf6yg86arimmvjc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring cmark containers directory - email-validate filepath fsnotify heterocephalus htoml + base blaze-html blaze-markup bytestring cmark-gfm containers + directory email-validate filepath fsnotify heterocephalus htoml interpolatedstring-perl6 megaparsec mtl optparse-applicative parsec pretty semver shakespeare stm template-haskell text unordered-containers uri @@ -147907,7 +148297,7 @@ self: { ]; testHaskellDepends = [ base blaze-html bytestring containers directory email-validate - filepath hlint hspec hspec-core hspec-meta htoml + filepath hlint hspec hspec-core hspec-meta htoml hxt interpolatedstring-perl6 megaparsec mtl parsec pretty process semigroups semver string-qq temporary text turtle unordered-containers @@ -151508,6 +151898,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentok" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-compat, base + , base-compat, base64-string, bytestring, containers, convertible + , either, hscolour, http-client, http-client-tls, http-conduit + , http-types, iproute, jose, lens, monad-time, SHA, strings, text + , time, transformers, unordered-containers, utf8-string, uuid + }: + mkDerivation { + pname = "opentok"; + version = "0.0.4"; + sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-compat base base-compat base64-string + bytestring containers convertible either hscolour http-client + http-client-tls http-conduit http-types iproute jose lens + monad-time SHA strings text time transformers unordered-containers + utf8-string uuid + ]; + description = "An OpenTok SDK for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentype" = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc , microlens, microlens-th, mtl, pretty-hex, time @@ -153026,6 +153438,8 @@ self: { pname = "pandoc"; version = "2.2.1"; sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy"; + revision = "1"; + editedCabalFile = "16f2c7awxbs17xycl3z1x11h7gc7rfzvw7i3pslsn9nms7rz3s3v"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -153211,22 +153625,22 @@ self: { "pandoc-emphasize-code" = callPackage ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types - , process, tasty, tasty-discover, tasty-hspec, tasty-hunit, text - , unordered-containers + , process, semigroups, tasty, tasty-discover, tasty-hspec + , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.3"; - sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; + version = "0.2.4"; + sha256 = "0fz0pkxx64d8bvrsg9s704mhhw9djq74x56dbv5w3y65nch8p3a5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filepath hashable lucid mtl pandoc-types process text - unordered-containers + base filepath hashable lucid mtl pandoc-types process semigroups + text unordered-containers ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ - base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit + base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit text unordered-containers ]; testToolDepends = [ tasty-discover ]; @@ -155216,10 +155630,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.0"; - sha256 = "0z7k6wj4p9192blrxnnmq79km4f6sm8lagp01vznc1gmy1p0w4cg"; - revision = "1"; - editedCabalFile = "1m04dyqqamh9lkkmcbf2dg7ivd5kb2dxqh9b844lr7mk5qganar6"; + version = "0.0.1.1"; + sha256 = "0c572nkkanz9n862q87q5jfpmg17v6flhl4201i67r7fp5icihwr"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -156896,6 +157308,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_4_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.4.2"; + sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -157096,6 +157533,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_8_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.8.2"; + sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + old-locale persistent resource-pool resourcet text time + transformers unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -160331,8 +160797,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.8"; - sha256 = "16n1yzjnfhwkdps8lcjhpnrmbbrvw2n6qsi90vzjxswkwsvp4hi3"; + version = "1.1.1.11"; + sha256 = "0kxk9kxqlxl0j1cq5jvcsgcfggc3xz0qi7a1qw6w1l83gs2vjjrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161626,9 +162092,9 @@ self: { "postgresql-query" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , containers, data-default, derive, exceptions, file-embed - , haskell-src-meta, hreader, hset, inflections, monad-control - , monad-logger, mtl, postgresql-simple, QuickCheck + , containers, data-default, exceptions, file-embed + , generic-arbitrary, haskell-src-meta, hreader, hset, inflections + , monad-control, monad-logger, mtl, postgresql-simple, QuickCheck , quickcheck-assertions, quickcheck-instances, resource-pool , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th , template-haskell, text, th-lift, th-lift-instances, time @@ -161636,8 +162102,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.4.0"; - sha256 = "1f69rjwhww6knivk8gkx82b8xp8hkg0mhb9z2lm69vv3k5fxv8mb"; + version = "3.5.0"; + sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -161647,7 +162113,7 @@ self: { transformers-compat type-fun ]; testHaskellDepends = [ - attoparsec base derive postgresql-simple QuickCheck + attoparsec base generic-arbitrary postgresql-simple QuickCheck quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; @@ -161912,43 +162378,44 @@ self: { }) {}; "postgrest" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base - , base64-bytestring, bytestring, case-insensitive, cassava - , configurator-ng, containers, contravariant, cookie, either - , gitrev, hasql, hasql-pool, hasql-transaction, heredoc - , hjsonschema, hspec, hspec-wai, hspec-wai-json, HTTP, http-types + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator-ng, containers + , contravariant, contravariant-extras, cookie, either, gitrev + , hasql, hasql-pool, hasql-transaction, heredoc, hjsonschema, hspec + , hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe - , scientific, swagger2, text, transformers-base, unix + , scientific, swagger2, text, time, transformers-base, unix , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.4.4.0"; - sha256 = "1dj0gzwjq5psxqmjx0jhbvwa0jlf52dvsbdmbx6ry0yqhsa0yvjr"; + version = "0.5.0.0"; + sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64-bytestring bytestring case-insensitive cassava configurator-ng containers contravariant - cookie either gitrev hasql hasql-pool hasql-transaction heredoc - HTTP http-types insert-ordered-containers interpolatedstring-perl6 - jose lens lens-aeson network-uri optparse-applicative parsec - protolude Ranged-sets regex-tdfa safe scientific swagger2 text - unordered-containers vector wai wai-cors wai-extra - wai-middleware-static + contravariant-extras cookie either gitrev hasql hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jose lens lens-aeson network-uri + optparse-applicative parsec protolude Ranged-sets regex-tdfa safe + scientific swagger2 text time unordered-containers vector wai + wai-cors wai-extra wai-middleware-static ]; executableHaskellDepends = [ - base base64-bytestring bytestring hasql hasql-pool protolude retry - text unix warp + auto-update base base64-bytestring bytestring hasql hasql-pool + protolude retry text time unix warp ]; testHaskellDepends = [ - aeson aeson-qq async base base64-bytestring bytestring + aeson aeson-qq async auto-update base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens - lens-aeson monad-control process protolude regex-tdfa + lens-aeson monad-control process protolude regex-tdfa time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; @@ -162084,8 +162551,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.5"; - sha256 = "1ik30rjpz5hr0n83nq0xdc381lrwir7z1iqcjmlwp3zan9hrnbk2"; + version = "2.0.6"; + sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -162124,8 +162591,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.2.7"; - sha256 = "0pb20brgfc427gig317iyq6ln9z565aqanfm3cmkvgrzbvl9gf9q"; + version = "2.2.8.2"; + sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable primitive profunctors ptr scanner stm text transformers @@ -162793,8 +163260,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "preludeplus"; - version = "0.1.0.3"; - sha256 = "0fbxydbkf8j7v0gb6an5p1phd637xpzipiyq4nwlzdlpkdbpkaav"; + version = "0.1.0.5"; + sha256 = "08sxfgr8xh0rbg9nv3k93970mjcqgjyv1qy0kmwksl11fsih6sr3"; libraryHaskellDepends = [ base containers ]; description = "Generalizes List functions and replaces partials with NonEmpty equivalents"; license = stdenv.lib.licenses.bsd3; @@ -163323,6 +163790,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-instances" = callPackage + ({ mkDerivation, base, base-orphans, primitive, QuickCheck + , quickcheck-classes, quickcheck-instances, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "prim-instances"; + version = "0.1.0.0"; + sha256 = "1l2dvq5mrbxghzrcfd1ik49lzfvly3bq15jrmn1hilvjrsscx7nf"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base base-orphans primitive QuickCheck quickcheck-classes + quickcheck-instances tasty tasty-quickcheck + ]; + description = "prim typeclass instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-ref" = callPackage ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { @@ -164164,6 +164648,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-isomorphic_0_0_3_3" = callPackage + ({ mkDerivation, base, template-haskell, th-data-compat }: + mkDerivation { + pname = "product-isomorphic"; + version = "0.0.3.3"; + sha256 = "1fy1a7xvnz47120z7vq5hrdllgard7cd1whkwwmgpwdsmhn3my8y"; + libraryHaskellDepends = [ base template-haskell th-data-compat ]; + testHaskellDepends = [ base template-haskell ]; + description = "Weaken applicative functor on products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "product-profunctors" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell @@ -164591,20 +165088,20 @@ self: { ({ mkDerivation, base, bifunctors, binary, comonad, cond, container , convert, data-default, deepseq, deriving-compat, either, errors , exceptions, functor-utils, ghc-prim, impossible, lens, lens-utils - , monoid, mtl, neat-interpolation, placeholders, pointed + , monoid, mtl, neat-interpolation, placeholders, pointed, pretty , pretty-show, primitive, raw-strings-qq, recursion-schemes , semigroupoids, string-qq, template-haskell, text, transformers , transformers-base, typelevel, vector }: mkDerivation { pname = "prologue"; - version = "3.2.3"; - sha256 = "1a69283vmxr3ksak6b8hb8ys52gi5r7f1d59l32xfq1ilaswxxwm"; + version = "3.2.4"; + sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils ghc-prim impossible lens lens-utils monoid mtl neat-interpolation - placeholders pointed pretty-show primitive raw-strings-qq + placeholders pointed pretty pretty-show primitive raw-strings-qq recursion-schemes semigroupoids string-qq template-haskell text transformers transformers-base typelevel vector ]; @@ -164764,14 +165261,16 @@ self: { }) {}; "pronounce" = callPackage - ({ mkDerivation, base, binary, containers, filepath, mtl, text }: + ({ mkDerivation, base, binary, containers, filepath, mtl, safe + , text + }: mkDerivation { pname = "pronounce"; - version = "1.1.0.3"; - sha256 = "1agxmm426v8520vbw8maibrsa3qpzf8h8x3i61fk2fflyb45yx8z"; + version = "1.2.0.0"; + sha256 = "10jhkgawgzddqgw1m8hfhzb35szmxy5smy0bapm5vjmqc90b6zw9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary containers filepath mtl text + base binary containers filepath mtl safe text ]; description = "A library for interfacing with the CMU Pronouncing Dictionary"; license = stdenv.lib.licenses.bsd3; @@ -164986,6 +165485,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-arbitrary_0_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.2.2"; + sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc @@ -165008,6 +165523,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-combinators_0_1_0_11" = callPackage + ({ mkDerivation, base, Cabal, data-default-class, HUnit + , lens-family, lens-family-core, proto-lens, proto-lens-protoc + , test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "proto-lens-combinators"; + version = "0.1.0.11"; + sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base data-default-class lens-family proto-lens-protoc transformers + ]; + testHaskellDepends = [ + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit + ]; + description = "Utilities functions to proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text @@ -165038,6 +165575,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_2" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.2"; + sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, protobuf, text @@ -165073,6 +165624,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types_0_3_0_2" = callPackage + ({ mkDerivation, base, Cabal, lens-labels, proto-lens + , proto-lens-protoc, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.3.0.2"; + sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-labels proto-lens proto-lens-protoc text + ]; + libraryToolDepends = [ protobuf ]; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc_0_2_2_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts @@ -165126,6 +165695,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, deepseq, directory, filepath + , haskell-src-exts, lens-family, lens-labels, pretty, process + , proto-lens, protobuf, temporary, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.3.1.2"; + sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class deepseq + directory filepath haskell-src-exts lens-family lens-labels pretty + process proto-lens temporary text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers data-default-class deepseq filepath + haskell-src-exts lens-family proto-lens text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged @@ -165276,6 +165872,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius_0_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, cryptonite + , dlist, memory, template-haskell, text, transformers + }: + mkDerivation { + pname = "protocol-radius"; + version = "0.0.1.1"; + sha256 = "0cd1qr5c2s25136lljqj2xfl8anrrc6m1yf8dpscjil2y4r27629"; + libraryHaskellDepends = [ + base bytestring cereal containers cryptonite dlist memory + template-haskell text transformers + ]; + description = "parser and printer for radius protocol packet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-radius-test" = callPackage ({ mkDerivation, base, bytestring, cereal, containers , protocol-radius, QuickCheck, quickcheck-simple, transformers @@ -165632,6 +166245,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20180825" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20180825"; + sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -166145,13 +166774,26 @@ self: { }) {}; "purescript-iso" = callPackage - ({ mkDerivation, aeson, base, QuickCheck }: + ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring + , containers, monad-control, mtl, QuickCheck, quickcheck-instances + , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string + , uuid, zeromq4-haskell, zeromq4-simple + }: mkDerivation { pname = "purescript-iso"; - version = "0.0.0"; - sha256 = "1vjq778l24waa24br59d3j4wdc3ajw1vk1fbi222vvkqvmcx5x9h"; - libraryHaskellDepends = [ aeson base QuickCheck ]; - testHaskellDepends = [ aeson base QuickCheck ]; + version = "0.0.1.2"; + sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh"; + libraryHaskellDepends = [ + aeson async attoparsec-uri base bytestring containers monad-control + mtl QuickCheck quickcheck-instances stm strict text time + utf8-string uuid zeromq4-haskell zeromq4-simple + ]; + testHaskellDepends = [ + aeson async attoparsec-uri base bytestring containers monad-control + mtl QuickCheck quickcheck-instances stm strict tasty + tasty-quickcheck text time utf8-string uuid zeromq4-haskell + zeromq4-simple + ]; description = "Isomorphic trivial data type definitions over JSON"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167660,21 +168302,32 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, containers - , lifted-async, lifted-base, monad-control, mtl, QuickCheck - , quickcheck-with-counterexamples, random, stm, template-haskell - , th-abstraction + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring + , containers, directory, exceptions, filelock, filepath + , http-client, lifted-async, lifted-base, matrix, monad-control + , monad-logger, mtl, network, persistent, persistent-postgresql + , persistent-template, pretty-show, process, QuickCheck + , quickcheck-instances, random, resourcet, servant, servant-client + , servant-server, split, stm, strict, string-conversions, tasty + , tasty-quickcheck, text, tree-diff, vector, wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.3.1"; - sha256 = "141rs0m67p830n2v30jkpvbqpygqc7i8cka9c9bbycxnwdax5jj4"; + version = "0.4.0"; + sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q"; libraryHaskellDepends = [ - ansi-wl-pprint async base containers lifted-async lifted-base - monad-control mtl QuickCheck quickcheck-with-counterexamples random - stm template-haskell th-abstraction + ansi-wl-pprint async base containers exceptions lifted-async + lifted-base matrix monad-control mtl pretty-show QuickCheck random + split stm tree-diff vector + ]; + testHaskellDepends = [ + base bytestring directory filelock filepath http-client + lifted-async matrix monad-control monad-logger mtl network + persistent persistent-postgresql persistent-template process + QuickCheck quickcheck-instances random resourcet servant + servant-client servant-server strict string-conversions tasty + tasty-quickcheck text tree-diff vector wai warp ]; - testHaskellDepends = [ base ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168294,6 +168947,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radix-tree" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , hashtables, HUnit, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "radix-tree"; + version = "0.1"; + sha256 = "0hdlj97gzqb5rgyj5ybb4kki9b6xrlavcbz7i9w8q81vwjyv8cka"; + libraryHaskellDepends = [ + base bytestring containers deepseq primitive + ]; + testHaskellDepends = [ + base bytestring containers HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq gauge hashtables text + unordered-containers + ]; + description = "Radix tree data structive over short byte-strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "radixtree" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq , microlens, mtl, parsers, QuasiText, smallcheck, store, tasty @@ -169053,6 +169730,8 @@ self: { pname = "rank1dynamic"; version = "0.4.0"; sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw"; + revision = "1"; + editedCabalFile = "1idh1iz15pzdhrhy19584i9ahz41ijbmf56wbb2wns2kipy6w9lr"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -169982,8 +170661,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.0"; - sha256 = "10lg4s6c29xb1j9icda1aywh64ybnk7d3hw3wl69rcwlqp52635a"; + version = "0.5.1"; + sha256 = "0wflw7rpknjj6qpf2ma1cxd03xg5v25rmfrmnli472h55jdcwdnz"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -170528,6 +171207,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-encode" = callPackage + ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + mkDerivation { + pname = "record-encode"; + version = "0.2.2"; + sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + libraryHaskellDepends = [ base generics-sop vector ]; + testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + description = "Generic encoding of records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-gl" = callPackage ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit , linear, OpenGL, record, tagged, template-haskell, test-framework @@ -170648,8 +171339,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "1.1.0.0"; - sha256 = "02ibnagyll2zgr4v472rbmaj9vsp1amvhvd9pvd8d76nj99xwr9j"; + version = "1.2.0.1"; + sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -172624,6 +173315,8 @@ self: { pname = "relude"; version = "0.1.1"; sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; + revision = "1"; + editedCabalFile = "18vil2wa8xzpf0y5r5zdfylsqmphlappzc7a2ac9lmxngfkbzwyc"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -172649,6 +173342,8 @@ self: { pname = "relude"; version = "0.2.0"; sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5"; + revision = "1"; + editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -174321,26 +175016,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog - , tasty-hunit, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.6.2"; - sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hedgehog HUnit mtl - random stm tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_7_6_3" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog , tasty-hunit, time, transformers @@ -174358,7 +175033,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -174731,13 +175405,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rhine_0_4_0_3" = callPackage + "rhine_0_4_0_4" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.4.0.3"; - sha256 = "1s88dga75c835ixw1j59chswiv512sdwwg09p0r5jgsl8lqjp6h7"; + version = "0.4.0.4"; + sha256 = "00s2rsj3h7wamlrh2p7a600pwqlrrishxy2q2f6av0pzyc8dkc89"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174753,8 +175427,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.1"; - sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq"; + version = "0.4.0.4"; + sha256 = "0xbmqhznacmxvcrx1gaq4cy6f98fb2p4f07g16qp50zhs9mb2a63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -177055,6 +177729,113 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-money_0_7" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , hashable, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + , vector-space + }: + mkDerivation { + pname = "safe-money"; + version = "0.7"; + sha256 = "1cwha4s0dckdb7xrh1snxrismzr5gq586l9vmih9gmy2nrrw69y9"; + libraryHaskellDepends = [ + base binary constraints deepseq hashable QuickCheck text + vector-space + ]; + testHaskellDepends = [ + base binary bytestring constraints deepseq hashable tasty + tasty-hunit tasty-quickcheck text vector-space + ]; + description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "safe-money-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, safe-money, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "safe-money-aeson"; + version = "0.1"; + sha256 = "0qifhkyjgxfnfmbmysc4ma3hvyi2l0c238c75wlf5x1hz8q1ka8p"; + libraryHaskellDepends = [ aeson base safe-money text ]; + testHaskellDepends = [ + aeson base bytestring safe-money tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Instances from the aeson library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, safe-money, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "safe-money-cereal"; + version = "0.1"; + sha256 = "02bzl1r4vymnb0xyagzrcgb2kxr892wivyasp7dkn41shgafaqzb"; + libraryHaskellDepends = [ base cereal safe-money ]; + testHaskellDepends = [ + base bytestring cereal safe-money tasty tasty-hunit + tasty-quickcheck + ]; + description = "Instances from the cereal library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-serialise" = callPackage + ({ mkDerivation, base, bytestring, safe-money, serialise, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "safe-money-serialise"; + version = "0.1"; + sha256 = "16h8yf622szzc3v5xa2s7fsjaxk7cx9hqngjn796sdcg681g7xf5"; + libraryHaskellDepends = [ base bytestring safe-money serialise ]; + testHaskellDepends = [ + base bytestring safe-money serialise tasty tasty-hunit + tasty-quickcheck + ]; + description = "Instances from the serialise library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-store" = callPackage + ({ mkDerivation, base, bytestring, safe-money, store, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "safe-money-store"; + version = "0.1"; + sha256 = "0hbqichsmxd3xw1abcdyyyg1rrzfkfmywgj47f4yv6pmmvihrkh8"; + libraryHaskellDepends = [ base bytestring safe-money store ]; + testHaskellDepends = [ + base bytestring safe-money store tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Instances from the store library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-xmlbf" = callPackage + ({ mkDerivation, base, bytestring, safe-money, tasty, tasty-hunit + , tasty-quickcheck, text, xmlbf + }: + mkDerivation { + pname = "safe-money-xmlbf"; + version = "0.1"; + sha256 = "022mcl1gwvwjpjv56938bpklc15r9m6xvsyjhxmnb6d8apjzhpxk"; + libraryHaskellDepends = [ base safe-money text xmlbf ]; + testHaskellDepends = [ + base bytestring safe-money tasty tasty-hunit tasty-quickcheck text + xmlbf + ]; + description = "Instances from the xmlbf library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-plugins" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src-exts , plugins, Unixutils @@ -177115,15 +177896,16 @@ self: { "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra - , haskell-src-meta, microlens, safecopy, template-haskell, uniplate + , haskell-src-meta, microlens, safecopy, template-haskell + , th-abstraction, uniplate }: mkDerivation { pname = "safecopy-migrate"; - version = "0.1.0.0"; - sha256 = "1bs41w8zkgsidns68xv4finsnwici6wrfc6xiy9vk0la96i4wcv5"; + version = "0.2.0"; + sha256 = "14v1zg78v16gs3m4wch134z8qi7bgiadq9f7mvk8vrhajcipjz2a"; libraryHaskellDepends = [ base base-prelude cereal containers extra haskell-src-meta - microlens safecopy template-haskell uniplate + microlens safecopy template-haskell th-abstraction uniplate ]; description = "Making SafeCopy migrations easier"; license = stdenv.lib.licenses.publicDomain; @@ -177883,23 +178665,6 @@ self: { }) {}; "say" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, temporary - , text, transformers - }: - mkDerivation { - pname = "say"; - version = "0.1.0.0"; - sha256 = "0h7w49v9manw7yml2bms11sf6znsfkmdr87c7d8ax8l1xnadnvzj"; - libraryHaskellDepends = [ base bytestring text transformers ]; - testHaskellDepends = [ base bytestring hspec temporary text ]; - benchmarkHaskellDepends = [ - base bytestring criterion temporary text - ]; - description = "Initial project template from stack"; - license = stdenv.lib.licenses.mit; - }) {}; - - "say_0_1_0_1" = callPackage ({ mkDerivation, base, bytestring, gauge, hspec, text, transformers , unliftio }: @@ -177916,7 +178681,6 @@ self: { ]; description = "Send textual messages to a Handle in a thread-friendly way"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp" = callPackage @@ -177945,6 +178709,33 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_4_0" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.4.0"; + sha256 = "13g14lj3ihn55v3cf40hzhp8ypzrl9a6lzarlsmqhr76g6szlpg8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -182263,6 +183054,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_8_0_2" = callPackage + ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign + , text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.8.0.2"; + sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6"; + libraryHaskellDepends = [ base casing servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -182829,8 +183635,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.6"; - sha256 = "068pjw05kn4wq3c7bh29c0kf7h19jz55fwxg9c0jnv0ygmw6k0bi"; + version = "0.6.7"; + sha256 = "0p34wd3g1gg7c6yp018164ky1rqz67wq5fcax6fis0hn3g8qgjm9"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -183280,6 +184086,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.8"; + sha256 = "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to setlocale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -183806,8 +184624,8 @@ self: { ({ mkDerivation, base, shake }: mkDerivation { pname = "shake-elm"; - version = "0.1.0.0"; - sha256 = "1pd2ga35kjcx5zfkvmdwr4rjlcm5b5r8h0kjmjadk4qf5219rwc1"; + version = "0.2.0.1"; + sha256 = "057ph5ai8pswzymln8l6i2hdn1vgi3hwyji1z6s4bh71xnc0sn5r"; libraryHaskellDepends = [ base shake ]; description = "Elm builds in shake"; license = stdenv.lib.licenses.bsd3; @@ -183817,8 +184635,8 @@ self: { ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "3.0.1.0"; - sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm"; + version = "3.1.0.0"; + sha256 = "1lbdz4bv95d0rwfpk1l494lrfd5qp029awbfiv1wpydbvvspdvx6"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -184471,8 +185289,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.2.0"; - sha256 = "0w3fv5fv6ccd8r0rfl5i6cjnfkv4vbk8gcssn2inr8hihwg88kmy"; + version = "0.1.2.1"; + sha256 = "0r4a3m16bn60xg08439ikq99m6xz8vl3yxqmp7dij1xxijx8wwzn"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec ]; description = "Parse strings into words, like a shell would"; @@ -184550,8 +185368,8 @@ self: { }: mkDerivation { pname = "shift"; - version = "0.2.0.3"; - sha256 = "1k4fcb7j66fvdl1nqmx7315s6b9jmzv3dmcvc2sbkfh8m5wm2bby"; + version = "0.2.1.0"; + sha256 = "04949ljq0xi1s0k5llq56idykn6myr4l2hqai9vlqmcj47m5f23j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185492,6 +186310,8 @@ self: { pname = "simple-log"; version = "0.9.6"; sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; + revision = "1"; + editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -186451,8 +187271,8 @@ self: { }: mkDerivation { pname = "sized-grid"; - version = "0.1.1.0"; - sha256 = "0qbn160pq5yz1916iir1s9hy1h4pkar8z50gh7i8v7j4nwhgiisk"; + version = "0.1.1.1"; + sha256 = "0v3350z1p9bmwancn205jbbqj1wwi7f6415jzz3fcypkmyq90bav"; libraryHaskellDepends = [ adjunctions aeson base comonad constraints distributive generics-sop lens mtl random vector vector-space @@ -189515,6 +190335,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "softfloat-hs" = callPackage + ({ mkDerivation, base, softfloat }: + mkDerivation { + pname = "softfloat-hs"; + version = "0.1.0"; + sha256 = "03ipzfr46gp6rz6vm8y3gwdpbpa6mxxmskcaz5ng8jpj570qq88k"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ softfloat ]; + description = "Haskell bindings for SoftFloat"; + license = stdenv.lib.licenses.bsd3; + }) {softfloat = null;}; + "solga" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck @@ -190186,8 +191018,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.5.0.0"; - sha256 = "0hkvpr9l5x7gjwzskr0ci62mr3mzg0yfdbvdsjwrn37201cajmg2"; + version = "0.5.0.1"; + sha256 = "0454q9laaasdqrd74cjcxfcl5z7jcfvnzpdg81gl58y2ay8z4769"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -190359,12 +191191,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "speculate_0_3_3" = callPackage + "speculate_0_3_4" = callPackage ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.3"; - sha256 = "1x0vikgx09j842h1q4gzmndq16yr5514np17qaqfrc8578g9wfkf"; + version = "0.3.4"; + sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -191742,8 +192574,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "7"; - editedCabalFile = "08i636hsi0znrm3ma7z2wknma06aa4xzfqwy0z4x9d7vn7fscm48"; + revision = "8"; + editedCabalFile = "0jz9cg3w71nvxc4y6hrwjayxl2291q5xm5r4qrhz1ag1lvzk26yn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -193292,8 +194124,8 @@ self: { }: mkDerivation { pname = "stitch"; - version = "0.5.0.0"; - sha256 = "0dk9h9arldzwsfg8cad374w7lipi4w43ady7dsmima4jyg4724h9"; + version = "0.6.0.0"; + sha256 = "1pk2snnvdn9f7xpnhgffzdqxps4spgvmcrbhjdfwpjxrlnxgviq9"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; @@ -194002,6 +194834,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_25_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.25.0"; + sha256 = "0blrdrqhjh3cfddx8y3ra3vzicrcp8zin8fxnjk8hpz546d3a5a4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -194720,8 +195577,8 @@ self: { }: mkDerivation { pname = "strelka"; - version = "2.0.2.1"; - sha256 = "0wh702y5m7045jlr3qf2k852x68d7ylr16hanb6jjw2f476fnc7i"; + version = "2.0.2.2"; + sha256 = "14n4wk7xzqrl795flxvks7kzf9mm93b626r2x657xjsy7rwkw7y3"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media @@ -196462,8 +197319,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.2.1"; - sha256 = "00xzsx7ssii7i8h7m2g99vq54q8xb1191vi0sn8cg6a2bdfl74hd"; + version = "0.2.2"; + sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq lens mtl parsec profunctors readable semigroupoids @@ -199837,6 +200694,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tax" = callPackage + ({ mkDerivation, base, dollaridoos, profunctors, semigroups }: + mkDerivation { + pname = "tax"; + version = "0.2.0.0"; + sha256 = "13911rksr268v2jbdm7kkwlglni7s8lb417lryr7m2x9vfg31jqb"; + libraryHaskellDepends = [ + base dollaridoos profunctors semigroups + ]; + description = "Types and combinators for taxes"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "tbox" = callPackage ({ mkDerivation, array, base, binary, cautious-file, containers , directory, filepath, IfElse, monad-loops, mtl, random @@ -201063,8 +201933,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "0.2.0.0"; - sha256 = "0y5f4k6f2cs6x7p8qrfi7nwy46arap8v87algxg3iixw30c325lc"; + version = "0.2.1.0"; + sha256 = "1js9sj0gj4igigdnbc5ygbn5l2wfhbrm1k565y3advi99imidsd3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -201875,8 +202745,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.5.3"; - sha256 = "0488dy3x2gvwvnsmjs7g35pra9m1yqvqzw0klkhijsiaxnc4x95f"; + version = "0.5.3.1"; + sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -201890,15 +202760,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_5_3_1" = callPackage + "text-builder_0_5_4_1" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "text-builder"; - version = "0.5.3.1"; - sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q"; + version = "0.5.4.1"; + sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -202149,6 +203019,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-ldap_0_1_1_13" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.13"; + sha256 = "0d1a7932999yx98hjvnrap1lpm9jcfg34m2m0hdy4j1m6cq4q5zc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-lens" = callPackage ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { @@ -202355,6 +203247,8 @@ self: { pname = "text-region"; version = "0.3.1.0"; sha256 = "1zy5zb7xg1343hlkwawnbca7f6gal9028ps1kp83fg2vmq1aqk57"; + revision = "1"; + editedCabalFile = "1z5l1hv8sc4ida5s4r03ihak612lrq0rf7sdfkw7gf05f67c622p"; libraryHaskellDepends = [ aeson base base-unicode-symbols bytestring groups lens text ]; @@ -202916,6 +203810,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_0_2_7" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.0.2.7"; + sha256 = "0yjfz9iwz0n2wx2c7wjazhwh23ny43fmnjp7dn7m37p320jgzahk"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -203104,6 +204010,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift_0_7_11" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.7.11"; + sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, vector @@ -203216,6 +204138,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.5"; + sha256 = "171m4fibjq4ml33xvbb0qdm625adknsdgz8flb4xhag075z2w6xg"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -204106,16 +205040,16 @@ self: { "tidal" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit - , text, time, websockets + , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty + , tasty-hunit, text, time, websockets }: mkDerivation { pname = "tidal"; - version = "0.9.9"; - sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr"; + version = "0.9.10"; + sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw"; libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe text time websockets + base colour containers hashable hosc mersenne-random-pure64 + monad-loops mtl parsec safe text time websockets ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Pattern language for improvised music"; @@ -204440,6 +205374,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-locale-compat_0_1_1_5" = callPackage + ({ mkDerivation, base, old-locale, time }: + mkDerivation { + pname = "time-locale-compat"; + version = "0.1.1.5"; + sha256 = "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7"; + libraryHaskellDepends = [ base old-locale time ]; + description = "Compatibile module for time-format locale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-locale-vietnamese" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -205891,6 +206837,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tomland_0_4_0" = callPackage + ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec + , megaparsec, mtl, parser-combinators, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "tomland"; + version = "0.4.0"; + sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hashable megaparsec mtl parser-combinators text time + transformers unordered-containers + ]; + executableHaskellDepends = [ base text time unordered-containers ]; + testHaskellDepends = [ + base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog + tasty-hspec text time unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "Bidirectional TOML parser"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-generic, text @@ -209519,25 +210492,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.2.0"; - sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_3_0" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers }: @@ -209554,7 +210508,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -209781,8 +210734,10 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.2.0"; - sha256 = "14r8rnx3akx1sr48ksmp2g88dyy73innn9bwbw2yjb7n76k5kfa4"; + version = "0.3.0"; + sha256 = "0d5a2zfb75fallp9q8sz1av8ncvsnmqg6dfjqcghz0grfpwmn7bf"; + revision = "1"; + editedCabalFile = "102lwg5rl1628j3v331xj93cgvr9ppmphyjlqli4gm5vxgrkwsfv"; libraryHaskellDepends = [ base containers ghc-prim primitive vector ]; @@ -209833,8 +210788,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.3.1"; - sha256 = "16jysdh7v8336xkhl6vzni5zj301jsgawwxy8fcrd74p87am2k05"; + version = "0.7.0.1"; + sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -211472,6 +212427,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-compat_0_5_1" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "unix-compat"; + version = "0.5.1"; + sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; + libraryHaskellDepends = [ base unix ]; + description = "Portable POSIX-compatibility layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var }: mkDerivation { @@ -212504,6 +213471,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "urlpath_9_0_0_1" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl, path + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "9.0.0.1"; + sha256 = "009836gw2gmmjb08nqqdklpr967gfnnnk1r5lpy3wjyspky03vgv"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path path-extra resourcet + split strict text transformers transformers-base vector + ]; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urn" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -212849,6 +213836,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util_0_1_11_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "util"; + version = "0.1.11.0"; + sha256 = "16qi0w19hy7y4az4dxnsvn5cjc7lg5zb9vv0jjzifky9dkssbicb"; + libraryHaskellDepends = [ base ]; + description = "Utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "util-exception" = callPackage ({ mkDerivation, base, basic, control, lifted-base-tf, util }: mkDerivation { @@ -212876,6 +213875,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util-primitive" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "util-primitive"; + version = "0.1.0.0"; + sha256 = "193y0fvr0szpdhg7ysvj99mfm983yvrmvpq77gv994vyjigq4y6w"; + libraryHaskellDepends = [ base primitive ]; + description = "Primitive memory-related utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -213541,6 +214551,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-bytestring_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, validity }: + mkDerivation { + pname = "validity-bytestring"; + version = "0.4.0.0"; + sha256 = "0zf722rm2s5p64bs1vl7fw1swa2svz2lk8w51bh235zds8bg11jc"; + libraryHaskellDepends = [ base bytestring validity ]; + description = "Validity instances for bytestring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -213568,6 +214590,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-path_0_3_0_2" = callPackage + ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path + , validity + }: + mkDerivation { + pname = "validity-path"; + version = "0.3.0.2"; + sha256 = "0ip1qm6sip1yxbrcx9zn2saipd6bfs88cgn5jd3pw9ffkydxm74p"; + libraryHaskellDepends = [ base filepath path validity ]; + testHaskellDepends = [ + base filepath genvalidity-hspec hspec path validity + ]; + description = "Validity instances for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "validity-primitive" = callPackage + ({ mkDerivation, base, primitive, validity }: + mkDerivation { + pname = "validity-primitive"; + version = "0.0.0.0"; + sha256 = "05y5zbirqyqjpdvvxhkaai60hzzwmvshzvkk7j376yjsg8sas4x0"; + libraryHaskellDepends = [ base primitive validity ]; + description = "Validity instances for primitive"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-scientific" = callPackage ({ mkDerivation, base, scientific, validity }: mkDerivation { @@ -213579,6 +214629,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific_0_2_0_2" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.2.0.2"; + sha256 = "1hcdv8s7qfcrgc8hn335dzxx3q5qqbviwp4bf4lwnzbw611slcl1"; + libraryHaskellDepends = [ base scientific validity ]; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -213590,6 +214652,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.1.0"; + sha256 = "0r22pipimzlznkv164n3pw3063v7yxz2l04m74y5j1zajxpg5lzd"; + libraryHaskellDepends = [ base bytestring text validity ]; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -213601,6 +214675,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-time_0_2_0_2" = callPackage + ({ mkDerivation, base, time, validity }: + mkDerivation { + pname = "validity-time"; + version = "0.2.0.2"; + sha256 = "0rg28pgicn8ycdswszbc070587pblbxdzl6mc082l9rgz3g4mcji"; + libraryHaskellDepends = [ base time validity ]; + description = "Validity instances for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-unordered-containers" = callPackage ({ mkDerivation, base, hashable, unordered-containers, validity }: mkDerivation { @@ -213614,6 +214700,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers_0_2_0_2" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.2.0.2"; + sha256 = "06qq6rdzcb0l145653fdrbyf18fci49v85mq8c0sjhhfr22pwm2h"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-uuid" = callPackage ({ mkDerivation, base, uuid, validity }: mkDerivation { @@ -213625,6 +214725,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-uuid_0_1_0_2" = callPackage + ({ mkDerivation, base, uuid, validity }: + mkDerivation { + pname = "validity-uuid"; + version = "0.1.0.2"; + sha256 = "0k2nkkc69m2j4aj3fjfd1i0cg4nli1g44nxdf5liv59hhvk33p4m"; + libraryHaskellDepends = [ base uuid validity ]; + description = "Validity instances for uuid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-vector" = callPackage ({ mkDerivation, base, hashable, validity, vector }: mkDerivation { @@ -213636,6 +214748,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-vector_0_2_0_2" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.2.0.2"; + sha256 = "0y6fhcdyd42nynf2lavdx9pnhy8ylqfkq1yickx2ap4w5hc61k57"; + libraryHaskellDepends = [ base hashable validity vector ]; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valor" = callPackage ({ mkDerivation, base, hspec, text, transformers }: mkDerivation { @@ -214165,6 +215289,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-algorithms_0_7_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, primitive + , QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.7.0.4"; + sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring primitive vector ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + description = "Efficient algorithms for vector arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -214531,8 +215674,8 @@ self: { }: mkDerivation { pname = "vector-text"; - version = "1.1.3"; - sha256 = "00x35fv78vp8rffvd7hsccl8vdxzzdzjrqzwvj0mr6g1wmg3p4i3"; + version = "1.1.5"; + sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir"; libraryHaskellDepends = [ base binary prologue text vector vector-binary-instances ]; @@ -214700,14 +215843,34 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.2.0.0"; - sha256 = "1c35s0hv6wgyr40ky7yh7ajv0jhphfb8m53zn9a59v7nibp476mq"; + version = "0.3.0.0"; + sha256 = "12d5xxc8i0ldbsb6y22f9gvk0d61nrgjz3yf7ppvqrzhilgs6yyf"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; license = stdenv.lib.licenses.asl20; }) {}; + "versioning-servant" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec + , hspec-wai, http-media, servant, servant-server, versioning, wai + , wai-extra + }: + mkDerivation { + pname = "versioning-servant"; + version = "0.1.0.0"; + sha256 = "14a1fk2mgcjjlb1z01xb5ngf496kpfr2y588265zn72q54a7l08k"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-media servant versioning + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-wai servant servant-server + versioning wai wai-extra + ]; + description = "Servant combinators for the versioning library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "versions" = callPackage ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable , megaparsec, microlens, QuickCheck, tasty, tasty-hunit @@ -215948,8 +217111,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.24.0"; - sha256 = "0dxqvfnm7yr3dvsxr8jdfxaw46as4g6n1jniz2b0gfsjs59h3hkf"; + version = "3.0.24.1"; + sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215967,7 +217130,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_24_1" = callPackage + "wai-extra_3_0_24_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -215978,8 +217141,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.24.1"; - sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604"; + version = "3.0.24.2"; + sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218844,8 +220007,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.6"; - sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij"; + version = "1.0.8"; + sha256 = "1ylwq1087x6ppn5y5krvl6q6fxcln58y8fwbah3ygp0cpgm4w816"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219607,22 +220770,6 @@ self: { }) {}; "wl-pprint-annotated" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit - , text - }: - mkDerivation { - pname = "wl-pprint-annotated"; - version = "0.1.0.0"; - sha256 = "0c2996x5gdrif1l0lfwlqnka7xp5diac74rckv0jasv2i0333kmp"; - libraryHaskellDepends = [ base containers deepseq text ]; - testHaskellDepends = [ - base containers deepseq tasty tasty-hunit text - ]; - description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wl-pprint-annotated_0_1_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit , text }: @@ -219636,7 +220783,6 @@ self: { ]; description = "Pretty printer with annotation support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-ansiterm" = callPackage @@ -219657,23 +220803,6 @@ self: { }) {}; "wl-pprint-console" = callPackage - ({ mkDerivation, base, bytestring, colorful-monoids, text - , wl-pprint-annotated - }: - mkDerivation { - pname = "wl-pprint-console"; - version = "0.1.0.1"; - sha256 = "1z3h7g5ws83m0h42yfdifyrvzy3j711jk9p1malgd2zp2jmgdix7"; - revision = "1"; - editedCabalFile = "1mlbjjk5mhv3jxzqvfspm07di09pns0xfalhx68k2r39z4lj1fa5"; - libraryHaskellDepends = [ - base bytestring colorful-monoids text wl-pprint-annotated - ]; - description = "Wadler/Leijen pretty printer supporting colorful console output"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wl-pprint-console_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, colorful-monoids, text , wl-pprint-annotated }: @@ -219686,7 +220815,6 @@ self: { ]; description = "Wadler/Leijen pretty printer supporting colorful console output"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-extras" = callPackage @@ -220552,20 +221680,6 @@ self: { }) {}; "writer-cps-mtl" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; - version = "0.1.1.4"; - sha256 = "0w2843z499d4nvx8jkq398rzp0zwqp4aydwqidpdrh2xdavv78v2"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_5" = callPackage ({ mkDerivation, base, mtl, transformers, writer-cps-transformers }: mkDerivation { @@ -220577,21 +221691,9 @@ self: { ]; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "writer-cps-transformers"; - version = "0.1.1.3"; - sha256 = "1bjarnjz4v07wnkaqn46mrhxvy2f9anq6aw6lq3cf4xlzlr2i8la"; - libraryHaskellDepends = [ base transformers ]; - description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-transformers_0_1_1_4" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; @@ -220600,7 +221702,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wryte" = callPackage @@ -222587,8 +223688,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.27"; - sha256 = "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l"; + version = "0.28"; + sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -222621,30 +223722,25 @@ self: { "xmonad" = callPackage ({ mkDerivation, base, containers, data-default, directory , extensible-exceptions, filepath, mtl, process, QuickCheck - , semigroups, setlocale, unix, utf8-string, X11 + , setlocale, unix, utf8-string, X11 }: mkDerivation { pname = "xmonad"; - version = "0.14"; - sha256 = "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4"; - revision = "1"; - editedCabalFile = "0jkqbbm8allsaa412h8kdb6v64qcwqnpr2p6qxy21zy0jqdkhkp5"; + version = "0.14.2"; + sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers data-default directory extensible-exceptions - filepath mtl process semigroups setlocale unix utf8-string X11 + filepath mtl process setlocale unix utf8-string X11 ]; executableHaskellDepends = [ base mtl unix X11 ]; testHaskellDepends = [ base containers extensible-exceptions QuickCheck X11 ]; postInstall = '' - shopt -s globstar - mkdir -p $doc/share/man/man1 - mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/ - rm "$data/"**"/man/"* + install -D man/xmonad.1 $doc/share/man/man1/xmonad.1 + install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -222788,6 +223884,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmonad-spotify" = callPackage + ({ mkDerivation, base, containers, dbus, X11, xmonad + , xmonad-contrib + }: + mkDerivation { + pname = "xmonad-spotify"; + version = "0.1.0.0"; + sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm"; + libraryHaskellDepends = [ + base containers dbus X11 xmonad xmonad-contrib + ]; + description = "Bind media keys to work with Spotify"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-utils" = callPackage ({ mkDerivation, base, ghc, random, unix, X11 }: mkDerivation { @@ -222802,21 +223913,22 @@ self: { }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, composition-prelude, containers, hspec - , process, X11, xmonad, xmonad-contrib + ({ mkDerivation, alsa-mixer, base, composition-prelude, containers + , hspec, process, X11, xmonad, xmonad-contrib, xmonad-spotify + , xmonad-volume }: mkDerivation { pname = "xmonad-vanessa"; - version = "1.0.0.0"; - sha256 = "0ng624nf879da2skkw00m5x1v6kavcb7pkb57sxbq0dbyhpic50f"; + version = "2.0.0.0"; + sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base composition-prelude containers process X11 xmonad + alsa-mixer base composition-prelude containers process X11 xmonad xmonad-contrib ]; executableHaskellDepends = [ - base containers xmonad xmonad-contrib + base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume ]; testHaskellDepends = [ base hspec xmonad ]; description = "Custom xmonad, which builds with stack or cabal"; @@ -222824,6 +223936,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmonad-volume" = callPackage + ({ mkDerivation, alsa-mixer, base, composition-prelude, containers + , X11, xmonad + }: + mkDerivation { + pname = "xmonad-volume"; + version = "0.1.0.0"; + sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx"; + libraryHaskellDepends = [ + alsa-mixer base composition-prelude containers X11 xmonad + ]; + description = "XMonad volume controls"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-wallpaper" = callPackage ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { @@ -223498,9 +224625,9 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, mockery - , resourcet, scientific, semigroups, template-haskell, temporary - , text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, resourcet, scientific, semigroups, template-haskell + , temporary, text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; @@ -223514,6 +224641,7 @@ self: { filepath resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; + librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers directory filepath hspec HUnit mockery resourcet scientific @@ -223522,36 +224650,38 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) libyaml;}; - "yaml_0_9_0" = callPackage + "yaml_0_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, mockery - , resourcet, scientific, semigroups, template-haskell, temporary - , text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups + , template-haskell, temporary, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.9.0"; - sha256 = "05mw3d6k2dahdsajghgbqhlk84x6iym6bci1g1qhpy4k2cfjyjzc"; + version = "0.10.0"; + sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text + filepath mtl resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; + librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit mockery resourcet scientific - semigroups template-haskell temporary text transformers + directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet + scientific semigroups template-haskell temporary text transformers unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop @@ -224678,8 +225808,8 @@ self: { pname = "yesod-bin"; version = "1.6.0.3"; sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "2"; - editedCabalFile = "0h4nam6zkhz7km0z5z3zngnrgif7a42llvh013iava171kadn8xp"; + revision = "3"; + editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -227494,6 +228624,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zeromq4-simple" = callPackage + ({ mkDerivation, aeson, base, bytestring, constraints, hashable + , uuid, zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-simple"; + version = "0.0.0"; + sha256 = "04i8ksdyf19yywjb0gfkbc0mx90vzvrld5ba7lbnlxvx6iwmah66"; + libraryHaskellDepends = [ + aeson base bytestring constraints hashable uuid zeromq4-haskell + ]; + description = "More constrained extensions to zeromq4-haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb From 60cc518b22ed6ebb6e37a507c7c430e42bce2cec Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 20 Aug 2018 21:05:28 -0400 Subject: [PATCH 043/138] xmonad: update nix patch Regenerated against the current release. --- .../haskell-modules/patches/xmonad-nix.patch | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch index 2a9ec4bfedf..cce011347f4 100644 --- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch +++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch @@ -1,8 +1,8 @@ diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs -index 138d735..65b5a84 100644 +index 7810522..3262934 100644 --- a/src/XMonad/Core.hs +++ b/src/XMonad/Core.hs -@@ -51,6 +51,7 @@ import System.Posix.Types (ProcessID) +@@ -53,6 +53,7 @@ import System.Posix.Types (ProcessID) import System.Process import System.Directory import System.Exit @@ -10,7 +10,7 @@ index 138d735..65b5a84 100644 import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event) import Data.Typeable -@@ -571,6 +572,7 @@ recompile force = io $ do +@@ -601,6 +602,7 @@ recompile force = io $ do lib = cfgdir "lib" buildscript = cfgdir "build" @@ -18,7 +18,7 @@ index 138d735..65b5a84 100644 libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib srcT <- getModTime src binT <- getModTime bin -@@ -586,7 +588,7 @@ recompile force = io $ do +@@ -643,7 +645,7 @@ recompile force = io $ do status <- bracket (openFile err WriteMode) hClose $ \errHandle -> waitForProcess =<< if useBuildscript then compileScript bin cfgdir buildscript errHandle @@ -27,24 +27,24 @@ index 138d735..65b5a84 100644 -- re-enable SIGCHLD: installSignalHandlers -@@ -594,6 +596,7 @@ recompile force = io $ do - -- now, if it fails, run xmessage to let the user know: - when (status /= ExitSuccess) $ do - ghcErr <- readFile err -+ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") - let msg = unlines $ - ["Error detected while loading xmonad configuration file: " ++ src] - ++ lines (if null ghcErr then show status else ghcErr) -@@ -601,7 +604,7 @@ recompile force = io $ do - -- nb, the ordering of printing, then forking, is crucial due to - -- lazy evaluation - hPutStrLn stderr msg -- forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing -+ forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing - return () +@@ -653,6 +655,7 @@ recompile force = io $ do + then trace "XMonad recompilation process exited with success!" + else do + ghcErr <- readFile err ++ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") + let msg = unlines $ + ["Error detected while loading xmonad configuration file: " ++ src] + ++ lines (if null ghcErr then show status else ghcErr) +@@ -660,7 +663,7 @@ recompile force = io $ do + -- nb, the ordering of printing, then forking, is crucial due to + -- lazy evaluation + hPutStrLn stderr msg +- forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing ++ forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing + return () return (status == ExitSuccess) else return True -@@ -619,16 +622,16 @@ recompile force = io $ do +@@ -678,16 +681,16 @@ recompile force = io $ do '\8216' -> '`' -- ‘ '\8217' -> '`' -- ’ _ -> c From 97a4d29545231dc2ee84b32757d735ad42bfb068 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 20 Aug 2018 22:22:10 +0200 Subject: [PATCH 044/138] haskell: disable library profiling for static executables Haskell packages overridden with justStaticExecutables (like cabal-install, stack, pandoc, darcs, etc.) don't provide libraries in the end result so it's futile to build them with library profiling enabled because it will just take extra time. --- pkgs/development/haskell-modules/lib.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 54616abc4ba..106b66c6b41 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -234,6 +234,7 @@ rec { */ justStaticExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; + enableLibraryProfiling = false; isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; From d6b418cb12b1798801572d7c5e2988ebe3a89dbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2018 14:24:21 +0200 Subject: [PATCH 045/138] libyaml: update from 0.1.7 to version 0.2.1 This update includes two hitherto unreleased upstream patches to fix bugs in 0.2.1 that manifest in the pythonPackages.pyyaml test suite. Closes https://github.com/NixOS/nixpkgs/pull/45560. --- .../development/libraries/libyaml/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 45e15c82966..671c077b034 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,16 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: + let - # 0.2.1 broke the tests of pythonPackages.pyyaml 3.13 - version = "0.1.7"; + + version = "0.2.1"; + + # https://github.com/yaml/pyyaml/issues/214 + p1 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/8ee83c0da22fe9aa7dea667be8f899a7e32ffb83.patch; + sha256 = "00jh39zww6s4gyhxfmlxwb6lz90nl3p51k5h1qm6z3ymik5vljmz"; + }; + p2 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/56f4b17221868593d6903ee58d6d679b690cf4df.patch; + sha256 = "0najcay1y4kgfpsidj7dnyafnwjbav5jyawhyv215zl9gg3386n0"; + }; + in + stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; + sha256 = "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"; }; + patches = [ p1 p2 ]; # remove when the next release comes out + meta = with stdenv.lib; { homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; From fe6ef99ffc3f14d1eeb753a19efd3b8b444d6bcd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Mon, 27 Aug 2018 15:16:45 +0200 Subject: [PATCH 046/138] elixir_1_7: 1.7.2 -> 1.7.3 --- pkgs/development/interpreters/elixir/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index 321a41f50e1..d97d416bc27 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.2"; - sha256 = "0wnrx6wlpmr23ypm8za0c4dl952nj4rjylcsdzz0xrma92ylrqfq"; + version = "1.7.3"; + sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; minimumOTPVersion = "19"; } From 51f148ebf1441351ef0383922de230710c313d87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 06:59:04 -0700 Subject: [PATCH 047/138] mate.eom: 1.21.0 -> 1.21.2 (#45597) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eom/versions. --- pkgs/desktops/mate/eom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index ee297237f6e..4f338051449 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "1.21.0"; + version = "1.21.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "165n314hxapq8glzlv7vs5x44z13wjmpysl5p7q3ckrsxy5pczww"; + sha256 = "08idw219mw0v0nkaphy0jvxi67gqm4nzbbnhnwjksxbma2gmpvss"; }; nativeBuildInputs = [ From 7d567ad4edc13759a9852bb94f3d124c3767e26a Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 27 Aug 2018 15:53:24 +0200 Subject: [PATCH 048/138] crystal: 0.25.1 -> 0.26.0 --- .../development/compilers/crystal/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a0f37973ccd..ce487c3c0e2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, makeWrapper -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }: stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "1ikzly6vs28ilqvqm4kxzhqs8mp6l4l344rhak63dav7vv97nnlv"; + sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379"; }; - prebuiltName = "crystal-0.25.1-1"; + prebuiltName = "crystal-0.26.0-1"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.25.1/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0zjmbvbhi11p7s99jmvb3pac6zzsr792bxcfanrx503fjxxafgll"; - "i686-linux" = "0i0hgsq7xa53594blqw5qi6jrqja18spifmalg7df2mj3h13h3pz"; - "x86_64-darwin" = "1h369hzis1cigxbb6fgpahyq4d13gfgjc6adf300zc38yh8rvyy0"; + "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; }."${stdenv.system}"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libiconv ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ]; buildInputs = libs ++ [ llvm ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sifmelcara david50407 ]; + maintainers = with stdenv.lib.maintainers; [ manveru david50407 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } From e301589013e4f99dcb4fb7d0df00c3c7037c046e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 07:06:28 -0700 Subject: [PATCH 049/138] gmsh: 3.0.6 -> 4.0.0 (#45592) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gmsh/versions. --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 956bfe1d811..7bc8729c3fe 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "3.0.6"; in +let version = "4.0.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0ywqhr0zmdhn8dvi6l8z1vkfycyv67fdrz6b95mb39np832bq04p"; + sha256 = "0pqm0ippj0j07919hld3f3rgq0p1x4j32fxb2m1nyp226zx8l37v"; }; # The original CMakeLists tries to use some version of the Lapack lib From 9236e9a28d1e084d54ef973ea79cca4156d11347 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Aug 2018 18:38:30 +0300 Subject: [PATCH 050/138] zabbix34: Compile with OpenSSL Fixes: "TLSConnect" configuration parameter cannot be used: Zabbix agent was compiled without TLS support --- pkgs/servers/monitoring/zabbix/3.4.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 047ce0a5130..72e6fa55b00 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv }: +{ stdenv, fetchurl, pcre, libiconv, openssl }: let @@ -23,8 +23,9 @@ in "--enable-agent" "--with-libpcre=${pcre.dev}" "--with-iconv=${libiconv}" + "--with-openssl=${openssl.dev}" ]; - buildInputs = [ pcre libiconv ]; + buildInputs = [ pcre libiconv openssl ]; meta = with stdenv.lib; { inherit branch; From dd12060b94ca67c8cc7330453cfa5451026b3554 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 11 Aug 2018 16:01:45 -0400 Subject: [PATCH 051/138] libxnd: init at 0.2.0dev3 General container that maps a wide range of Python values directly to memory." --- pkgs/development/libraries/libxnd/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/libxnd/default.nix diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix new file mode 100644 index 00000000000..c99c3f42bfc --- /dev/null +++ b/pkgs/development/libraries/libxnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, libndtypes +}: + +stdenv.mkDerivation rec { + name = "libxnd-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "xnd"; + rev = "v${version}"; + sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + }; + + buildInputs = [ libndtypes ]; + + configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'" + "XND_LINK='-L${libndtypes}/lib'" ]; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "General container that maps a wide range of Python values directly to memory"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b2b5ebbbb2..51d0fc9dea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1390,6 +1390,8 @@ with pkgs; libndtypes = callPackages ../development/libraries/libndtypes { }; + libxnd = callPackages ../development/libraries/libxnd { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; From da8e3ef9e5f554d8803b1721f1e53416dadb4087 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 27 Aug 2018 12:50:44 -0500 Subject: [PATCH 052/138] upx: 3.94 -> 3.95 --- pkgs/tools/compression/upx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index ea363ae8cc2..60023d028a9 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "upx-${version}"; - version = "3.94"; + version = "3.95"; src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; - sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; + url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz"; + sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; }; CXXFLAGS = "-Wno-unused-command-line-argument"; From 1ae5f05d16ce733694f8e54ed722d54197f661b0 Mon Sep 17 00:00:00 2001 From: Raitis Veinbahs Date: Mon, 27 Aug 2018 21:30:18 +0300 Subject: [PATCH 053/138] vitetris: init at 0.57.2 (#45672) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/games/vitetris/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/games/vitetris/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb5bf0f54f8..093a2aae86b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3700,6 +3700,11 @@ github = "siddharthist"; name = "Langston Barrett"; }; + siers = { + email = "veinbahs+nixpkgs@gmail.com"; + github = "siers"; + name = "Raitis Veinbahs"; + }; sifmelcara = { email = "ming@culpring.com"; github = "sifmelcara"; diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix new file mode 100644 index 00000000000..3ed5700954a --- /dev/null +++ b/pkgs/games/vitetris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + name = "vitetris-${version}"; + version = "0.57.2"; + + src = fetchFromGitHub { + owner = "vicgeralds"; + repo = "vitetris"; + rev = "v${version}"; + sha256 = "0px0h4zrpzr6xd1vz7w9gr6rh0z74y66jfzschkcvj84plld10k6"; + }; + + hardeningDisable = [ "format" ]; + + makeFlags = "INSTALL=install"; + + meta = { + description = "Terminal-based Tetris clone by Victor Nilsson"; + homepage = http://www.victornils.net/tetris/; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ siers ]; + + longDescription = '' + vitetris is a terminal-based Tetris clone by Victor Nilsson. Gameplay is much + like the early Tetris games by Nintendo. + + Features include: configurable keys, highscore table, two-player mode with + garbage, network play, joystick (gamepad) support on Linux or with Allegro. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0fa12b0d0c..02731e80028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20308,6 +20308,8 @@ with pkgs; vessel = pkgsi686Linux.callPackage ../games/vessel { }; + vitetris = callPackage ../games/vitetris { }; + vms-empire = callPackage ../games/vms-empire { }; voxelands = callPackage ../games/voxelands { From 294c3605a3a57773242d8585ab1815cd61d4a65f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 11:59:27 -0700 Subject: [PATCH 054/138] virtlyst: 1.1.0 -> 1.2.0 (#45121) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/virtlyst/versions. --- pkgs/servers/web-apps/virtlyst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index c6245f9b40d..0c51b6b13cd 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "virtlyst-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "Virtlyst"; rev = "v${version}"; - sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; From a3f016f9f709f0926da903b7c3161a36dc577efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20H=C3=B6ppner?= Date: Mon, 27 Aug 2018 21:22:27 +0200 Subject: [PATCH 055/138] racket: 6.12 -> 7.0 (#45650) --- 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 d002f6eb31c..e8b6cc93c2c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.12"; + version = "7.0"; src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; + sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"; }; FONTCONFIG_FILE = fontsConf; From bf112ccef75c32625d7a6519e789f025adf407f4 Mon Sep 17 00:00:00 2001 From: Elmar Athmer Date: Mon, 27 Aug 2018 21:34:16 +0200 Subject: [PATCH 056/138] hcloud: 1.6.0 -> 1.6.1 --- pkgs/development/tools/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2ef6b4a1d54..877080508d4 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; + sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; From bd4b890fec97e6a590cc1fab8648ed3c8e00f693 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Mon, 27 Aug 2018 21:38:28 +0200 Subject: [PATCH 057/138] elixir: 1.6.6 -> 1.7.3 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 26bed216acf..c5be1c78a55 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -42,7 +42,7 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_6; + elixir = elixir_1_7; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { inherit rebar erlang; From 984c55f82d99acd4ea4ff3b1c2ddb9b5445d2fa6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 13:39:54 -0700 Subject: [PATCH 058/138] yubico-piv-tool: 1.5.0 -> 1.6.1 (#45531) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yubico-piv-tool/versions. --- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c4a8f3a623b..d0b7ebf3fc8 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.5.0"; + name = "yubico-piv-tool-1.6.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1"; + sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; }; nativeBuildInputs = [ pkgconfig ]; From 6d797c846287358c33ec764dc0e7aa2ae8b9ebe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Aug 2018 22:15:28 +0100 Subject: [PATCH 059/138] nixpkgs.syslogng_incubator: mark as broken cc @rickynils --- pkgs/tools/system/syslog-ng-incubator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index c90c67c7737..a57cafb54e2 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # 2018-05-12 }; } From 6437d53e23588633680992806efe7935ecde1e1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 14:30:42 -0700 Subject: [PATCH 060/138] udisks: 2.7.7 -> 2.8.0 (#45533) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/udisks/versions. --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 65c995558a4..78ab6b37532 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -6,7 +6,7 @@ }: let - version = "2.7.7"; + version = "2.8.0"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "13a7810izfhz729kwij584vsrzz9jdyfzvbl9magl0nfyj8zj8m8"; + sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From 33b5cfb4eaa25b0736aec19f7eb751e4a3eac839 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 27 Aug 2018 18:05:45 -0400 Subject: [PATCH 061/138] gradle: 4.9 -> 4.10 --- 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 f5ca69e59c8..566694e06b0 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.9"; + name = "gradle-4.10"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; + sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314"; }; }; From 09538793f3753cf1578269caf7af8c3a23a82af8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 27 Aug 2018 18:15:19 -0400 Subject: [PATCH 062/138] granite: 5.0 -> 5.1.0 --- pkgs/development/libraries/granite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index b8f35c8539a..1ee0970ffad 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "granite-${version}"; - version = "5.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "015hkclcxirssg7a8s6mkns5xdk77m1jnkshlyfdw041nzyc5jh1"; + sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; cmakeFlags = [ From 765f8d356919122b231dfd9487541c89fb565312 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 28 Aug 2018 00:24:13 +0200 Subject: [PATCH 063/138] mint: 0.2.0 -> 0.2.1 (#45684) --- pkgs/development/compilers/mint/default.nix | 14 ++++++++++---- pkgs/development/compilers/mint/shards.nix | 12 ++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 6552f5f44e3..2896c0c0913 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,4 +1,9 @@ -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape}: +# Updating the dependencies for this package: +# +# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock +# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' +# +{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }: let crystalPackages = lib.mapAttrs (name: src: stdenv.mkDerivation { @@ -28,15 +33,16 @@ let }; in stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.2.1"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "0.2.0"; - sha256 = "1ds9zrvbmnfy744i9ri6v4w37aw7ccmdxzxmy8l97h045hzz9cp3"; + rev = version; + sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1"; }; + nativeBuildInputs = [ which ]; buildInputs = [ crystal zlib openssl duktape ]; buildPhase = '' diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 808b4710048..069df52ba12 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,8 +2,8 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.7.2"; - sha256 = "1j2cr4p3d44848v0gfl97p9kw2dslscnb1piyb7b3374iy345i0k"; + rev = "v1.7.3"; + sha256 = "0b98qjy43wsrc08am7lkhcdsxc7gplf9hcmbvd4p3dw4g107rk91"; }; ameba = { owner = "veelenga"; @@ -14,8 +14,8 @@ baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "24dbaf2180b872c0f0fc777b34e3759108959e6e"; - sha256 = "01p7hzsvms9cywdgs0rcs6mxdi94491wk55823fw2vxv24hvxnvk"; + rev = "v0.9.7"; + sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; }; diff = { owner = "MakeNowJust"; @@ -38,8 +38,8 @@ kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "09bb1fcd4073a374b3a61c99e48e05a866b23c08"; - sha256 = "0yyb59i897gr8cqjbf48d6s0znq68ibpxarxkxkgrqk7lbvrqqr7"; + rev = "v0.24.0"; + sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; }; kilt = { owner = "jeromegn"; From 5de659ce89bcbc3f4cef6f833a9efc6529c58f49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 15:31:03 -0700 Subject: [PATCH 064/138] urlscan: 0.8.9 -> 0.9.0 (#45532) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urlscan/versions. --- pkgs/applications/misc/urlscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 5f5754a6605..6b0c4670544 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "18wvfayib79lylv3g9ay3f85qanhrljvnfarwl9snfzklj4gkf2v"; + sha256 = "0vad1g234r9agvkdsry9xb6hmn6lg4mygfcy0mg68gibmrg7h1ji"; }; propagatedBuildInputs = [ python3Packages.urwid ]; From af761489b534c19c55f62d567fbc3bc1b9f675b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 15:35:42 -0700 Subject: [PATCH 065/138] xpra: 2.3.2 -> 2.3.3 (#45530) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xpra/versions. --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 55ab3422826..6d6fee0a2d3 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"; + sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; nativeBuildInputs = [ pkgconfig ]; From 0f9e0e15fc510a28b86fecd9eb083b7462f85b2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Aug 2018 15:39:17 -0700 Subject: [PATCH 066/138] shaarli: 0.10.0 -> 0.10.2 (#45538) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shaarli/versions. --- pkgs/servers/web-apps/shaarli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 247270f67c5..bfb98add943 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.0"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; + sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78"; }; outputs = [ "out" "doc" ]; From 53371b15c6f287b627e1255bb21d54e123e1f96f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 27 Aug 2018 19:53:25 -0400 Subject: [PATCH 067/138] docs: include shell section --- doc/functions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/functions.xml b/doc/functions.xml index 2a9cc44d5c5..9bbf97c5c71 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -1,5 +1,6 @@ Functions reference @@ -444,6 +445,7 @@ merge:"diff3" ./bin/start.sh -- relative paths are supported. +
pkgs.dockerTools From 360f420ac7df37e8987473f49e00175ef70732b8 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 27 Aug 2018 19:54:41 -0400 Subject: [PATCH 068/138] nixpkgs docs: normalize --- doc/functions.xml | 31 ++++++++++---------- doc/languages-frameworks/java.xml | 24 +++++++--------- doc/package-notes.xml | 48 +++++++++++++++++++------------ doc/platform-notes.xml | 8 ++---- doc/reviewing-contributions.xml | 39 +++++++++++++------------ 5 files changed, 80 insertions(+), 70 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 9bbf97c5c71..ec188e23454 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -523,7 +523,8 @@ merge:"diff3" tag specifies the tag of the resulting image. By - default it's null, which indicates that the nix output hash will be used as tag. + default it's null, which indicates that the nix output + hash will be used as tag. @@ -669,12 +670,12 @@ merge:"diff3" imageDigest specifies the digest of the image to be downloaded. Skopeo can be used to get the digest of an image, with its - inspect subcommand. Since a given imageName - may transparently refer to a manifest list of images which support - multiple architectures and/or operating systems, supply the `--override-os` - and `--override-arch` arguments to specify exactly which image you - want. By default it will match the OS and architecture of the host the - command is run on. + inspect subcommand. Since a given + imageName may transparently refer to a manifest list + of images which support multiple architectures and/or operating systems, + supply the `--override-os` and `--override-arch` arguments to specify + exactly which image you want. By default it will match the OS and + architecture of the host the command is run on. $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'" sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b @@ -697,16 +698,16 @@ merge:"diff3" - - os, if specified, is the operating system of the fetched image. - By default it's linux. - + + os, if specified, is the operating system of the + fetched image. By default it's linux. + - - arch, if specified, is the cpu architecture of the fetched image. - By default it's x86_64. - + + arch, if specified, is the cpu architecture of the + fetched image. By default it's x86_64. +
diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 1acea6a7547..667a795a8d3 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -16,18 +16,17 @@ stdenv.mkDerivation { } Note that jdk is an alias for the OpenJDK (self-built - where available, or pre-built via Zulu). - Platforms with OpenJDK not (yet) in Nixpkgs (Aarch32, - Aarch64) point to the (unfree) - oraclejdk. - + where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in + Nixpkgs (Aarch32, Aarch64) point to the + (unfree) oraclejdk. + JAR files that are intended to be used by other packages should be installed - in $out/share/java. JDKs have a stdenv setup hook - that add any JARs in the share/java directories of the - build inputs to the CLASSPATH environment variable. For - instance, if the package libfoo installs a JAR named + in $out/share/java. JDKs have a stdenv setup hook that + add any JARs in the share/java directories of the build + inputs to the CLASSPATH environment variable. For instance, if + the package libfoo installs a JAR named foo.jar in its share/java directory, and another package declares the attribute @@ -61,18 +60,17 @@ installPhase = ${jre}/bin/java instead of ${jdk}/bin/java, you prevent your package from depending on the JDK at runtime. - + - + Note all JDKs passthru home, so if your application requires environment variables like JAVA_HOME being set, that can be done in a generic fashion with the --set argument of makeWrapper: - --set JAVA_HOME ${jdk.home} - + It is possible to use a different Java compiler than javac diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0634432fe95..8c7c63c8c8d 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -709,40 +709,50 @@ overrides = super: self: rec { Citrix Receiver - The Citrix Receiver is a remote - desktop viewer which provides access to - XenDesktop installations. + The Citrix + Receiver is a remote desktop viewer which provides access to + XenDesktop + installations.
Basic usage + - The tarball archive needs to be downloaded manually as the licenses agreements of the vendor - need to be accepted first. This is available at the - download page at citrix.com. - Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. - With the archive available in the store the package can be built and installed with Nix. + The tarball archive needs to be downloaded manually as the licenses + agreements of the vendor need to be accepted first. This is available at + the + download + page at citrix.com. Then run nix-prefetch-url + file://$PWD/linuxx64-$version.tar.gz. With the archive available + in the store the package can be built and installed with Nix. - Note: it's recommended to install Citrix Receiver using - nix-env -i or globally to ensure that the .desktop files - are installed properly into $XDG_CONFIG_DIRS. Otherwise it won't - be possible to open .ica files - automatically from the browser to start a Citrix connection. + Note: it's recommended to install Citrix + Receiver using nix-env -i or globally to + ensure that the .desktop files are installed properly + into $XDG_CONFIG_DIRS. Otherwise it won't be possible to + open .ica files automatically from the browser to start + a Citrix connection.
+
Custom certificates + - The Citrix Receiver in nixpkgs trusts several certificates - from the Mozilla database by default. - However several companies using Citrix might require their own corporate certificate. On distros with imperative + The Citrix Receiver in nixpkgs trusts + several certificates + from the + Mozilla database by default. However several companies using Citrix + might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in $ICAROOT, - however this directory is a store path in nixpkgs. In order to work around this issue the package provides a simple - mechanism to add custom certificates without rebuilding the entire package using symlinkJoin: - + however this directory is a store path in nixpkgs. In + order to work around this issue the package provides a simple mechanism to + add custom certificates without rebuilding the entire package using + symlinkJoin: { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml index ea581421547..cde27b8a5ed 100644 --- a/doc/platform-notes.xml +++ b/doc/platform-notes.xml @@ -29,7 +29,6 @@ } - On darwin libraries are linked using absolute paths, libraries are @@ -47,19 +46,19 @@ } - Even if the libraries are linked using absolute paths and resolved via their install_name correctly, tests can sometimes fail - to run binaries. This happens because the checkPhase + to run binaries. This happens because the checkPhase runs before the libraries are installed. This can usually be solved by running the tests after the installPhase or alternatively by using DYLD_LIBRARY_PATH. More information about this variable - can be found in the dyld + can be found in the + dyld 1 manpage. @@ -77,7 +76,6 @@ } - Some packages assume xcode is available and use xcrun diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index b2a2675c3e6..6b854e08554 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -6,18 +6,20 @@ Reviewing contributions - The following section is a draft, and the policy for reviewing is still being - discussed in issues such as #11166 - and and + #20836 . - The nixpkgs project receives a fairly high number of contributions via - GitHub pull-requests. Reviewing and approving these is an important task and - a way to contribute to the project. + The nixpkgs project receives a fairly high number of contributions via GitHub + pull-requests. Reviewing and approving these is an important task and a way + to contribute to the project. The high change rate of nixpkgs makes any pull request that remains open for @@ -40,10 +42,10 @@ to respect every community member and their work. - GitHub provides reactions as a simple and quick way to provide - feedback to pull-requests or any comments. The thumb-down reaction should be - used with care and if possible accompanied with some explanation so the - submitter has directions to improve their contribution. + GitHub provides reactions as a simple and quick way to provide feedback to + pull-requests or any comments. The thumb-down reaction should be used with + care and if possible accompanied with some explanation so the submitter has + directions to improve their contribution. Pull-request reviews should include a list of what has been reviewed in a @@ -117,8 +119,8 @@ - License can change with version updates, so it should be checked to match - the upstream license. + License can change with version updates, so it should be checked to + match the upstream license. @@ -143,8 +145,8 @@ Pull-requests are often targeted to the master or staging branch, and - building the pull-request locally when it is submitted can trigger - many source builds. + building the pull-request locally when it is submitted can trigger many + source builds. It is possible to rebase the changes on nixos-unstable or @@ -605,11 +607,12 @@ policy. --> - In a case a contributor leaves definitively the Nix community, he - should create an issue or post on Discourse with - references of packages and modules he maintains so the - maintainership can be taken over by other contributors. + references of packages and modules he maintains so the maintainership can be + taken over by other contributors.
From 5d0e53fd97f84e6fe990d7f27801f989723128a3 Mon Sep 17 00:00:00 2001 From: qoli Date: Mon, 27 Aug 2018 17:29:23 -0700 Subject: [PATCH 069/138] linux-hardkernel: 4.14.55-146 -> 4.14.66-147 --- pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 3fc08e64287..32eb56e2dfb 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.55-146"; + version = "4.14.66-147"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.55"; + modDirVersion = "4.14.66"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh"; + sha256 = "06v38jl4i7l8gl8zcpyp9vmjjhaqhbp7by15f82rxa724zppxi9x"; }; defconfig = "odroidxu4_defconfig"; From 38fafd1ed1461a733f1e76c548396d5d3076a980 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Aug 2018 04:32:56 +0000 Subject: [PATCH 070/138] obliv-c: 0.0pre20170827 -> 0.0pre20180624 --- pkgs/development/compilers/obliv-c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index f5bd3430ae7..0d171a474a2 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,15 +1,15 @@ { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; - version = "0.0pre20170827"; + version = "0.0pre20180624"; buildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; repo = "obliv-c"; - rev = "9a6be5a5f44d341bc357055e11922f6a4c4c3b65"; - sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf"; + rev = "3d6804ca0fd85868207a0ccbd2509ec064723ac2"; + sha256 = "1ib21ngn7zr58xxq4sjigrpaxb0wx35x3k9l4qvwflzrmvnman20"; }; patches = [ ./ignore-complex-float128.patch ]; From 2ed25d3768b78faf1f6b90f5adb5e62ef15f75ff Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Mon, 27 Aug 2018 22:57:19 -0700 Subject: [PATCH 071/138] vagrant: mark bundler as system plugin This will cause Vagrant to use the rubygems version of bundler without complaint. --- pkgs/development/tools/vagrant/default.nix | 1 + .../tools/vagrant/use-system-bundler-version.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/tools/vagrant/use-system-bundler-version.patch diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index fe75c9fd208..f247a20b1b2 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -38,6 +38,7 @@ in buildRubyGem rec { patches = [ ./unofficial-installation-nowarn.patch + ./use-system-bundler-version.patch ]; # PATH additions: diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch new file mode 100644 index 00000000000..c386acf4a1c --- /dev/null +++ b/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -0,0 +1,13 @@ +diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb +index 301e40e37..e361ab510 100644 +--- i/lib/vagrant/bundler.rb ++++ w/lib/vagrant/bundler.rb +@@ -217,7 +217,7 @@ module Vagrant + source_list = {} + system_plugins = plugins.map do |plugin_name, plugin_info| + plugin_name if plugin_info["system"] +- end.compact ++ end.compact << "bundler" + installer_set = VagrantSet.new(:both) + installer_set.system_plugins = system_plugins + From 16ec8ac34f1c98e03322d081f3f307957fffc68f Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 28 Aug 2018 09:51:45 +0200 Subject: [PATCH 072/138] mopidy-iris: 3.24.0 -> 3.25.1 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 9d47018055c..482e3652ec0 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.24.0"; + version = "3.25.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "19aympbkiil68j9jpvk1pgl4hplfs0vpc0d4vmzmpbcslkpirx2g"; + sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk"; }; propagatedBuildInputs = [ From 6d4cf88aa491a658503dc2c1b910a8cc784e763b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Aug 2018 09:00:21 +0100 Subject: [PATCH 073/138] libcpuid: restrict to x86 --- pkgs/tools/misc/libcpuid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 5941b8056b1..b0f20c1d387 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; - platforms = platforms.all; + platforms = platforms.x86; }; } From e31eaa2fba4be8c7ddf796569b959fcd758e1667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Aug 2018 09:26:51 +0100 Subject: [PATCH 074/138] claws-mail: 3.17.0 -> 3.17.1 --- .../networking/mailreaders/claws-mail/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 9cf0a20d76b..47cb83dee76 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -3,7 +3,6 @@ , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 , glib-networking, gsettings-desktop-schemas, libSM, libytnef - # Build options # TODO: A flag to build the manual. # TODO: Plugins that complain about their missing dependencies, even when @@ -32,11 +31,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.17.0"; + version = "3.17.1"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "119y6q9p8zwm2xqlbkgqd119a529kjqlyldmb4h940z6c2qyjhqm"; + sha256 = "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm"; }; outputs = [ "out" "dev" ]; From 3f8bbbdc5ce7f134e8d7d4c63138dcf639a09b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Aug 2018 09:27:58 +0100 Subject: [PATCH 075/138] enableDebugging: fix usage example --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d55acc59d8..e176844738f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -385,7 +385,7 @@ with pkgs; { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; - # intended to be used like nix-build -E 'with {}; enableDebugging fooPackage' + # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; From 9006cd339cdfb8b45aca54d6730928cfcdfb7909 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Aug 2018 11:04:45 +0200 Subject: [PATCH 076/138] tdesktop: 1.3.10 -> 1.3.13 tdesktopPackages.preview: 1.3.12 -> 1.3.13 --- .../instant-messengers/telegram/tdesktop/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e1ced2df9f3..b30ead58143 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.10"; - sha256Hash = "0i1lzks8pf627658w6p7dz87d6cl4g98031qm166npkc40f89bpr"; + version = "1.3.13"; + sha256Hash = "00xm3dv9x500v0c21azd98laqij7awyjbas5vyd2dnf2aw9n9qr2"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "359861"; archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; @@ -14,7 +14,5 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.12"; - sha256Hash = "00z4ljs4fvbk7sf8wv1v50kln26gv8q12x6q41ai9gfzkvq5f69a"; }); } From 083220867c71443b0473374e8abe871cecb8b7d9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 28 Aug 2018 13:30:25 +0300 Subject: [PATCH 077/138] Improve re-wrapping in case of GTK3 --- .../applications/editors/vim/configurable.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3711b3cdcee..2f2c787ffac 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -155,9 +155,26 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' - rm "$out/bin/gvim" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" - chmod a+x "$out/bin/gvim" + + rewrap () { + rm -f "$out/bin/$1" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + chmod a+x "$out/bin/$1" + } + + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ + rewrap rgview -RgZ + rewrap evim -y + rewrap eview -yR + rewrap vimdiff -d + rewrap gvimdiff -gd ''; preInstall = '' From 1b09d06dcb777f3846db33332b123a1771d4df5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Aug 2018 12:48:57 +0100 Subject: [PATCH 078/138] twitterBootstrap: v2 -> v3 cc @Profpatsch v2 no longer compiles and is ancient --- .../web/twitter-bootstrap/default.nix | 33 ++++++++----------- pkgs/development/web/twitter-bootstrap/v3.nix | 26 --------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 16 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/web/twitter-bootstrap/v3.nix diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 1057e970865..461a81db857 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,31 +1,26 @@ -{ stdenv, fetchFromGitHub, lessc, closurecompiler }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "twitter-bootstrap-${version}"; - version = "2.3.2"; + name = "bootstrap-${version}"; + version = "3.3.7"; - src = fetchFromGitHub { - owner = "twitter"; - repo = "bootstrap"; - rev = "v${version}"; - sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g"; - }; + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + }; - buildInputs = [ lessc closurecompiler ]; - - phases = [ "installPhase" ]; + buildInputs = [ unzip ]; + dontBuild = true; installPhase = '' - mkdir -p $out/css $out/js $out/img - cp $src/img/* $out/img/ - closure-compiler --js $src/js/*.js > $out/js/bootstrap.js - lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css - ''; + mkdir $out + cp -r * $out/ + ''; meta = { description = "Front-end framework for faster and easier web development"; homepage = http://getbootstrap.com/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; + } diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix deleted file mode 100644 index 461a81db857..00000000000 --- a/pkgs/development/web/twitter-bootstrap/v3.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "bootstrap-${version}"; - version = "3.3.7"; - - src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; - sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - installPhase = '' - mkdir $out - cp -r * $out/ - ''; - - meta = { - description = "Front-end framework for faster and easier web development"; - homepage = http://getbootstrap.com/; - license = stdenv.lib.licenses.mit; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e176844738f..1d7eb4747f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5656,8 +5656,8 @@ with pkgs; libX11 = xorg.libX11; }; - twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; - twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; + twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap = twitterBootstrap3; txt2man = callPackage ../tools/misc/txt2man { }; From 96ae011720b461b793108a246a7e7888569c9c8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Aug 2018 04:53:51 -0700 Subject: [PATCH 079/138] nagios: 4.4.1 -> 4.4.2 (#45558) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nagios/versions. --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 64fd55f9e5a..9d79e8422ee 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0j09jawjrbp5n7gwyb5mkq7l2dmg6fl03695salral66fs95s8nq"; + sha256 = "0lv8fgqbxza0rwd0gy3jsy85ljgsi3vhvzacr346va3a68zr461l"; }; patches = [ ./nagios.patch ]; From c251ec691a559e3769879bf3e4a8a22e78f4e6ce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 Aug 2018 14:23:13 +0200 Subject: [PATCH 080/138] virtualization.growPartition -> virtualisation.growPartition There never was a 'virtualization.growPartition'. This got messed up in eddf30cc93e1. Issue #36590. --- nixos/modules/rename.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b51dcd2976f..4a6bdfe83dd 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -219,7 +219,7 @@ with lib; '') # Profile splitting - (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) + (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ]) # misc/version.nix (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) From 908c2cf56c13400a8069641cf4d4a056dd58545e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 11:53:30 +0200 Subject: [PATCH 081/138] networkmanagerapplet: do not build libnm-gtk --- .../networking/network-manager/applet.nix | 6 +--- .../network-manager/libnm-gtk-mbpi.patch | 33 ------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 0b6a7e622a8..e97aa5ad274 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -15,12 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19 - ./libnm-gtk-mbpi.patch - ]; - mesonFlags = [ + "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch deleted file mode 100644 index d7eef5749db..00000000000 --- a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -137,7 +137,7 @@ - mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') - config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) - else -- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) -+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) - endif - - gio_dep = dependency('gio-2.0', version: '>= 2.38') ---- a/src/libnm-gtk/nm-mobile-providers.c -+++ b/src/libnm-gtk/nm-mobile-providers.c -@@ -30,10 +30,6 @@ - - #include "nm-mobile-providers.h" - --#ifndef MOBILE_BROADBAND_PROVIDER_INFO --#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" --#endif -- - #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" - #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" - -@@ -990,7 +986,7 @@ - if (!country_codes) - country_codes = ISO_3166_COUNTRY_CODES; - if (!service_providers) -- service_providers = MOBILE_BROADBAND_PROVIDER_INFO; -+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; - - countries = read_country_codes (country_codes, - cancellable, From 8e46884331141b7f851b7fd5dd23967322339cc5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 11:57:29 +0200 Subject: [PATCH 082/138] networkmanagerapplet: add missing docbook DTDs --- pkgs/tools/networking/network-manager/applet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index e97aa5ad274..d516a2b5ee8 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobjectIntrospection , libappindicator-gtk3, withGnome ? false }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file From 6cf92400b28522001f33df3c1267e3565f30ec29 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 Aug 2018 09:36:38 -0500 Subject: [PATCH 083/138] micro: 1.4.0 -> 1.4.1 --- pkgs/applications/editors/micro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index f1c1e3dcac7..fab3646efdf 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "micro-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; + sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5"; fetchSubmodules = true; }; From a6130c36cd3a56da9198df974f119ca69a04c0f9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 14:59:16 +0200 Subject: [PATCH 084/138] networkmanager-iodine: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/iodine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index a3dbeaf8265..a6fd3e7303d 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; From 2eb3fab10b6942dcffce7215a00eca4cfd139b14 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:00:27 +0200 Subject: [PATCH 085/138] networkmanager-fortisslvpn: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 11b29081f9b..16964e4db94 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/tmp" ]; From c858c831b6e8e724046752b922c0591a3f1d9e50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:02:15 +0200 Subject: [PATCH 086/138] networkmanager-l2tp: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/l2tp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index d48d2e910f5..3cac1b5e63c 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--sysconfdir=$(out)/etc" From cb31e93abfc110a9e119214f8b804956f68551bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:04:24 +0200 Subject: [PATCH 087/138] networkmanager-vpnc: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/vpnc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index d2b3a345d49..ef45defb7d5 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" ]; From 2683fe16a519e340989772f2b208971b911f3818 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:06:06 +0200 Subject: [PATCH 088/138] networkmanager-openvpn: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/openvpn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 8d3bd874718..0d3a4174744 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; From 223543733081d787fc7c0ce34a59afac1363574f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 15:07:39 +0200 Subject: [PATCH 089/138] networkmanager_strongswan: remove nm-gtk dependency --- pkgs/tools/networking/network-manager/strongswan.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index fc10fc6364c..d7f55857406 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-nm-libexecdir=$(out)/libexec" "--with-nm-plugindir=$(out)/lib/NetworkManager" From 91a876e06f7c2c573b774dd640bdf163127eae0b Mon Sep 17 00:00:00 2001 From: Philip Patsch Date: Tue, 28 Aug 2018 13:31:41 +0200 Subject: [PATCH 090/138] bazel: add upstream patch of perl replacement --- .../tools/build-managers/bazel/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 72903ad8a5d..6a25aef8b36 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). @@ -45,7 +45,14 @@ stdenv.mkDerivation rec { sourceRoot = "."; - patches = lib.optional enableNixHacks ./nix-hacks.patch; + patches = + lib.optional enableNixHacks ./nix-hacks.patch + # patch perl out of the bash completions + # should land in 0.18 + ++ [(fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch"; + sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5"; + })]; # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. @@ -139,11 +146,6 @@ stdenv.mkDerivation rec { cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - # the bash completion requires perl - # https://github.com/bazelbuild/bazel/issues/5943 - substituteInPlace scripts/bazel-complete-template.bash \ - --replace "perl" "${perl}/bin/perl" - patchShebangs . ''; in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches From 69b4f427b67fe83ddb2bb3ee113770aa802e5643 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 28 Aug 2018 17:10:45 +0300 Subject: [PATCH 091/138] nixos/zabbix-agent: Make the Zabbix package user-configurable --- .../modules/services/monitoring/zabbix-agent.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 87857225e7d..426cf9bf86e 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -7,6 +7,8 @@ let cfg = config.services.zabbixAgent; + zabbix = cfg.package; + stateDir = "/var/run/zabbix"; logDir = "/var/log/zabbix"; @@ -44,6 +46,16 @@ in ''; }; + package = mkOption { + type = types.attrs; # Note: pkgs.zabbixXY isn't a derivation, but an attrset of { server = ...; agent = ...; }. + default = pkgs.zabbix; + defaultText = "pkgs.zabbix"; + example = literalExample "pkgs.zabbix34"; + description = '' + The Zabbix package to use. + ''; + }; + server = mkOption { default = "127.0.0.1"; description = '' @@ -87,14 +99,14 @@ in chown zabbix ${stateDir} ${logDir} ''; - serviceConfig.ExecStart = "@${pkgs.zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}"; + serviceConfig.ExecStart = "@${zabbix.agent}/sbin/zabbix_agentd zabbix_agentd --config ${configFile}"; serviceConfig.Type = "forking"; serviceConfig.RemainAfterExit = true; serviceConfig.Restart = "always"; serviceConfig.RestartSec = 2; }; - environment.systemPackages = [ pkgs.zabbix.agent ]; + environment.systemPackages = [ zabbix.agent ]; }; From 94a906b59a7c73f6a0b6ef120f89ee0f927f0dc9 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Tue, 21 Aug 2018 21:39:27 -0400 Subject: [PATCH 092/138] systemd: ensure fsck Requires/After links are created in mount units systemd-fsck-generator only produces these lines if it can find the necessary fsck executable in its PATH. fixes #29139. --- nixos/modules/system/boot/stage-2-init.sh | 2 +- nixos/modules/system/boot/stage-2.nix | 1 + nixos/release.nix | 1 + nixos/tests/fsck.nix | 29 +++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/fsck.nix diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index b83012dfda7..49764b75a55 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -159,6 +159,6 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." -PATH=/run/current-system/systemd/lib/systemd \ +PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ exec systemd diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index 9fd89b6319d..55e6b19c67f 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,6 +17,7 @@ let pkgs.utillinux pkgs.openresolv ]; + fsPackagesPath = lib.makeBinPath config.system.fsPackages; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} diff --git a/nixos/release.nix b/nixos/release.nix index b25c684ff47..b80ab44eced 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -291,6 +291,7 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; + tests.fsck = callTest tests/fsck.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; diff --git a/nixos/tests/fsck.nix b/nixos/tests/fsck.nix new file mode 100644 index 00000000000..f943bb7f235 --- /dev/null +++ b/nixos/tests/fsck.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "fsck"; + + machine = { lib, ... }: { + virtualisation.emptyDiskImages = [ 1 ]; + + fileSystems = lib.mkVMOverride { + "/mnt" = { + device = "/dev/vdb"; + fsType = "ext4"; + autoFormat = true; + }; + }; + }; + + testScript = '' + $machine->waitForUnit('default.target'); + + subtest "root fs is fsckd", sub { + $machine->succeed('journalctl -b | grep "fsck.ext4.*/dev/vda"'); + }; + + subtest "mnt fs is fsckd", sub { + $machine->succeed('journalctl -b | grep "fsck.*/dev/vdb.*clean"'); + $machine->succeed('grep "Requires=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount'); + $machine->succeed('grep "After=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount'); + }; + ''; +} From 452ce3915d0d4c8b803cba54888ac03250ec9ced Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 28 Aug 2018 11:47:59 -0400 Subject: [PATCH 093/138] dbeaver: 5.1.5 -> 5.1.6 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b8eff972ebd..35698a32331 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.5"; + version = "5.1.6"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; + sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; }; installPhase = '' From 98fbb441149ab9bb7ef993f9e9a9f22eb3651ae5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Aug 2018 17:59:16 +0200 Subject: [PATCH 094/138] sshfs: 3.4.0 -> 3.5.0 --- pkgs/tools/filesystems/sshfs-fuse/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 187e77533f5..183cfb2ddbe 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, docutils, which, python3Packages +{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils +, fuse3, glib +, which, python3Packages }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.5.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; + sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; buildInputs = [ fuse3 glib ]; + checkInputs = [ which python3Packages.pytest ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux") @@ -25,9 +27,15 @@ stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); - + #doCheck = true; checkPhase = '' + # The tests need fusermount: + mkdir bin && cp ${fuse3}/bin/fusermount3 bin/fusermount + export PATH=bin:$PATH + # Can't access /dev/fuse within the sandbox: "FUSE kernel module does not seem to be loaded" + substituteInPlace test/util.py --replace "/dev/fuse" "/dev/null" + # TODO: "fusermount executable not setuid, and we are not root" + # We should probably use a VM test instead python3 -m pytest test/ ''; From 792425934b1894314aec7ff9a704b91db6290d16 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Aug 2018 18:11:06 +0200 Subject: [PATCH 095/138] tdesktop: 1.3.13 -> 1.3.14 tdesktopPackages.preview: 1.3.13 -> 1.3.14 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b30ead58143..5d8e2c52c21 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.13"; - sha256Hash = "00xm3dv9x500v0c21azd98laqij7awyjbas5vyd2dnf2aw9n9qr2"; + version = "1.3.14"; + sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "359861"; archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; From 9b30f324783f7e9daab717133fe8d6838c4e575c Mon Sep 17 00:00:00 2001 From: Paul Seitz Date: Tue, 28 Aug 2018 16:53:07 +0000 Subject: [PATCH 096/138] nano: updated 'nixSyntaxHighlight' --- 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 86134687ba3..64b8e48b288 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -14,8 +14,8 @@ let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; repo = "nanonix"; - rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; - sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10"; + sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h"; }; in stdenv.mkDerivation rec { From 4ad6979e36f13d2a1bdfd60729389738836745de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Aug 2018 11:18:34 -0700 Subject: [PATCH 097/138] lxc: 3.0.1 -> 3.0.2 (#45563) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxc/versions. --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c158e228f3..ab84c4d9bf9 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625"; + sha256 = "0p1gy553cm4mhwxi85fl6qiwz61rjmvysm8c8pd20qh62xxi3dva"; }; nativeBuildInputs = [ From 776cb2f7b5bedccd8f0def789b6bc9adbd3835bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Aug 2018 11:18:46 -0700 Subject: [PATCH 098/138] lxcfs: 3.0.1 -> 3.0.2 (#45561) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lxcfs/versions. --- pkgs/os-specific/linux/lxcfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 2bdec70b6f9..5760db290a9 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.1"; + name = "lxcfs-3.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0rwk1nbcjnp2d2zbyng8ix9dmww211aiqq8870r9p4j11xv9mgx4"; + sha256 = "0llfvml9ww8gxa4g2a7b1gnxf9g5473pq1inrhvi4xkjx76x602k"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; From 1f8ee1b0d781e44e6a8a30611291851a8b2ad35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 26 Aug 2018 19:29:51 +0200 Subject: [PATCH 099/138] i2pd: 2.19.0 -> 2.20.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 12f68af7d0a..3920405fe4d 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10"; + sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From 467396244079d3a0188c2aa97fe55d3a3bca6870 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 28 Aug 2018 12:48:33 -0700 Subject: [PATCH 100/138] ratpoison: Allow building on Darwin --- pkgs/applications/window-managers/ratpoison/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index ced8e2e0b9d..fded0ee24a5 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cripples Emacs and other quality pieces of software. ''; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.AndersonTorres ]; }; } From fa817fb9f703e290344f383b66bb67576458970f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 28 Aug 2018 12:48:58 -0700 Subject: [PATCH 101/138] imgcat: New expression 2.3.0 --- pkgs/applications/graphics/imgcat/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/graphics/imgcat/default.nix diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix new file mode 100644 index 00000000000..ad2cb4198d2 --- /dev/null +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: + +stdenv.mkDerivation rec { + name = "imgcat-${version}"; + version = "2.3.0"; + + buildTools = [ autoconf automake libtool ncurses ]; + + preConfigure = '' + ${autoconf}/bin/autoconf + sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile + ''; + + preInstall = '' + makeFlagsArray=(PREFIX="$out"); + ''; + + src = fetchFromGitHub { + owner = "eddieantonio"; + repo = "imgcat"; + rev = "3d854c72f785dce0eecd9485767a7f972d54890c"; + sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; + }; + + meta = with stdenv.lib; { + description = "It's like cat, but for images"; + homepage = https://github.com/eddieantonio/imgcat; + license = licenses.isc; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 975b526bc22..ace56296ea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17033,6 +17033,8 @@ with pkgs; img2pdf = callPackage ../applications/misc/img2pdf { }; + imgcat = callPackage ../applications/graphics/imgcat { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; From 7d23ffb73670f1e6a064c6ad3ceed250bc7086ac Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 29 Aug 2018 05:28:47 +0900 Subject: [PATCH 102/138] virtualbox: Change the virtualbox tests to not build the unfree tests by default. (#45415) --- nixos/tests/virtualbox.nix | 42 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 4207112cf16..ce84576edca 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -1,4 +1,4 @@ -{ system ? builtins.currentSystem, debug ? false }: +{ system ? builtins.currentSystem, debug ? false, enableUnfree ? false }: with import ../lib/testing.nix { inherit system; }; with pkgs.lib; @@ -378,6 +378,26 @@ let }; }; + unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { + enable-extension-pack = '' + createVM_testExtensionPack; + vbm("startvm testExtensionPack"); + waitForStartup_testExtensionPack; + $machine->screenshot("cli_started"); + waitForVMBoot_testExtensionPack; + $machine->screenshot("cli_booted"); + + $machine->nest("Checking for privilege escalation", sub { + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->fail("test -e '/root/.config/VirtualBox'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + }); + + shutdownVM_testExtensionPack; + destroyVM_testExtensionPack; + ''; + }; + in mapAttrs (mkVBoxTest false vboxVMs) { simple-gui = '' createVM_simple; @@ -484,22 +504,4 @@ in mapAttrs (mkVBoxTest false vboxVMs) { destroyVM_test1; destroyVM_test2; ''; -} // mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { - enable-extension-pack = '' - createVM_testExtensionPack; - vbm("startvm testExtensionPack"); - waitForStartup_testExtensionPack; - $machine->screenshot("cli_started"); - waitForVMBoot_testExtensionPack; - $machine->screenshot("cli_booted"); - - $machine->nest("Checking for privilege escalation", sub { - $machine->fail("test -e '/root/VirtualBox VMs'"); - $machine->fail("test -e '/root/.config/VirtualBox'"); - $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); - }); - - shutdownVM_testExtensionPack; - destroyVM_testExtensionPack; - ''; -} +} // (if enableUnfree then unfreeTests else {}) From 9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Aug 2018 22:17:54 +0100 Subject: [PATCH 103/138] hurd: cleanup unmaintained target This has been not touched in 6 years. Let's remove it to cause less problems when adding new cross-compiling infrastructure. This also simplify gcc significantly. --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 3 +- lib/systems/parse.nix | 3 - lib/tests/systems.nix | 2 +- .../development/compilers/gcc/4.8/default.nix | 50 +------- .../development/compilers/gcc/4.9/default.nix | 51 +------- pkgs/development/compilers/gcc/5/default.nix | 52 +------- pkgs/development/compilers/gcc/6/default.nix | 51 +------- pkgs/development/compilers/gcc/7/default.nix | 52 +------- pkgs/development/compilers/gcc/8/default.nix | 52 +------- .../compilers/gcc/snapshot/default.nix | 52 +------- pkgs/development/tools/misc/gdb/default.nix | 9 +- pkgs/os-specific/gnu/default.nix | 113 ------------------ pkgs/os-specific/gnu/hurd/default.nix | 91 -------------- pkgs/os-specific/gnu/libpthread/default.nix | 81 ------------- pkgs/os-specific/gnu/mach/default.nix | 57 --------- pkgs/os-specific/gnu/mig/default.nix | 50 -------- pkgs/os-specific/gnu/mig/noyywrap.patch | 12 -- pkgs/os-specific/gnu/smbfs/default.nix | 44 ------- .../samba-without-byte-range-locks.patch | 14 --- pkgs/os-specific/gnu/unionfs/default.nix | 43 ------- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/parted.nix | 5 +- pkgs/tools/misc/parted/default.nix | 5 +- pkgs/top-level/all-packages.nix | 42 +------ 26 files changed, 34 insertions(+), 906 deletions(-) delete mode 100644 pkgs/os-specific/gnu/default.nix delete mode 100644 pkgs/os-specific/gnu/hurd/default.nix delete mode 100644 pkgs/os-specific/gnu/libpthread/default.nix delete mode 100644 pkgs/os-specific/gnu/mach/default.nix delete mode 100644 pkgs/os-specific/gnu/mig/default.nix delete mode 100644 pkgs/os-specific/gnu/mig/noyywrap.patch delete mode 100644 pkgs/os-specific/gnu/smbfs/default.nix delete mode 100644 pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch delete mode 100644 pkgs/os-specific/gnu/unionfs/default.nix diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index adc454406b8..a00165db171 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -36,7 +36,7 @@ in rec { cygwin = filterDoubles predicates.isCygwin; darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; - # Should be better, but MinGW is unclear, and HURD is bit-rotted. + # Should be better, but MinGW is unclear. gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 96e8b6f86eb..51fb6ae760d 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -20,7 +20,7 @@ in rec { cygwin = [ patterns.isCygwin ]; darwin = [ patterns.isDarwin ]; freebsd = [ patterns.isFreeBSD ]; - # Should be better, but MinGW is unclear, and HURD is bit-rotted. + # Should be better, but MinGW is unclear. gnu = [ { kernel = parse.kernels.linux; abi = abis.gnu; } { kernel = parse.kernels.linux; abi = abis.gnueabi; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index ac34ed45695..65f560328af 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -27,14 +27,13 @@ rec { isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; }; - isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; + isUnix = [ isBSD isDarwin isLinux isSunOS isCygwin ]; isMacOS = { kernel = kernels.macos; }; isiOS = { kernel = kernels.ios; }; isLinux = { kernel = kernels.linux; }; isSunOS = { kernel = kernels.solaris; }; isFreeBSD = { kernel = kernels.freebsd; }; - isHurd = { kernel = kernels.hurd; }; isNetBSD = { kernel = kernels.netbsd; }; isOpenBSD = { kernel = kernels.openbsd; }; isWindows = { kernel = kernels.windows; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 7ee3479c333..bb26c93f3d7 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -172,7 +172,6 @@ rec { macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; ios = { execFormat = macho; families = { inherit darwin; }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; }; - hurd = { execFormat = elf; families = { }; }; linux = { execFormat = elf; families = { }; }; netbsd = { execFormat = elf; families = { inherit bsd; }; }; none = { execFormat = unknown; families = { }; }; @@ -259,8 +258,6 @@ rec { "2" = # We only do 2-part hacks for things Nix already supports if elemAt l 1 == "cygwin" then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } - else if elemAt l 1 == "gnu" - then { cpu = elemAt l 0; kernel = "hurd"; abi = "gnu"; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; "3" = # Awkwards hacks, beware! if elemAt l 1 == "apple" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index ffdd8ae929c..91604280e4e 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -22,7 +22,7 @@ in with lib.systems.doubles; lib.runTests { cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]); freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); - gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); + gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */)); illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]); netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 101a6feeeae..3e9ddacac1b 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -181,39 +180,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -379,21 +346,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) + ++ optionals javaAwtGtk [ gmp mpfr ]) ); EXTRA_TARGET_FLAGS = optionals @@ -413,10 +372,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1df87cc3d42..9b4444b905d 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -190,39 +189,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -401,22 +368,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + ++ optionals javaAwtGtk [ gmp mpfr ])); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -435,10 +393,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1215c971f23..3fdec1ec310 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -188,39 +187,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -302,7 +269,7 @@ stdenv.mkDerivation ({ ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ optional (!(crossMingw && crossStageStatic)) - "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -400,13 +367,6 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] @@ -414,8 +374,7 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + )); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -434,10 +393,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 0fb39075895..099e26375f4 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -192,39 +191,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -408,22 +375,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + ++ optionals javaAwtGtk [ gmp mpfr ])); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -442,10 +400,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c5541da0790..60e429cc4da 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -165,39 +164,7 @@ stdenv.mkDerivation ({ patchShebangs $configureScript done '' + ( - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -357,19 +324,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -388,10 +345,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 5d7be163783..a05c1c71812 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -160,39 +159,7 @@ stdenv.mkDerivation ({ patchShebangs $configureScript done '' + ( - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -346,19 +313,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -377,10 +334,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 124fdbcdf9d..275b380e90f 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -134,39 +133,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -314,19 +281,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -345,10 +302,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index ae59f85a211..1c2efbeea76 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,9 +11,6 @@ , pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null , guile ? null -# Additional dependencies for GNU/Hurd. -, mig ? null, hurd ? null - }: let @@ -21,7 +18,6 @@ let version = "8.1.1"; in -assert targetPlatform.isHurd -> mig != null && hurd != null; assert pythonSupport -> python != null; stdenv.mkDerivation rec { @@ -38,13 +34,10 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] - # TODO(@Ericson2314) not sure if should be host or target - ++ stdenv.lib.optional targetPlatform.isHurd mig; + nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat zlib guile ] ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional targetPlatform.isHurd hurd ++ stdenv.lib.optional doCheck dejagnu; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix deleted file mode 100644 index d5760003525..00000000000 --- a/pkgs/os-specific/gnu/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -# Packages that make up the GNU/Hurd operating system (aka. GNU). - -args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool -, texinfo, glibcCross, hurdPartedCross, libuuid, samba -, gccCrossStageStatic, gcc -, pkgsi686Linux, newScope, config -, targetPlatform, buildPlatform -, overrides ? {} -, buildPackages, pkgs -}: - -with args; - -let - callPackage = newScope gnu; - - forcedNativePackages = - if stdenv.hostPlatform == stdenv.buildPlatform - then pkgs - else buildPackages; - - gnu = { - hurdCross = forcedNativePackages.callPackage ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo - glibcCross hurdPartedCross; - inherit (gnu) machHeaders mig; - libuuid = libuuid.crossDrv; - automake = automake111x; - headersOnly = false; - cross = assert targetPlatform != buildPlatform; targetPlatform; - gccCross = gcc; - }; - - hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo glibcCross; - inherit (gnu) machHeaders mig; - hurdPartedCross = null; - libuuid = null; - automake = automake111x; - headersOnly = false; - cross = assert targetPlatform != buildPlatform; targetPlatform; - - # The "final" GCC needs glibc and the Hurd libraries (libpthread in - # particular) so we first need an intermediate Hurd built with the - # intermediate GCC. - gccCross = gccCrossStageStatic; - - # This intermediate Hurd is only needed to build libpthread, which needs - # libihash, and to build Parted, which needs libstore and - # libshouldbeinlibc. - buildTarget = "libihash libstore libshouldbeinlibc"; - installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; - }; - - hurdHeaders = callPackage ./hurd { - automake = automake111x; - headersOnly = true; - gccCross = null; - glibcCross = null; - libuuid = null; - hurdPartedCross = null; - }; - - libpthreadHeaders = callPackage ./libpthread { - headersOnly = true; - hurd = null; - }; - - libpthreadCross = forcedNativePackages.callPackage ./libpthread { - inherit fetchgit stdenv autoconf automake libtool glibcCross; - inherit (gnu) machHeaders hurdHeaders; - hurd = gnu.hurdCrossIntermediate; - gccCross = gccCrossStageStatic; - cross = assert targetPlatform != buildPlatform; targetPlatform; - }; - - # In theory GNU Mach doesn't have to be cross-compiled. However, since it - # has to be built for i586 (it doesn't work on x86_64), one needs a cross - # compiler for that host. - mach = callPackage ./mach { - automake = automake111x; - }; - - machHeaders = callPackage ./mach { - automake = automake111x; - headersOnly = true; - mig = null; - }; - - mig = callPackage ./mig { - # Build natively, but force use of a 32-bit environment because we're - # targeting `i586-pc-gnu'. - stdenv = pkgsi686Linux.stdenv; - }; - - # XXX: Use this one for its `.crossDrv'. Using the one above from - # `x86_64-linux' leads to building a different cross-toolchain because of - # the `forceSystem'. - mig_raw = callPackage ./mig {}; - - smbfs = callPackage ./smbfs { - hurd = gnu.hurdCross; - }; - - unionfs = callPackage ./unionfs { - hurd = gnu.hurdCross; - }; - } - - # Allow callers to override elements of this attribute set. - // overrides; - -in gnu # we trust! diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix deleted file mode 100644 index a0c4be0ff45..00000000000 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, texinfo -, machHeaders, mig, headersOnly ? true -, cross ? null, gccCross ? null, glibcCross ? null -, hurdPartedCross ? null, libuuid ? null -, buildTarget ? "all", installTarget ? "install" }: - -assert (cross != null) -> (gccCross != null); -assert (hurdPartedCross != null) -> (libuuid != null); - -let - # Unfortunately we can't use `master@{DATE}', see - # . - date = "20111115"; - rev = "969fbb646ffd89a482302e303eaded79781c3331"; - suffix = if headersOnly - then "-headers" - else (if buildTarget != "all" - then "-minimal" - else ""); -in -stdenv.mkDerivation ({ - name = "hurd${suffix}-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/hurd.git"; - sha256 = "b7f57ec2c6dcaf35ec03fb7979eb5506180ce4c6e2edf60a587f12ac5b11f004"; - inherit rev; - }; - - buildInputs = [ autoconf automake libtool texinfo mig ] - ++ stdenv.lib.optional (hurdPartedCross != null) hurdPartedCross - ++ stdenv.lib.optional (libuuid != null) libuuid - ++ stdenv.lib.optional (gccCross != null) gccCross - ++ stdenv.lib.optional (glibcCross != null) glibcCross; - - propagatedBuildInputs = [ machHeaders ]; - - configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ] - ++ (if hurdPartedCross != null - then [ "--with-parted" ] - else [ "--without-parted" ]); - - # Use `preConfigure' only for `autoreconf', so that users know they can - # simply clear it when the autoconf phase is unneeded. - preConfigure = "autoreconf -vfi"; - - postConfigure = - '' echo "removing \`-o root' from makefiles..." - for mf in {utils,daemons}/Makefile - do - sed -i "$mf" -e's/-o root//g' - done - ''; - - # Not needed after https://github.com/NixOS/nixpkgs/pull/43833 - dontPatchShebangs = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - description = "The GNU Hurd, GNU project's replacement for the Unix kernel"; - - longDescription = - '' The GNU Hurd is the GNU project's replacement for the Unix kernel. - It is a collection of servers that run on the Mach microkernel to - implement file systems, network protocols, file access control, and - other features that are implemented by the Unix kernel or similar - kernels (such as Linux). - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} - -// - -stdenv.lib.optionalAttrs (!headersOnly && buildTarget != null) { - # Use the default `buildPhase' and `installPhase' so that the usual hooks - # can still be used. - buildFlags = buildTarget; - installTargets = assert installTarget != null; installTarget; -} - -// - -stdenv.lib.optionalAttrs headersOnly { - dontBuild = true; - installPhase = "make install-headers"; -}) diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix deleted file mode 100644 index a2e1081a1e8..00000000000 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, libtool -, machHeaders, hurdHeaders, hurd, headersOnly ? false -, cross ? null, gccCross ? null, glibcCross ? null }: - -assert (cross != null) -> (gccCross != null) && (glibcCross != null); -assert (!headersOnly) -> (hurd != null); - -let - date = "20111020"; - - # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in - # . - rev = "a7b82c3302bf9c47176648eb802a61ae2d9a16f5"; -in -stdenv.mkDerivation ({ - name = "libpthread-hurd-${if headersOnly then "headers-" else ""}${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/libpthread.git"; - sha256 = "e8300762914d927c0da4168341a5982a1057613e1af363ee68942087b2570b3d"; - inherit rev; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ machHeaders hurdHeaders ] - ++ stdenv.lib.optional (!headersOnly) hurd - ++ stdenv.lib.optional (gccCross != null) gccCross; - - preConfigure = "autoreconf -vfi"; - - meta = { - description = "GNU Hurd's libpthread"; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} - -// - -(if headersOnly - then { - configureFlags = - [ "--build=i586-pc-gnu" - "ac_cv_lib_ihash_hurd_ihash_create=yes" - ]; - - dontBuild = true; - installPhase = "make install-data-local-headers"; - } - else { }) - -// - -(if cross != null - then { - # Tell gcc where to find `crt1.o' et al. This is specified in two - # different ways: one for gcc as run from `configure', and one for linking - # libpthread.so (by default `libtool --mode=link' swallows `-B', hence - # this workaround; see - # .) - LDFLAGS = "-B${glibcCross}/lib"; - makeFlags = [ "LDFLAGS=-Wc,-B${glibcCross}/lib" ]; - - # Help the linker find glibc. - CPATH = "${glibcCross}/include"; - LIBRARY_PATH = "${glibcCross}/lib"; - - passthru = { - # Extra target LDFLAGS to allow the cross-linker to find the - # dependencies of the cross libpthread.so, namely libihash.so. - # Note: these are raw `ld' flags, so `-Wl,' must be prepended when using - # `gcc'. - # - # This is actually only useful while building the final cross-gcc, since - # afterwards gcc-cross-wrapper should add the relevant flags. - TARGET_LDFLAGS = "-rpath-link=${hurd}/lib"; - }; - } - else { })) diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix deleted file mode 100644 index 852b400ccb1..00000000000 --- a/pkgs/os-specific/gnu/mach/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ fetchgit, stdenv, mig ? null, autoconf, automake, texinfo -, headersOnly ? false }: - -assert (!headersOnly) -> (mig != null); - -let - date = "20120303"; - rev = "2a603e88f86bee88e013c2451eacf076fbcaed81"; -in -stdenv.mkDerivation ({ - name = "gnumach${if headersOnly then "-headers" else ""}-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/gnumach.git"; - sha256 = "1q8zk8xzbiwpnvvmfgkylj4gwkvkn5n2ydy9j054qv5plnaczj1c"; - inherit rev; - }; - - configureFlags = - stdenv.lib.optional headersOnly "--build=i586-pc-gnu" # cheat - - # Always enable dependency tracking. See - # . - ++ [ "--enable-dependency-tracking" ]; - - nativeBuildInputs = [ autoconf automake texinfo ] - ++ stdenv.lib.optional (mig != null) mig; - - preConfigure = "autoreconf -vfi"; - - meta = { - description = "GNU Mach, the microkernel used by the GNU Hurd"; - - longDescription = - '' GNU Mach is the microkernel that the GNU Hurd system is based on. - - It is maintained by the Hurd developers for the GNU project and - remains compatible with Mach 3.0. - - The majority of GNU Mach's device drivers are from Linux 2.0. They - were added using glue code, i.e., a Linux emulation layer in Mach. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = [ "i586-gnu" ]; - }; -} - -// - -(if headersOnly - then { dontBuild = true; installPhase = "make install-data"; } - else {})) diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix deleted file mode 100644 index d138011d595..00000000000 --- a/pkgs/os-specific/gnu/mig/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders, bash }: - -let - date = "20100512"; - rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8"; -in -stdenv.mkDerivation { - name = "mig-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/mig.git"; - sha256 = "d6958d9b60925d4600aac133c9505bc873a16b203c69260bd0fb228922ee9273"; - inherit rev; - }; - - patches = [ ./noyywrap.patch ]; - - nativeBuildInputs = [ autoconf automake flex bison machHeaders ]; - - preConfigure = "autoreconf -vfi"; - - doCheck = true; - - # Fix the shebang to point to the cross-built shell. Won't be needed - # after #43833. - postInstall = '' - sed -i "$out/bin/mig" -e 's|^#!/.*|#!${bash}/bin/sh|g' - ''; - - meta = { - description = "GNU MIG, the Mach interface generator"; - - longDescription = - '' GNU MIG is the GNU distribution of the Mach 3.0 interface generator - MIG, as maintained by the GNU Hurd developers for the GNU project. - - You need this tool to compile the GNU Mach and GNU Hurd - distributions, and to compile the GNU C library for the Hurd. Also, - you will need it for other software in the GNU system that uses - Mach-based inter-process communication. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; - - # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # really GNU/Hurd - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/os-specific/gnu/mig/noyywrap.patch b/pkgs/os-specific/gnu/mig/noyywrap.patch deleted file mode 100644 index 40ca6171f64..00000000000 --- a/pkgs/os-specific/gnu/mig/noyywrap.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix undefined reference to `yywrap'. - -diff --git a/lexxer.l b/lexxer.l -index 9725d0b..15264bc 100644 ---- a/lexxer.l -+++ b/lexxer.l -@@ -1,4 +1,5 @@ - %option nounput -+%option noyywrap - - %k 10000 - %n 5000 diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix deleted file mode 100644 index 6f3d719d816..00000000000 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchcvs, stdenv, hurd, machHeaders, samba }: - -let - date = "2012-03-15"; - samba_patched = stdenv.lib.overrideDerivation samba (attrs: { - patches = attrs.patches ++ [ ./samba-without-byte-range-locks.patch ]; - }); -in -stdenv.mkDerivation rec { - name = "smbfs-${date}"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras"; - module = "smbfs"; - sha256 = "5941d1a5da4488cbf0efe9aa0b41fe4ff5ba57b84ed24f7ff7c0feda4501d3e3"; - inherit date; - }; - - patchPhase = - '' sed -i "Makefile" \ - -e 's|gcc|i586-pc-gnu-gcc|g ; - s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g' - ''; - - buildInputs = [ hurd machHeaders samba_patched ]; - - installPhase = - '' mkdir -p "$out/hurd" - cp -v smbfs "$out/hurd" - - mkdir -p "$out/share/doc/${name}" - cp -v README "$out/share/doc/${name}" - ''; - - meta = { - description = "SMB/CIFS file system translator for GNU/Hurd"; - - homepage = http://www.nongnu.org/hurdextras/; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch b/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch deleted file mode 100644 index 893a29c7539..00000000000 --- a/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch +++ /dev/null @@ -1,14 +0,0 @@ -Since GNU/Hurd doesn't support byte-range file locks, shamelessly -disable them to allow the SMB client library to work (it uses TDB -to access /etc/samba/private/secrets.tdb, for instance.) - ---- samba/lib/tdb/common/lock.c 2010-02-08 16:12:57.000000000 +0100 -+++ samba/lib/tdb/common/lock.c 2012-03-01 23:39:02.000000000 +0100 -@@ -48,7 +48,7 @@ int tdb_brlock(struct tdb_context *tdb, - struct flock fl; - int ret; - -- if (tdb->flags & TDB_NOLOCK) { -+ if (1) { - return 0; - } diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix deleted file mode 100644 index 5e2f428130c..00000000000 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchgit, stdenv, hurd, machHeaders, mig }: - -let - date = "20120313"; - rev = "64dfa4e12d93c13b676d1cd7d86f4f4004ebfafa"; -in -stdenv.mkDerivation rec { - name = "unionfs-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/unionfs.git"; - sha256 = "1c3d71112cb25f8f82719a16df936e43abcb1adb77af96c1bb100a8ad0889d65"; - inherit rev; - }; - - patchPhase = - '' sed -i "Makefile" \ - -e 's|gcc|i586-pc-gnu-gcc|g ; - s|-std=gnu99|-std=gnu99 -fgnu89-inline|g' - ''; - - makeFlags = [ "CC=i586-pc-gnu-gcc" ]; - buildInputs = [ hurd machHeaders ]; - nativeBuildInputs = [ mig ]; - - installPhase = - '' mkdir -p "$out/hurd" - cp -v unionfs "$out/hurd" - - mkdir -p "$out/share/doc/${name}" - cp -v [A-Z]* "$out/share/doc/${name}" - ''; - - meta = { - description = "Union file system translator for GNU/Hurd"; - - homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b3934c88ed2..c661b2e1e4c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -121,7 +121,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) - isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD + isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index f356727e64b..f7071e45232 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lvm2, libuuid, gettext, readline -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.1"; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 643a3bafc66..709246269f8 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.2"; @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e176844738f..f4d75ff426f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4502,7 +4502,7 @@ with pkgs; patchutils = callPackage ../tools/text/patchutils { }; - parted = callPackage ../tools/misc/parted { hurd = null; }; + parted = callPackage ../tools/misc/parted { }; pell = callPackage ../applications/misc/pell { }; @@ -4529,24 +4529,6 @@ with pkgs; pngout = callPackage ../tools/graphics/pngout { }; - hurdPartedCross = - if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" - then (makeOverridable - ({ hurd }: - (parted.override { - # Needs the Hurd's libstore. - inherit hurd; - - # The Hurd wants a libparted.a. - enableStatic = true; - - gettext = null; - readline = null; - devicemapper = null; - }).crossDrv) - { hurd = gnu.hurdCrossIntermediate; }) - else null; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; }; patch = gnupatch; @@ -8762,8 +8744,6 @@ with pkgs; gdb = callPackage ../development/tools/misc/gdb { guile = null; - hurd = gnu.hurdCross; - inherit (gnu) mig; }; jhiccup = callPackage ../development/tools/java/jhiccup { }; @@ -13737,22 +13717,7 @@ with pkgs; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; - libuuid = - if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" - then (utillinuxMinimal // { - crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: { - # `libblkid' fails to build on GNU/Hurd. - configureFlags = args.configureFlags - + " --disable-libblkid --disable-mount --disable-libmount" - + " --disable-fsck --enable-static --disable-partx"; - doCheck = false; - CPPFLAGS = # ugly hack for ugly software! - lib.concatStringsSep " " - (map (v: "-D${v}=4096") - [ "PATH_MAX" "MAXPATHLEN" "MAXHOSTNAMELEN" ]); - }); - }) - else if stdenv.isLinux + libuuid = if stdenv.isLinux then utillinuxMinimal else null; @@ -13824,9 +13789,6 @@ with pkgs; nmon = callPackage ../os-specific/linux/nmon { }; - # GNU/Hurd core packages. - gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { }); - hwdata = callPackage ../os-specific/linux/hwdata { }; i7z = callPackage ../os-specific/linux/i7z { }; From 42bfaab927cbdc71c96ffdda85e13cdd2da37aa7 Mon Sep 17 00:00:00 2001 From: Niclas <33751841+countingsort@users.noreply.github.com> Date: Tue, 28 Aug 2018 23:18:55 +0200 Subject: [PATCH 104/138] bunny: init at 1.1 (#45714) * bunny: init at 1.1 Motivation for this change Pretty useful not to have to think about what system you're on when doing basic (un)installation tasks. * Fixed typo --- maintainers/maintainer-list.nix | 5 ++++ .../package-management/bunny/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/tools/package-management/bunny/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 093a2aae86b..1d6d772e7e9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -832,6 +832,11 @@ github = "couchemar"; name = "Andrey Pavlov"; }; + countingsort = { + email = "niclas@countingsort.com"; + github = "countingsort"; + name = "Niclas Meyer"; + }; cpages = { email = "page@ruiec.cat"; github = "cpages"; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix new file mode 100644 index 00000000000..c73f3fb524c --- /dev/null +++ b/pkgs/tools/package-management/bunny/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + name = "bunny-${version}"; + version = "1.1"; + + src = fetchFromGitLab { + owner = "tim241"; + repo = "bunny"; + rev = version; + sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki"; + }; + + dontBuild = true; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "A simple shell script wrapper around multiple package managers"; + homepage = https://gitlab.com/tim241/bunny; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ countingsort ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ace56296ea5..7654b56da12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -635,6 +635,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + bunny = callPackage ../tools/package-management/bunny { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; From 045c4d8f646db2a19fed990e1f29c256a5ceae8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Aug 2018 14:28:20 -0700 Subject: [PATCH 105/138] armadillo: 8.600.0 -> 9.100.5 (#45266) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/armadillo/versions. --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index c61e960e051..16ba6b32382 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.600.0"; + version = "9.100.5"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0h3bj93s7pr7nfwgjx6c49hgf6jlp5ninp921a8krhkzx4swf02z"; + sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; }; nativeBuildInputs = [ cmake ]; From 89586ed0d030fa2e8cbe07e53bd875602817d6ca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Aug 2018 23:03:24 +0200 Subject: [PATCH 106/138] deadbeefPlugins.headerbar-gtk3: init at 1.2 --- .../audio/deadbeef/plugins/headerbar-gtk3.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix new file mode 100644 index 00000000000..dab3a97f6e7 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: + +stdenv.mkDerivation rec { + name = "deadbeef-headerbar-gtk3-plugin-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "saivert"; + repo = "ddb_misc_headerbar_GTK3"; + rev = "v${version}"; + sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; + }; + + nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + buildInputs = [ deadbeef glib gtk3 ]; + + # Choose correct installation path + # https://github.com/saivert/ddb_misc_headerbar_GTK3/commit/50ff75f76aa9d40761e352311670a894bfcd5cf6#r30319680 + makeFlags = [ "pkglibdir=$(out)/lib/deadbeef" ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; + homepage = https://github.com/saivert/ddb_misc_headerbar_GTK3; + license = licenses.gpl2Plus; + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7654b56da12..62df4709d83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15841,6 +15841,7 @@ with pkgs; }; deadbeefPlugins = { + headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { }; }; From 4f82d135f7e5875e07a3a7b1d6e9a53a6ff12884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 28 Aug 2018 19:19:48 -0300 Subject: [PATCH 107/138] pythonefl: move out of python-packages.nix - Move out of pkgs/top-level/python-packages.nix into pkgs/development/python-modules/python-efl/default.nix. - Add dependency on dbus-python. - Remove hardeningDisable. - Update some meta attributes. --- .../python-modules/python-efl/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +-------------- 2 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/python-efl/default.nix diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix new file mode 100644 index 00000000000..b1696a11f77 --- /dev/null +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: + +# Should be bumped along with EFL! + +buildPythonPackage rec { + name = "python-efl-${version}"; + version = "1.21.0"; + + src = fetchurl { + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ enlightenment.efl ]; + + propagatedBuildInputs = [ python.pkgs.dbus-python ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + ''; + + preBuild = "${python}/bin/${python.executable} setup.py build_ext"; + + installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for EFL and Elementary"; + homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/; + platforms = platforms.linux; + license = with licenses; [ gpl3 lgpl3 ]; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 941803b22d3..489f1730517 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15646,35 +15646,7 @@ EOF # added 2018-05-23, can be removed once 18.09 is branched off udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; - # Should be bumped along with EFL! - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.21.0"; - src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; - }; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" - ''; - preBuild = "${python}/bin/${python.executable} setup.py build_ext"; - installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pkgs.enlightenment.efl ]; - doCheck = false; - - meta = { - description = "Python bindings for EFL and Elementary"; - homepage = http://enlightenment.org/; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; - }; - }; + pythonefl = callPackage ../development/python-modules/python-efl { }; tlsh = buildPythonPackage rec { name = "tlsh-3.4.5"; From 9f6bc5e5f562858fd8504baf1ffaba5d7bfbfdfb Mon Sep 17 00:00:00 2001 From: Demyan Rogozhin Date: Wed, 29 Aug 2018 01:00:14 +0200 Subject: [PATCH 108/138] particl-core: 0.16.1 -> 0.16.2 (#45718) https://github.com/particl/particl-core/releases/tag/v0.16.2.0 --- pkgs/applications/altcoins/particl/particl-core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 331e169cf3f..a06f373683a 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.16.1.0"; + version = "0.16.2.0"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "0rfqywyrl6cgxn3ba91zsa88ph2yf9d1vn706xpyz19pfb6mjfbg"; + sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 5147ac77ed1767e14a67d4b6aeb017b3b0e325ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 Aug 2018 19:29:41 -0400 Subject: [PATCH 109/138] linux: 4.4.152 -> 4.4.153 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 84e04b82e16..a4433cc434c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.152"; + version = "4.4.153"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jyky74cbaz76x5bpkgw3d45kim3y8brnjp854qkx8462s4pdvhv"; + sha256 = "00jlajwbq7w5cxzzaa5mib5qvihqab3ysfq401b71ji2bi8ma8qg"; }; } // (args.argsOverride or {})) From 442681cc2ae35755171adbf49b4da709692d63ec Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 28 Aug 2018 18:31:45 -0400 Subject: [PATCH 110/138] nixos/networkd: fix range assertions on 32 bit Nix --- nixos/modules/system/boot/networkd.nix | 15 ++++++++++----- nixos/modules/system/boot/systemd-lib.nix | 8 ++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index c11aaeaeb6d..4bacf0f126a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -30,10 +30,14 @@ let (assertValueOneOf "UDPSegmentationOffload" boolValues) (assertValueOneOf "GenericReceiveOffload" boolValues) (assertValueOneOf "LargeReceiveOffload" boolValues) - (assertRange "RxChannels" 1 4294967295) - (assertRange "TxChannels" 1 4294967295) - (assertRange "OtherChannels" 1 4294967295) - (assertRange "CombinedChannels" 1 4294967295) + (assertInt "RxChannels") + (assertMinimum "RxChannels" 1) + (assertInt "TxChannels") + (assertMinimum "TxChannels" 1) + (assertInt "OtherChannels") + (assertMinimum "OtherChannels" 1) + (assertInt "CombinedChannels") + (assertMinimum "CombinedChannels" 1) ]; checkNetdev = checkUnitConfig "Netdev" [ @@ -226,7 +230,8 @@ let (assertValueOneOf "UseTimezone" boolValues) (assertValueOneOf "CriticalConnection" boolValues) (assertValueOneOf "RequestBroadcast" boolValues) - (assertRange "RouteTable" 0 4294967295) + (assertInt "RouteTable") + (assertMinimum "RouteTable" 0) (assertValueOneOf "RapidCommit" boolValues) ]; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 8b37bf8d35d..9c8d4a026b4 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -73,11 +73,19 @@ in rec { optional (attr ? ${name} && !(min <= attr.${name} && max >= attr.${name})) "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]"; + assertMinimum = name: min: group: attr: + optional (attr ? ${name} && attr.${name} < min) + "Systemd ${group} field `${name}' must be greater than or equal to ${toString min}"; + assertOnlyFields = fields: group: attr: let badFields = filter (name: ! elem name fields) (attrNames attr); in optional (badFields != [ ]) "Systemd ${group} has extra fields [${concatStringsSep " " badFields}]."; + assertInt = name: group: attr: + optional (attr ? ${name} && !isInt attr.${name}) + "Systemd ${group} field `${name}' is not an integer"; + checkUnitConfig = group: checks: attrs: let # We're applied at the top-level type (attrsOf unitOption), so the actual # unit options might contain attributes from mkOverride that we need to From 4637166ead62c5a0e1c98173a055b53231c5c3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 28 Aug 2018 21:42:30 -0300 Subject: [PATCH 111/138] pythonefl: uses python.interpreter --- pkgs/development/python-modules/python-efl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index b1696a11f77..8e3e9d9a584 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -21,9 +21,9 @@ buildPythonPackage rec { export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; - preBuild = "${python}/bin/${python.executable} setup.py build_ext"; + preBuild = "${python.interpreter} setup.py build_ext"; - installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; + installPhase= "${python.interpreter} setup.py install --prefix=$out"; doCheck = false; From 34e60f3ccb9d486b869dd1f1b36006f053a02aa1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 29 Aug 2018 10:31:46 +0800 Subject: [PATCH 112/138] microcodeIntel: 20180807 -> 20180807a --- 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 403824fb3a4..8362392e0bf 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 = "20180807"; + version = "20180807a"; src = fetchurl { - url = "https://downloadmirror.intel.com/28039/eng/microcode-${version}.tgz"; - sha256 = "0h4ygwx5brnrjz8v47aikrwhf0q3jhizxmzcii4bdjg64zffiy99"; + url = "https://downloadmirror.intel.com/28087/eng/microcode-${version}.tgz"; + sha256 = "0dw1akgzdqk95pwmc8gfdmv7kabw9pn4c67f076bcbn4krliias6"; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 1173bde56fa640eabd8b350f8fdef64e2c13ad51 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 28 Aug 2018 23:36:25 +1000 Subject: [PATCH 113/138] compton-git: 2018-05-21 -> 2018-08-14 --- pkgs/applications/window-managers/compton/git.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 90ae043fba3..89be02bf9e6 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "compton-git-${version}"; - version = "2018-05-21"; + version = "2018-08-14"; src = fetchFromGitHub { owner = "yshui"; repo = "compton"; - rev = "9b24550814b7c69065f90039b0a5d0a2281b9f81"; - sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl"; + rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; + sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { additional features, such as additional effects, and a fork at a well-defined and proper place. ''; - maintainers = [ maintainers.ertes maintainers.twey ]; + maintainers = with maintainers; [ ertes enzime twey ]; platforms = platforms.linux; }; } From 8b7fe8910c78c460eac07f94cd7a4439fa792e55 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 29 Aug 2018 12:47:35 +1000 Subject: [PATCH 114/138] compton, compton-git: Merge derivations --- .../window-managers/compton/default.nix | 116 ++++++++++-------- .../window-managers/compton/git.nix | 60 --------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 68 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/window-managers/compton/git.nix diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index d79d8c3325d..e5faf084a42 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,59 +3,77 @@ , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo }: -stdenv.mkDerivation rec { - name = "compton-0.1_beta2.5"; +let + common = source: stdenv.mkDerivation (source // rec { + name = "${source.pname}-${source.version}"; - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; + buildInputs = [ + dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + ]; - buildInputs = [ - libX11 - libXcomposite - libXdamage - libXrender - libXrandr - libXext - libXinerama - libdrm - pcre - libconfig - dbus - libGL - ]; + nativeBuildInputs = [ + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; - nativeBuildInputs = [ - pkgconfig - asciidoc - libxml2 - docbook_xml_dtd_45 - docbook_xsl - libxslt - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/chjj/compton/; - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} ''; - license = licenses.mit; - platforms = platforms.linux; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; + }; + }); + + stableSource = { + pname = "compton"; + version = "0.1_beta2.5"; + + src = fetchFromGitHub { + owner = "chjj"; + repo = "compton"; + rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; + sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; + }; + + meta = { + homepage = https://github.com/chjj/compton/; + }; }; + + gitSource = { + pname = "compton-git"; + version = "2018-08-14"; + + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; + sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; + }; + + meta = { + homepage = https://github.com/yshui/compton/; + }; + }; +in { + compton = common stableSource; + compton-git = common gitSource; } diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix deleted file mode 100644 index 89be02bf9e6..00000000000 --- a/pkgs/applications/window-managers/compton/git.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, - pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, - libXrandr, libXrender, xwininfo }: - -stdenv.mkDerivation rec { - name = "compton-git-${version}"; - version = "2018-08-14"; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; - sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; - }; - - nativeBuildInputs = [ - asciidoc - docbook_xml_dtd_45 - docbook_xsl - pkgconfig - ]; - - buildInputs = [ - dbus - libXcomposite - libXdamage - libXext - libXfixes - libXinerama - libXrandr - libXrender - libconfig - libdrm - libxml2 - libxslt - libGLU_combined - pcre - ]; - - propagatedBuildInputs = [ xwininfo ]; - - installFlags = "PREFIX=$(out)"; - - meta = with stdenv.lib; { - description = - "A fork of XCompMgr, a sample compositing manager for X servers (git version)"; - homepage = https://github.com/yshui/compton/; - license = licenses.mit; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - maintainers = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db9e256ffa..798521ac6f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19364,9 +19364,7 @@ with pkgs; inherit (xorg) xcompmgr; - compton = callPackage ../applications/window-managers/compton { }; - - compton-git = callPackage ../applications/window-managers/compton/git.nix { }; + inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; xdaliclock = callPackage ../tools/misc/xdaliclock {}; From 591a3d0af261f826e56d2f0bf176e27702e73992 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 29 Aug 2018 14:32:49 +0800 Subject: [PATCH 115/138] cifs-utils: also generate manpages --- pkgs/os-specific/linux/cifs-utils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 7b6dd6fba35..7d98e51c1c7 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, kerberos, keyutils, pam, talloc }: +{ stdenv, fetchurl, autoreconfHook, docutils, pkgconfig +, kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { name = "cifs-utils-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; + buildInputs = [ kerberos keyutils pam talloc ]; makeFlags = "root_sbindir=$(out)/sbin"; From 7a3f62fa0bad040ec38d5a8e8d46381c3ec6b1af Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 29 Aug 2018 08:54:51 +0200 Subject: [PATCH 116/138] atom, atom-beta: 1.29.0 -> 1.30.0, 1.30.0-beta1 -> 1.31.0-beta0 --- pkgs/applications/editors/atom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index bc3f8baf510..d5e0259d2ad 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -73,13 +73,13 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.29.0"; - sha256 = "0f0qpn8aw2qlqk8ah71xvk4vcmwsnsf2f3g4hz0rvaqnhb9ri9fz"; + version = "1.30.0"; + sha256 = "1hqizfn9c249l51rlpfgk0h374maqgw6pagswlh4xa278qzb6qzs"; }; atom-beta = { - version = "1.30.0"; - beta = 1; - sha256 = "0ygqj81xlwhzmmci0d0rd2q7xfskxd1k7h6db3zvvjdxjcnyqp1z"; + version = "1.31.0"; + beta = 0; + sha256 = "11nlaz89rg6lgzsxp83qdqk4bnn2cij2p5aqjd9a3phd7v70xmy5"; }; } From 8f6d3a3c33002e65a77939f1cad2b794ed6be6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:12:56 +0100 Subject: [PATCH 117/138] awesome-3-5: remove deprecated version (#45736) this version is deprecated and no longer maintained by upstream: https://awesomewm.org/download/ Two years should have been enough for people to upgrade. --- .../window-managers/awesome/3.5.nix | 86 ------------------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 90 deletions(-) delete mode 100644 pkgs/applications/window-managers/awesome/3.5.nix diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix deleted file mode 100644 index f3d43d15efb..00000000000 --- a/pkgs/applications/window-managers/awesome/3.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf -, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter -, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm -, which, dbus, nettools, git, asciidoc, doxygen -, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -}: - -let - version = "3.5.9"; -in with luaPackages; - -stdenv.mkDerivation rec { - name = "awesome-${version}"; - - src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; - }; - - meta = with stdenv.lib; { - description = "Highly configurable, dynamic window manager for X"; - homepage = http://awesome.naquadah.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; - }; - - nativeBuildInputs = [ - asciidoc - cmake - doxygen - imagemagick - makeWrapper - pkgconfig - xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs - ]; - - buildInputs = [ - cairo - dbus - gdk_pixbuf - gobjectIntrospection - git - lgi - libpthreadstubs - libstartup_notification - libxdg_basedir - lua - nettools - pango - xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - ]; - - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; - - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; - GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; - LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; - - postInstall = '' - wrapProgram $out/bin/awesome \ - --prefix LUA_CPATH ";" "${lgi}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ";" "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" - - wrapProgram $out/bin/awesome-client \ - --prefix PATH : "${which}/bin" - ''; - - passthru = { - inherit lua; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 798521ac6f2..95fa7095cba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15458,10 +15458,6 @@ with pkgs; ffmpeg = ffmpeg_2; }; - awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix { - cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; - }; awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; From e4881e221b01138ab5b3e91332cce1c6423400b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:13:54 +0100 Subject: [PATCH 118/138] finalterm: remove non-working version (#45737) This is abandom-ware: https://worldwidemann.com/finally-terminated/ and it coredumps on startup --- pkgs/applications/misc/finalterm/default.nix | 65 -------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 67 deletions(-) delete mode 100644 pkgs/applications/misc/finalterm/default.nix diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix deleted file mode 100644 index 2c024b9fe0e..00000000000 --- a/pkgs/applications/misc/finalterm/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc -, keybinder3, clutter-gtk, libnotify -, libxkbcommon, xorg, udev -, bashInteractive -}: - -with stdenv.lib; - -stdenv.mkDerivation { - name = "finalterm-git-2014-11-15"; - - src = fetchFromGitHub { - owner = "p-e-w"; - repo = "finalterm"; - rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; - sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; - }; - - nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; - buildInputs = [ - vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee - gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify - xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence - libxkbcommon - ] ++ optionals stdenv.isLinux [ udev ]; - - preConfigure = '' - substituteInPlace data/org.gnome.finalterm.gschema.xml \ - --replace "/bin/bash" "${bashInteractive}/bin/bash" - - cmakeFlagsArray=( - -DMINIMAL_FLAGS=ON - ) - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ - ''; - - postFixup = '' - wrapProgram "$out/bin/finalterm" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - homepage = http://finalterm.org; - description = "A new breed of terminal emulator"; - longDescription = '' - Final Term is a new breed of terminal emulator. - - It goes beyond mere emulation and understands what is happening inside the shell it is hosting. This allows it to offer features no other terminal can, including: - - - Semantic text menus - - Smart command completion - - GUI terminal controls - ''; - license = licenses.gpl3Plus; - maintainers = [ maintainers.cstrahan ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95fa7095cba..62bf6d2c607 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19497,8 +19497,6 @@ with pkgs; openssl = null; }; - finalterm = callPackage ../applications/misc/finalterm { }; - roxterm = callPackage ../applications/misc/roxterm { inherit (gnome3) gsettings-desktop-schemas vte; }; From d8238b66c1dc7e353e6a67bbd45435ab436f7513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= Date: Wed, 29 Aug 2018 11:28:34 +0200 Subject: [PATCH 119/138] vim-fireplace: init at 2018-06-01 (#45725) --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5944dfc991d..f32c1795409 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2762,6 +2762,17 @@ self = rec { }; + vim-fireplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-fireplace-2018-06-01"; + src = fetchgit { + url = "https://github.com/tpope/vim-fireplace"; + rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; + sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; + }; + dependencies = []; + + }; + vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-flagship-2018-07-24"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 32a9a621601..f2a46ee8a80 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -233,6 +233,7 @@ "github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-fireplace" "github:tpope/vim-flagship" "github:tpope/vim-fugitive" "github:tpope/vim-pathogen" From e9f0afe7616a961e43d764a29a58860043583472 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Wed, 29 Aug 2018 11:30:30 +0200 Subject: [PATCH 120/138] herbstluftwm: 0.7.0 -> 0.7.1 (#45669) --- pkgs/applications/window-managers/herbstluftwm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 6f3505056c3..d49c893ca14 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.0"; + name = "herbstluftwm-0.7.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy"; + sha256 = "0d47lbjxxqd8d96hby47bdhyn9mlih7h28712j1vckiz05ig63nw"; }; patchPhase = '' substituteInPlace config.mk \ --replace "/usr/local" "$out" \ --replace "/etc" "$out/etc" \ - --replace "/zsh/functions/Completion/X" "/zsh/site-functions" + --replace "/zsh/functions/Completion/X" "/zsh/site-functions" \ + --replace "/usr/share" "\$(PREFIX)/share" ''; nativeBuildInputs = [ pkgconfig ]; From b0d4c25c1c66ec4b0394bae3ea4890e02cb00402 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Aug 2018 11:35:00 +0200 Subject: [PATCH 121/138] fwupd: do not wrap efi capsule (#45719) wrapGAppsHook is not able to skip efi capsules so we need to switch to manual wrapping. Closes: https://github.com/NixOS/nixpkgs/issues/45715 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index f018b5c2a7d..e29dd2e6ee5 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -79,6 +79,19 @@ in stdenv.mkDerivation { FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # TODO: wrapGAppsHook wraps efi capsule even though it is not elf + dontWrapGApps = true; + # so we need to wrap the executables manually + postFixup = '' + find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *.efi ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done + ''; + # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ From 9540b1c5357acd63f89c985a85faee79bf28d902 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Wed, 29 Aug 2018 12:12:12 +0200 Subject: [PATCH 122/138] nixos/tests: Set DefaultTimeoutStartSec very high (#44916) DefaultTimeoutStartSec is normally set to 90 seconds and works fine. But when running NixOS tests on a very slow machine (like a VM without nested virtualisation support) this default is to low and causes systemd units to fail spuriously. One symptom of this issue are tests at times failing with "timed out waiting for the VM to connect". Since the VM connect timeout is 300 seconds I also set DefaultTimeoutStartSec to this which is ridiculously high. --- nixos/modules/testing/test-instrumentation.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index d94e21d681f..ed4cfa7805e 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -102,8 +102,12 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; MaxLevelConsole=debug ''; - # Don't clobber the console with duplicate systemd messages. - systemd.extraConfig = "ShowStatus=no"; + systemd.extraConfig = '' + # Don't clobber the console with duplicate systemd messages. + ShowStatus=no + # Allow very slow start + DefaultTimeoutStartSec=300 + ''; boot.consoleLogLevel = 7; From ffba654405cb799f7db941eaa14446c9c31ae670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 09:49:29 +0100 Subject: [PATCH 123/138] vala_0_26: remove --- pkgs/development/compilers/vala/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 510688ef416..85d3e579ff7 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -43,13 +43,6 @@ let }; in rec { - - vala_0_26 = generic { - major = "0.26"; - minor = "2"; - sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p"; - }; - vala_0_28 = generic { major = "0.28"; minor = "1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62bf6d2c607..aa8b21abea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7260,7 +7260,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_26 vala_0_28 vala_0_32 vala_0_34 From 3a56156866bc5dc94e9a455aff791ddbfaa88122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 09:51:42 +0100 Subject: [PATCH 124/138] vala_0_32: remove --- pkgs/desktops/gnome-3/misc/california/default.nix | 4 ++-- pkgs/development/compilers/vala/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index 91aeb7ca00a..7c90d8fa4e4 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 85d3e579ff7..02d724cb2af 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -49,12 +49,6 @@ in rec { sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; - vala_0_32 = generic { - major = "0.32"; - minor = "1"; - sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; - }; - vala_0_34 = generic { major = "0.34"; minor = "17"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa8b21abea8..168c4a61c99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7261,7 +7261,6 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_28 - vala_0_32 vala_0_34 vala_0_36 vala_0_38 From cbdcf6b4db2e94438fcb54a7394fa31e31502faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:57:08 +0100 Subject: [PATCH 125/138] vanubi: remove --- pkgs/applications/editors/vanubi/default.nix | 29 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/vanubi/default.nix diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix deleted file mode 100644 index 98f45f6be02..00000000000 --- a/pkgs/applications/editors/vanubi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake -, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: - -stdenv.mkDerivation rec { - name = "vanubi-${version}"; - version = "0.0.16"; - - src = fetchurl { - url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz"; - sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_28 which autoconf automake - libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; - - configureScript = "./autogen.sh"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://vanubi.github.io/vanubi; - description = "Programming editor for GTK+ inspired by Emacs"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 168c4a61c99..a62df36eba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18921,8 +18921,6 @@ with pkgs; valentina = libsForQt5.callPackage ../applications/misc/valentina { }; - vanubi = callPackage ../applications/editors/vanubi { }; - vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; From 341a531c3d8c2c963652b8e31cebc2c969b01f96 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Wed, 29 Aug 2018 13:37:59 +0300 Subject: [PATCH 126/138] bat: 0.5.0 -> 0.6.0 --- pkgs/tools/misc/bat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b8a2b391395..6503dadf457 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "0ms1hmv6qx15p47l07h7szwq0bgphhskc0xca2l641159h55r6dg"; + sha256 = "04ip0h1n7wavd7j7r7ppcy3v4987yv44mgw8qm8d56pcw67f9vwk"; fetchSubmodules = true; }; - cargoSha256 = "1dzm44kcx3plh74qr4wghl3wqwr62hcxzlcv7mhh0vvk3z36c8d4"; + cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi"; nativeBuildInputs = [ cmake pkgconfig zlib ]; From d314c4d3ce18172313225467047b13f5ebcef1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:56:29 +0100 Subject: [PATCH 127/138] vala_0_28: remove --- pkgs/development/compilers/vala/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 02d724cb2af..a4a8aa980b6 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -43,12 +43,6 @@ let }; in rec { - vala_0_28 = generic { - major = "0.28"; - minor = "1"; - sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; - }; - vala_0_34 = generic { major = "0.34"; minor = "17"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a62df36eba3..da150ae19ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7260,7 +7260,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_28 vala_0_34 vala_0_36 vala_0_38 From f23c7658271e83d3ba903c8bd9655737ee959b39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 29 Aug 2018 12:34:38 +0000 Subject: [PATCH 128/138] hhvm: mark as broken --- pkgs/development/compilers/hhvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 749e4125a0b..010dacd0c71 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = "PHP/Zend"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373 }; } From 256e347dfe2e8ab0070d85320fc1cc7da163eb92 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 Aug 2018 17:13:35 +0200 Subject: [PATCH 129/138] signal-desktop-beta: remove This package was marked as broken since 9cb0b496737341faf19ea62d81583ece52617a69. Reason: The package is outdated and keeping up with the beta releases isn't really worth it (there are regular stable releases). --- .../signal-desktop/beta.nix | 92 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 94 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix deleted file mode 100644 index 7d6854460d6..00000000000 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev -}: -let - rpath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk_pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb - ]; - -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; - - version = "1.1.0-beta.5"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; - - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out - cp -R usr/share $out/share - - chmod -R g-w $out - - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/opt/Signal Beta" \ - "$out/opt/Signal Beta/signal-desktop-beta" - - # Symlink to bin - mkdir -p $out/bin - ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop-beta.desktop \ - --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - ''; - - meta = { - description = "Signal Private Messenger for the Desktop (Beta version)"; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus benley ]; - platforms = [ - "x86_64-linux" - ]; - # Marked as broken on 2018-04-17. Reason: The most recent version is - # 1.8.0-beta.1, while this is still 1.1.0-beta.5 (2017-12-09). The stable - # package (signal-desktop) should be used instead (currently at version - # 1.7.1, i.e. up-to-date). - broken = true; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da150ae19ca..487e937cb08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5167,8 +5167,6 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; - signal-desktop-beta = callPackage ../applications/networking/instant-messengers/signal-desktop/beta.nix { }; - # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; From 734c2bc4d07d6b413501492a31318585a366307a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 17:03:40 +0100 Subject: [PATCH 130/138] systemd-cryptsetup-generator: cryptsetup belongs to buildInputs This fixes the build. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 720e3fbbc9f..703d13126a3 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,10 +1,10 @@ { stdenv, systemd, cryptsetup }: -stdenv.lib.overrideDerivation systemd (p: { +systemd.overrideAttrs (p: { version = p.version; name = "systemd-cryptsetup-generator-${p.version}"; - nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; + buildInputs = p.buildInputs ++ [ cryptsetup ]; outputs = [ "out" ]; buildPhase = '' From 03d5065c064c671d2cd618afe0dcfac88bd99e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 30 Aug 2018 01:07:45 +0900 Subject: [PATCH 131/138] kcov: 35 -> 36 --- .../tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 ------------ pkgs/development/tools/analysis/kcov/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch deleted file mode 100644 index d5c3662e9ab..00000000000 --- a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc -index 59b615f..e02cddf 100644 ---- a/src/engines/ptrace.cc -+++ b/src/engines/ptrace.cc -@@ -21,6 +21,7 @@ - - #if defined(__aarch64__) - # include -+# include - #endif - - #include diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 7d75d9a34e1..af20165d155 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; + sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - patches = [ ./aarch64_nt_prstatus.patch ]; - enableParallelBuilding = true; meta = with stdenv.lib; { From ff6a61ad1bfd0aa27f663f0c3d2714144ee30171 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 29 Aug 2018 19:38:00 +0200 Subject: [PATCH 132/138] nixos/tests/mesos: fix test (#45758) fallout from 39e678e24e38f1f374eaf5463b424ebdf75df9af : dockerTools.buildImage no longer applies default tag "latest" --- nixos/tests/mesos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 3ceb1d8125b..2e6dc0eda06 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -33,6 +33,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { simpleDocker = pkgs.dockerTools.buildImage { name = "echo"; + tag = "latest"; contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ]; config = { Env = [ From 70b3ac8378382ec401d3f2d757f0102bd8c50825 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 29 Aug 2018 19:38:35 +0200 Subject: [PATCH 133/138] nixos/tests/i3wm: prevent non-deterministic failure (#45759) Test failed sporadically on Hydra, probably due to timing issues. These changes should make that less likely to occur. --- nixos/tests/i3wm.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 245c17eedf7..e51aee30fdb 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -16,18 +16,20 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/first configuration/); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("started"); $machine->sendKeys("ret"); - $machine->sleep(1); + $machine->sleep(2); $machine->sendKeys("alt"); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("configured"); $machine->sendKeys("ret"); + # make sure the config file is created before we continue + $machine->waitForFile("/home/alice/.config/i3/config"); $machine->sleep(2); $machine->sendKeys("alt-ret"); $machine->waitForWindow(qr/machine.*alice/); - $machine->sleep(1); + $machine->sleep(2); $machine->screenshot("terminal"); ''; }) From 683707ea03d338e514c0fee75dccd61acd348c4c Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 29 Aug 2018 19:39:10 +0200 Subject: [PATCH 134/138] dwm-git: init at 20180602 (#45716) The latest tagged release dwm 6.1 is from 2015, so the development version is much more current. --- pkgs/applications/window-managers/dwm/git.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/window-managers/dwm/git.nix diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix new file mode 100644 index 00000000000..aaa32dd6b11 --- /dev/null +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: + +let + name = "dwm-git-20180602"; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = "git://git.suckless.org/dwm"; + rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; + sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; + }; + + buildInputs = [ libX11 libXinerama libXft ]; + + prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; + + # Allow users set their own list of patches + inherit patches; + + # Allow users to override the entire config file AFTER appying the patches + postPatch = stdenv.lib.optionalString (conf!=null) '' + echo -n '${conf}' > config.def.h + ''; + + buildPhase = "make"; + + meta = with stdenv.lib; { + homepage = https://suckless.org/; + description = "Dynamic window manager for X, development version"; + license = licenses.mit; + maintainers = with maintainers; [xeji]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 487e937cb08..8b8000c5b42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15902,6 +15902,11 @@ with pkgs; patches = config.dwm.patches or []; }; + dwm-git = callPackage ../applications/window-managers/dwm/git.nix { + patches = config.dwm.patches or []; + conf = config.dwm.conf or null; + }; + dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; dynamips = callPackage ../applications/virtualization/dynamips { }; From 10eb7526b5cf72d68d89ba32e76d4ec50d154b0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Aug 2018 19:41:03 +0200 Subject: [PATCH 135/138] Fix evaluation errors in libndtypes and libxnd. --- 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 8b8000c5b42..fddeb6a211a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1408,9 +1408,9 @@ with pkgs; lief = callPackage ../development/libraries/lief {}; - libndtypes = callPackages ../development/libraries/libndtypes { }; + libndtypes = callPackage ../development/libraries/libndtypes { }; - libxnd = callPackages ../development/libraries/libxnd { }; + libxnd = callPackage ../development/libraries/libxnd { }; loadwatch = callPackage ../tools/system/loadwatch { }; From fc43fc1ea25c5a53451bb86ebf3b86138e7c6e02 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 Aug 2018 19:44:59 +0200 Subject: [PATCH 136/138] lf: 7 -> 8 --- pkgs/tools/misc/lf/default.nix | 4 ++-- pkgs/tools/misc/lf/deps.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 6ec9729438c..8137379a4da 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "7"; + version = "8"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1"; + sha256 = "0rmcac9wx9lldl57m1cim1adf2fqkva1yi4v6934jgccqhlqvk58"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index c372b0d669c..57877822b08 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master - sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; # master + sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2 - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; # v0.0.3 + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } ] From 364c5047bc75443e080d79c4e9f44cb0609bd3ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 Aug 2018 19:51:09 +0200 Subject: [PATCH 137/138] androidStudioPackages.{dev,canary}: 3.3.0.6 -> 3.3.0.7 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f8b9b32bcb4..199793a44fb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; }; latestVersion = { # canary & dev - version = "3.3.0.6"; # "Android Studio 3.3 Canary 7" - build = "182.4968538"; - sha256Hash = "159sya24p99pj9q0mj1sbcz2609ackz54x4pj3q1mxhiamsn1y2q"; + version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" + build = "182.4978721"; + sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9"; }; in rec { # Old alias From 69407cb0136fb6a04b21a00aa6768c45fed00060 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 29 Aug 2018 21:50:53 +0300 Subject: [PATCH 138/138] firewall service: respect marks in rpfilter (#39054) This allows one to add rules which change a packet's routing table: iptables -t raw -I PREROUTING 1 -m set --match-set myset src -j MARK --set-mark 2 ip rule add fwmark 2 table 1 priority 1000 ip route add default dev wg0 table 1 to the beginning of raw table PREROUTING chain, and still have rpfilter. --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 36f1dd8d247..86463f276c6 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -123,7 +123,7 @@ let # Perform a reverse-path test to refuse spoofers # For now, we just drop, as the raw table doesn't have a log-refuse yet ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN + ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN # Allows this host to act as a DHCP4 client without first having to use APIPA iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN