From 517c29935b6e4dec12571e7d101e2b0da220263d Mon Sep 17 00:00:00 2001 From: Michael Gough Date: Thu, 12 Jul 2018 16:03:05 +0000 Subject: [PATCH 001/637] libcsptr: init at 2.0.4 --- maintainers/maintainer-list.nix | 5 ++++ .../libraries/libcsptr/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libcsptr/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16bd5795b24..a477b4802dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -97,6 +97,11 @@ github = "FireyFly"; name = "Jonas Höglund"; }; + fragamus = { + email = "innovative.engineer@gmail.com"; + github = "fragamus"; + name = "Michael Gough"; + }; Fresheyeball = { email = "fresheyeball@gmail.com"; github = "fresheyeball"; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix new file mode 100644 index 00000000000..d7638dd2059 --- /dev/null +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, git }: + +stdenv.mkDerivation rec { + name = "libcsptr-${version}"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "Snaipe"; + repo = "libcsptr"; + rev = "v${version}"; + sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Smart pointer constructs for the (GNU) C programming language"; + homepage = https://github.com/Snaipe/libcsptr; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.fragamus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..e492a5d5634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3372,6 +3372,8 @@ with pkgs; libcpuid = callPackage ../tools/misc/libcpuid { }; + libcsptr = callPackage ../development/libraries/libcsptr { }; + libscrypt = callPackage ../development/libraries/libscrypt { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; From 3eefc0b90923c02adad9d841b34e22c14adfdc08 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Nov 2018 23:08:20 +0100 Subject: [PATCH 002/637] xmonad service: add .config option --- .../services/x11/window-managers/xmonad.nix | 33 ++++++++++++++++++- nixos/tests/xmonad.nix | 10 ++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 43de746ab1f..a6055f26789 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -10,6 +10,14 @@ let optionals cfg.enableContribAndExtras [ self.xmonad-contrib self.xmonad-extras ]; }; + xmonadBin = pkgs.writers.writeHaskell "xmonad" { + ghc = cfg.haskellPackages.ghc; + libraries = [ cfg.haskellPackages.xmonad ] ++ + cfg.extraPackages cfg.haskellPackages ++ + optionals cfg.enableContribAndExtras + (with cfg.haskellPackages; [ xmonad-contrib xmonad-extras ]); + } cfg.config; + in { options = { @@ -48,13 +56,36 @@ in type = lib.types.bool; description = "Enable xmonad-{contrib,extras} in Xmonad."; }; + + config = mkOption { + default = null; + type = with lib.types; nullOr (either path string); + description = '' + Configuration from which XMonad gets compiled. If no value + is specified, the xmonad config from $HOME/.xmonad is taken. + If you use xmonad --recompile, $HOME/.xmonad will be taken as + the configuration, but on the next restart of display-manager + this config will be reapplied. + ''; + example = '' + import XMonad + + main = launch defaultConfig + { modMask = mod4Mask -- Use Super instead of Alt + , terminal = "urxvt" + } + ''; + }; }; }; config = mkIf cfg.enable { services.xserver.windowManager = { session = [{ name = "xmonad"; - start = '' + start = if (cfg.config != null) then '' + ${xmonadBin} + waitPID=$! + '' else '' ${xmonad}/bin/xmonad & waitPID=$! ''; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 61fa7c1a67d..a552e9dc5e0 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -12,6 +12,12 @@ import ./make-test.nix ({ pkgs, ...} : { enable = true; enableContribAndExtras = true; extraPackages = with pkgs.haskellPackages; haskellPackages: [ xmobar ]; + config = '' + import XMonad + import XMonad.Util.EZConfig + main = launch $ def `additionalKeysP` myKeys + myKeys = [ ("M-C-x", spawn "xterm") ] + ''; }; }; @@ -19,6 +25,10 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->sendKeys("alt-ctrl-x"); + $machine->waitForWindow(qr/machine.*alice/); + $machine->sleep(1); + $machine->screenshot("terminal"); $machine->waitUntilSucceeds("xmonad --restart"); $machine->sleep(3); $machine->sendKeys("alt-shift-ret"); From 87d1a826272ec3ecb1a7ad44b07375d2eb093965 Mon Sep 17 00:00:00 2001 From: Markus Date: Tue, 12 Mar 2019 15:01:14 +0000 Subject: [PATCH 003/637] nixos/kubernetes: Add preferredAddressTypes option to apiserver --- nixos/modules/services/cluster/kubernetes/apiserver.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index 455d0239604..50932cbe6cb 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -184,6 +184,12 @@ in type = bool; }; + preferredAddressTypes = mkOption { + description = "List of the preferred NodeAddressTypes to use for kubelet connections."; + type = nullOr str; + default = null; + }; + runtimeConfig = mkOption { description = '' Api runtime configuration. See @@ -316,6 +322,8 @@ in "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \ ${optionalString (cfg.kubeletClientKeyFile != null) "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \ + ${optionalString (cfg.preferredAddressTypes != null) + "--kubelet-preferred-address-types=${cfg.preferredAddressTypes}"} \ --insecure-bind-address=${cfg.insecureBindAddress} \ --insecure-port=${toString cfg.insecurePort} \ ${optionalString (cfg.runtimeConfig != "") From 7304454f86fcffb959f34769c6d5859965b0c81a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 20:55:53 -0400 Subject: [PATCH 004/637] monitoring-plugins: add mysql support --- pkgs/servers/monitoring/plugins/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 3e6eaa4766e..26bcaf519dd 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, mysql, zlib , runtimeShell }: with stdenv.lib; @@ -20,6 +21,14 @@ in stdenv.mkDerivation rec { sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1"; }; + patches = [ + # https://github.com/monitoring-plugins/monitoring-plugins/issues/1508 + (fetchpatch { + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/ac0437ff896ba9ce2549b2d2ec3de146a886f08a.patch"; + sha256 = "0jf6fqkyzag66rid92m7asnr2dp8rr8kn4zjvhqg0mqvf8imppky"; + }) + ]; + # !!! Awful hack. Grrr... this of course only works on NixOS. # Anyway the check that configure performs to figure out the ping # syntax is totally impure, because it runs an actual ping to @@ -39,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ net_snmp openssh openssl perl ]; + buildInputs = [ mysql net_snmp openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 96003801d25f31500be2a0ed620ff57594d9a905 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 21:00:23 -0400 Subject: [PATCH 005/637] monitoring-plugins: add ldap support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 26bcaf519dd..54180c57604 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, mysql, zlib +, mysql, zlib, openldap , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ mysql net_snmp openssh openssl perl zlib ]; + buildInputs = [ mysql net_snmp openldap openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 894b7e9f217f0088370c7518b511e393fec3e1bc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 21:21:35 -0400 Subject: [PATCH 006/637] monitoring-plugins: add dig support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 54180c57604..f3796eaf134 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, mysql, zlib, openldap +, dnsutils, mysql, zlib, openldap , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ mysql net_snmp openldap openssh openssl perl zlib ]; + buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 88e830894f66d5b2a067f321a98db915a12328e4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 20 Mar 2019 08:13:36 -0400 Subject: [PATCH 007/637] monitoring-plugins: add procs support --- pkgs/servers/monitoring/plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index f3796eaf134..d0ab2b82311 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, mysql, zlib, openldap +, dnsutils, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -9,7 +9,7 @@ let majorVersion = "2.2"; minorVersion = ".0"; - binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp ]; + binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ]; in stdenv.mkDerivation rec { name = "monitoring-plugins-${majorVersion}${minorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl zlib ]; + buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 7b78ced1c5ee0861d7a73bf3509b10aa78a51f88 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 20 Mar 2019 08:31:46 -0400 Subject: [PATCH 008/637] monitoring-plugins: add dbi support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index d0ab2b82311..cb12fe819a9 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, mysql, zlib, openldap, procps +, dnsutils, libdbi, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 6858d0fd62e5a705d6f8b2422a8c3bb07129cb2a Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 26 Mar 2019 15:45:59 +0100 Subject: [PATCH 009/637] clustal-omega: init at 1.2.4 --- .../science/biology/clustal-omega/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/biology/clustal-omega/default.nix diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix new file mode 100644 index 00000000000..3464e134ee8 --- /dev/null +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, argtable }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + name = "clustal-omega-${version}"; + + src = fetchurl { + url = "http://www.clustal.org/omega/${name}.tar.gz"; + sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6"; + }; + + buildInputs = [ argtable ]; + + preConfigure = '' + for f in configure \ + src/clustal-omega-config.h \ + src/clustal-omega-config.h \ + src/config.h.in \ + src/mymain.c + do + sed -i -re 's/argtable2/argtable3/g' $f + done + ''; + + meta = with stdenv.lib; { + description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; + homepage = http://www.clustal.org/omega/; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33464ab30a4..8c94ffc621e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21630,6 +21630,8 @@ in cmtk = callPackage ../applications/science/biology/cmtk { }; + clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; From d4d710c1ab00461c132d87c37b5754d975fb0c53 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 27 Mar 2019 08:40:00 -0500 Subject: [PATCH 010/637] postgresqlPackages.pipelinedb: init at 1.0.0-13 --- .../servers/sql/postgresql/ext/pipelinedb.nix | 39 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pipelinedb.nix diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix new file mode 100644 index 00000000000..de3cde8120d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: + +if stdenv.lib.versionOlder postgresql.version "10" +then throw "PipelineDB not supported for PostgreSQL ${postgresql.version}" +else +stdenv.mkDerivation rec { + pname = "pipelinedb"; + version = "1.0.0-13"; + + src = fetchFromGitHub { + owner = "pipelinedb"; + repo = pname; + rev = version; + sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; + }; + + buildInputs = [ postgresql openssl zeromq ]; + + makeFlags = [ "USE_PGXS=1" ]; + + preConfigure = '' + substituteInPlace Makefile \ + --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -t $out/lib/ pipelinedb.so + install -D -t $out/share/extension {pipelinedb-*.sql,pipelinedb.control} + ''; + + meta = with stdenv.lib; { + description = "High-performance time-series aggregation for PostgreSQL"; + homepage = https://www.pipelinedb.com/; + license = licenses.asl20; + platforms = postgresql.meta.platforms; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 2d0c699c12e..1d003e73964 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -31,6 +31,8 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; + pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; + timescaledb = super.callPackage ./ext/timescaledb.nix { }; tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; From 44a798e36f06f0bfa21d9f666f4ac46eff385b6d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 21:33:16 -0500 Subject: [PATCH 011/637] nixos/postgresql: added new options to mimic mysql module --- .../modules/services/databases/postgresql.nix | 91 ++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index aeab445a998..5dd6392f994 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -105,6 +105,80 @@ in ''; }; + ensureDatabases = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Ensures that the specified databases exist. + This option will never delete existing databases, especially not when the value of this + option is changed. This means that databases created once through this option or + otherwise have to be removed manually. + ''; + example = [ + "gitea" + "nextcloud" + ]; + }; + + ensureUsers = mkOption { + type = types.listOf (types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + Name of the user to ensure. + ''; + }; + ensurePermissions = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + Permissions to ensure for the user, specified as an attribute set. + The attribute names specify the database and tables to grant the permissions for. + The attribute values specify the permissions to grant. You may specify one or + multiple comma-separated SQL privileges here. + + For more information on how to specify the target + and on which privileges exist, see the + GRANT syntax. + The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + ''; + example = literalExample '' + { + "DATABASE nextcloud" = "ALL PRIVILEGES"; + "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; + } + ''; + }; + }; + }); + default = []; + description = '' + Ensures that the specified users exist and have at least the ensured permissions. + The PostgreSQL users will be identified using peer authentication. This authenticates the Unix user with the + same name only, and that without the need for a password. + This option will never delete existing users or remove permissions, especially not when the value of this + option is changed. This means that users created and permissions assigned once through this option or + otherwise have to be removed manually. + ''; + example = literalExample '' + [ + { + name = "nextcloud"; + ensurePermissions = { + "DATABASE nextcloud" = "ALL PRIVILEGES"; + }; + } + { + name = "superuser"; + ensurePermissions = { + "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; + }; + } + ] + ''; + }; + enableTCPIP = mkOption { type = types.bool; default = false; @@ -255,17 +329,30 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - while ! ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do + PSQL="${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port}" + + while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi sleep 0.1 done if test -e "${cfg.dataDir}/.first_startup"; then ${optionalString (cfg.initialScript != null) '' - ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres + $PSQL -f "${cfg.initialScript}" -d postgres ''} rm -f "${cfg.dataDir}/.first_startup" fi + '' + optionalString (cfg.ensureDatabases != []) '' + ${concatMapStrings (database: '' + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc "CREATE DATABASE ${database}" + '') cfg.ensureDatabases} + '' + '' + ${concatMapStrings (user: '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}" + ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' + $PSQL -tAc "GRANT ${permission} ON ${database} TO ${user.name}" + '') user.ensurePermissions)} + '') cfg.ensureUsers} ''; unitConfig.RequiresMountsFor = "${cfg.dataDir}"; From 7f3d0aee1c4f41266a9ff46c3561b805ded707e4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 25 Feb 2019 21:17:50 -0500 Subject: [PATCH 012/637] nixos/redmine: test configuration with postgresql as well as mysql --- nixos/tests/redmine.nix | 53 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index ea72a0121d1..cbdb5c8d295 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - redmineTest = package: makeTest { + mysqlTest = package: makeTest { machine = { config, pkgs, ... }: { services.mysql.enable = true; @@ -21,6 +21,7 @@ let services.redmine.enable = true; services.redmine.package = package; + services.redmine.database.type = "mysql2"; services.redmine.database.socket = "/run/mysqld/mysqld.sock"; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { @@ -38,7 +39,44 @@ let testScript = '' startAll; + $machine->waitForUnit('redmine.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; + }; + pgsqlTest = package: makeTest { + machine = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.ensureDatabases = [ "redmine" ]; + services.postgresql.ensureUsers = [ + { name = "redmine"; + ensurePermissions = { "DATABASE redmine" = "ALL PRIVILEGES"; }; + } + ]; + + services.redmine.enable = true; + services.redmine.package = package; + services.redmine.database.type = "postgresql"; + services.redmine.database.host = ""; + services.redmine.database.port = 5432; + services.redmine.plugins = { + redmine_env_auth = pkgs.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; + }; + }; + services.redmine.themes = { + dkuk-redmine_alex_skin = pkgs.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + }; + }; + + testScript = '' + startAll; $machine->waitForUnit('redmine.service'); $machine->waitForOpenPort('3000'); $machine->succeed("curl --fail http://localhost:3000/"); @@ -46,13 +84,18 @@ let }; in { - redmine_3 = redmineTest pkgs.redmine // { - name = "redmine_3"; + v3-mysql = mysqlTest pkgs.redmine // { + name = "v3-mysql"; meta.maintainers = [ maintainers.aanderse ]; }; - redmine_4 = redmineTest pkgs.redmine_4 // { - name = "redmine_4"; + v4-mysql = mysqlTest pkgs.redmine_4 // { + name = "v4-mysql"; + meta.maintainers = [ maintainers.aanderse ]; + }; + + v4-pgsql = pgsqlTest pkgs.redmine_4 // { + name = "v4-pgsql"; meta.maintainers = [ maintainers.aanderse ]; }; } From 77978c1518f3f2808947696f1b80e0eb8bd8ff9c Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 1 Apr 2019 20:01:29 +0200 Subject: [PATCH 013/637] nixos/mysql: fix support for non-specified database schema and increase test coverage to catch this --- nixos/modules/services/databases/mysql.nix | 2 +- nixos/tests/mysql.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 89291d4438f..12dbc07dcf0 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -360,7 +360,7 @@ in echo "Creating initial database: ${database.name}" ( echo 'create database `${database.name}`;' - ${optionalString (database ? "schema") '' + ${optionalString (database.schema != null) '' echo 'use `${database.name}`;' if [ -f "${database.schema}" ] diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index fedc7f0ab1f..97a4dee7f99 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -10,7 +10,10 @@ import ./make-test.nix ({ pkgs, ...} : { { services.mysql.enable = true; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; services.mysql.package = pkgs.mysql; }; @@ -36,11 +39,12 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $mysql->waitForUnit("mysql"); - $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mysql->succeed("echo 'use empty_testdb;' | mysql -u root"); + $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4"); $mariadb->waitForUnit("mysql"); $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"); $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser"); - $mariadb->succeed("echo 'use testdb; select test_id from tests' | sudo -u testuser mysql -u testuser -N | grep 42"); + $mariadb->succeed("echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"); ''; }) From 14571f5ed02fea504d131b130327f845715a7714 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 1 Apr 2019 21:08:47 +0200 Subject: [PATCH 014/637] nixos/mysql: fix initialScript option which was wrongly specified as types.lines Prevent it from getting copied to nix store as people might use it for credentials, and make the tests cover it. --- nixos/modules/services/databases/mysql.nix | 8 ++++++-- nixos/tests/mysql.nix | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 12dbc07dcf0..7e3c230fff7 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -133,7 +133,7 @@ in }; initialScript = mkOption { - type = types.nullOr types.lines; + type = types.nullOr types.path; default = null; description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; }; @@ -363,6 +363,8 @@ in ${optionalString (database.schema != null) '' echo 'use `${database.name}`;' + # TODO: this silently falls through if database.schema does not exist, + # we should catch this somehow and exit, but can't do it here because we're in a subshell. if [ -f "${database.schema}" ] then cat ${database.schema} @@ -399,7 +401,9 @@ in ${optionalString (cfg.initialScript != null) '' # Execute initial script - cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N + # using toString to avoid copying the file to nix store if given as path instead of string, + # as it might contain credentials + cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N ''} ${optionalString (cfg.rootPassword != null) diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index 97a4dee7f99..cfe10bc41b0 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -14,6 +14,11 @@ import ./make-test.nix ({ pkgs, ...} : { { name = "testdb"; schema = ./testdb.sql; } { name = "empty_testdb"; } ]; + # note that using pkgs.writeText here is generally not a good idea, + # as it will store the password in world-readable /nix/store ;) + services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + ''; services.mysql.package = pkgs.mysql; }; @@ -41,6 +46,8 @@ import ./make-test.nix ({ pkgs, ...} : { $mysql->waitForUnit("mysql"); $mysql->succeed("echo 'use empty_testdb;' | mysql -u root"); $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4"); + # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript + $mysql->succeed("echo ';' | mysql -u passworduser --password=password123"); $mariadb->waitForUnit("mysql"); $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"); From ba54c9659355248c0ae495c1e315a8f0af37a0ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Apr 2019 04:22:24 -0700 Subject: [PATCH 015/637] yandex-disk: 0.1.5.978 -> 0.1.5.1010 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yandex-disk/versions --- pkgs/tools/filesystems/yandex-disk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6acb034d75b..15c61513d9a 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,7 +4,7 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; + sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm"; } else { arch = "i386"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.978"; + version = "0.1.5.1010"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; From 681b1d80611ce291c612e5d9f1d3a5e3cb532984 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 14 Apr 2019 16:44:56 +0200 Subject: [PATCH 016/637] weechat: install all outputs into the final store path Resolves #59300 Until now only `$out/bin/weechat` and `$out/bin/weechat-headless` were installed into the store path that will be used when running i.e. `nix-env -iA weechat`. Further outputs like icons (`$out/share/icons`), man pages (`$man`) or the HTML documentation (`$out/share/doc/weechat`) are omitted at the moment. As this can be fairly confusing I figured that it's better to copy those files into the environment as well. As `buildEnv` doesn't appear to support output splitting (you can only install additional outputs of `paths` using `extraOutputsToInstall`), it's easier for now to always install the `man` output by default. Man page installation can be turned off like this now: ``` weechat.override { installManPages = false; } ``` --- .../applications/networking/irc/weechat/wrapper.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 81073222c2b..bd05b63c68b 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -6,7 +6,8 @@ weechat: let wrapper = { - configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + installManPages ? true + , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } }: let @@ -65,14 +66,22 @@ let ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} '') // { - inherit (weechat) name; + inherit (weechat) name man; unwrapped = weechat; + outputs = [ "out" "man" ]; }; in buildEnv { name = "weechat-bin-env-${weechat.version}"; + extraOutputsToInstall = lib.optionals installManPages [ "man" ]; paths = [ (mkWeechat "weechat") (mkWeechat "weechat-headless") + (runCommand "weechat-out-except-bin" { } '' + mkdir $out + ln -sf ${weechat}/include $out/include + ln -sf ${weechat}/lib $out/lib + ln -sf ${weechat}/share $out/share + '') ]; meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ]; }; From 7a59ec3982032618972c63df661916dd30f65efa Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sun, 14 Apr 2019 20:44:01 +0200 Subject: [PATCH 017/637] rstudio: 1.1.463 -> 1.2.1335 --- pkgs/applications/editors/rstudio/default.nix | 58 ++++++++++--------- .../editors/rstudio/fix-cmake.patch | 15 ----- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/editors/rstudio/fix-cmake.patch diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 86fb972e94c..27c956dcd14 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,43 +1,49 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost -, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, qtxmlpatterns, libuuid -, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel +, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +, llvmPackages }: let verMajor = "1"; - verMinor = "1"; - verPatch = "463"; + verMinor = "2"; + verPatch = "1335"; version = "${verMajor}.${verMinor}.${verPatch}"; - ginVer = "1.5"; - gwtVer = "2.7.0"; + ginVer = "2.1.2"; + gwtVer = "2.8.1"; in stdenv.mkDerivation rec { name = "RStudio-${version}"; nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel - qtxmlpatterns libuuid ]; + buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors + qtwebengine qtwebchannel libuuid ]; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6"; + sha256 = "0jv1d4yznv2lzwp0fdf377vqpg0k2q4z9qvji4sj86fabj835lqd"; }; - # Hack RStudio to only use the input R. - patches = [ ./r-location.patch ]; - postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + # Hack RStudio to only use the input R and provided libclang. + patches = [ ./r-location.patch ./clang-location.patch ]; + postPatch = '' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ + --replace '@clang@' ${llvmPackages.clang.cc} \ + --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so + ''; ginSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; }; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; + sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; }; hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); @@ -47,14 +53,11 @@ stdenv.mkDerivation rec { sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rstudiolibclang = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip; - sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c"; - }; - - rstudiolibclangheaders = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/libclang-builtin-headers.zip; - sha256 = "0x4ax186bm3kf098izwmsplckgx1kqzg9iiyzg95rpbqsb4593qb"; + rsconnectSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rsconnect"; + rev = "984745d8"; + sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; }; preConfigure = @@ -80,13 +83,14 @@ stdenv.mkDerivation rec { done unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - mkdir -p dependencies/common/libclang/3.5 - unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5 - mkdir -p dependencies/common/libclang/builtin-headers - unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers mkdir -p dependencies/common/pandoc cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ + + cp -r ${rsconnectSrc} dependencies/common/rsconnect + pushd dependencies/common + ${R}/bin/R CMD build -d --no-build-vignettes rsconnect + popd ''; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/rstudio/fix-cmake.patch b/pkgs/applications/editors/rstudio/fix-cmake.patch deleted file mode 100644 index 3effc0eaa32..00000000000 --- a/pkgs/applications/editors/rstudio/fix-cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt -index f5701bf735..27af4148ff 100644 ---- a/src/cpp/desktop/CMakeLists.txt -+++ b/src/cpp/desktop/CMakeLists.txt -@@ -112,6 +112,7 @@ find_package(Qt5WebEngine REQUIRED) - find_package(Qt5WebEngineWidgets REQUIRED) - find_package(Qt5PrintSupport REQUIRED) - find_package(Qt5Quick REQUIRED) -+find_package(Qt5QuickWidgets REQUIRED) - find_package(Qt5Positioning REQUIRED) - find_package(Qt5Sensors REQUIRED) - find_package(Qt5Svg REQUIRED) --- -2.17.1 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d86322a350..00b7ebc3502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19495,6 +19495,7 @@ in rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; + llvmPackages = llvmPackages_7; }; rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix { boost = boost166; From 248041aa205d15873c4d08f9f17419fbb007a07c Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sun, 14 Apr 2019 20:46:28 +0200 Subject: [PATCH 018/637] rstudio-preview: remove package --- pkgs/applications/editors/rstudio/preview.nix | 119 ------------------ pkgs/top-level/all-packages.nix | 4 - 2 files changed, 123 deletions(-) delete mode 100644 pkgs/applications/editors/rstudio/preview.nix diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix deleted file mode 100644 index 55c83ca85a6..00000000000 --- a/pkgs/applications/editors/rstudio/preview.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel -, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc -, llvmPackages -}: - -let - rev = "f79330d4"; - ginVer = "2.1.2"; - gwtVer = "2.8.1"; -in -stdenv.mkDerivation rec { - name = "RStudio-preview-${rev}"; - - nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - - buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors - qtwebengine qtwebchannel libuuid ]; - - src = fetchFromGitHub { - owner = "rstudio"; - repo = "rstudio"; - inherit rev; - sha256 = "0v3vzqjp74c3m4h9l6w2lrdnjqaimdjzbf7vhnlxj2qa0lwsnykb"; - }; - - # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@clang@' ${llvmPackages.clang.cc} \ - --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so - ''; - - ginSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; - }; - - gwtSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; - }; - - hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); - - mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; - sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; - }; - - rsconnectSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rsconnect"; - rev = "984745d8"; - sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; - }; - - preConfigure = - '' - GWT_LIB_DIR=src/gwt/lib - - mkdir -p $GWT_LIB_DIR/gin/${ginVer} - unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - - unzip ${gwtSrc} - mkdir -p $GWT_LIB_DIR/gwt - mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} - - mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -sv $i dependencies/common/dictionaries/ - done - done - - unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - - mkdir -p dependencies/common/pandoc - cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ - - cp -r ${rsconnectSrc} dependencies/common/rsconnect - pushd dependencies/common - ${R}/bin/R CMD build -d --no-build-vignettes rsconnect - popd - ''; - - enableParallelBuilding = true; - - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; - - desktopItem = makeDesktopItem { - name = name; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio Preview"; - genericName = "IDE"; - comment = meta.description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; - }; - - postInstall = '' - wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin - mkdir $out/share - cp -r ${desktopItem}/share/applications $out/share - mkdir $out/share/icons - ln $out/rstudio.png $out/share/icons - ''; - - meta = with stdenv.lib; - { description = "Set of integrated tools for the R language"; - homepage = https://www.rstudio.com/; - license = licenses.agpl3; - maintainers = with maintainers; [ averelld ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00b7ebc3502..8ebb801c3a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19497,10 +19497,6 @@ in boost = boost166; llvmPackages = llvmPackages_7; }; - rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix { - boost = boost166; - llvmPackages = llvmPackages_7; - }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; From a3ac12aca9c7d7be41c6af125f8b08d657e46f12 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:18:30 -0400 Subject: [PATCH 019/637] boost: remove old cygwin patches Most of these are unused and the others only used in 1.59. --- pkgs/development/libraries/boost/1.59.nix | 30 - .../boost/cygwin-1.40.0-cstdint-cygwin.patch | 20 - .../cygwin-1.40.0-iostreams-cygwin.patch | 24 - .../boost/cygwin-1.40.0-python-cygwin.patch | 35 - .../boost/cygwin-1.40.0-regex-cygwin.patch | 15 - .../boost/cygwin-1.45.0-jam-cygwin.patch | 12 - .../boost/cygwin-1.50.0-jam-pep3149.patch | 11 - .../boost/cygwin-1.55.0-asio-MSG_EOR.patch | 14 - .../cygwin-1.55.0-interlocked-cygwin.patch | 11 - .../boost/cygwin-1.57.0-asio-cygwin.patch | 1835 ----------------- .../boost/cygwin-1.57.0-config-cygwin.patch | 76 - .../boost/cygwin-1.57.0-context-cygwin.patch | 600 ------ .../cygwin-1.57.0-filesystem-cygwin.patch | 32 - .../boost/cygwin-1.57.0-locale-cygwin.patch | 81 - .../boost/cygwin-1.57.0-log-cygwin.patch | 46 - .../cygwin-1.57.0-smart_ptr-cygwin.patch | 77 - .../boost/cygwin-1.57.0-system-cygwin.patch | 22 - ...dora-boost-1.50.0-fix-non-utf8-files.patch | 22 - .../cygwin-fedora-boost-1.50.0-pool.patch | 122 -- ...a-boost-1.54.0-locale-unused_typedef.patch | 11 - ...-boost-1.54.0-pool-max_chunks_shadow.patch | 14 - ...a-boost-1.54.0-python-unused_typedef.patch | 15 - ...in-fedora-boost-1.57.0-move-is_class.patch | 20 - ...cygwin-fedora-boost-1.57.0-mpl-print.patch | 31 - ...edora-boost-1.57.0-pool-test_linking.patch | 33 - ...edora-boost-1.57.0-signals2-weak_ptr.patch | 10 - ...a-boost-1.57.0-spirit-unused_typedef.patch | 19 - ...-fedora-boost-1.57.0-uuid-comparison.patch | 11 - 28 files changed, 3249 deletions(-) delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 603d7883c64..f4931dfe547 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -7,34 +7,4 @@ callPackage ./generic.nix (args // rec { url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - - patches = stdenv.lib.optionals stdenv.isCygwin [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ]; }) diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch deleted file mode 100644 index 61791c60d9e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch +++ /dev/null @@ -1,20 +0,0 @@ -These were fixed in ~1.7.0-46 - ---- boost_1_40_0/boost/cstdint.hpp 2009-01-14 04:18:19.000000000 -0600 -+++ boost_1_40_0/boost/cstdint.hpp 2009-08-27 23:41:34.063543700 -0500 -@@ -40,15 +40,6 @@ - # include - # else - # include -- --// There is a bug in Cygwin two _C macros --# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__) --# undef INTMAX_C --# undef UINTMAX_C --# define INTMAX_C(c) c##LL --# define UINTMAX_C(c) c##ULL --# endif -- - # endif - - #ifdef __QNX__ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch deleted file mode 100644 index 6641ba823b1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp 2009-08-27 23:41:34.082544800 -0500 -@@ -44,8 +44,7 @@ - //------------------Locale support--------------------------------------------// - - #ifndef BOOST_IOSTREAMS_NO_LOCALE --# if defined(BOOST_NO_STD_LOCALE) || \ -- defined(__CYGWIN__) && \ -+# if defined(BOOST_NO_STD_LOCALE) && \ - ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \ - /**/ - # define BOOST_IOSTREAMS_NO_LOCALE ---- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2008-03-22 16:45:55.000000000 -0500 -+++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp 2009-08-27 23:41:34.087545100 -0500 -@@ -13,8 +13,7 @@ - - // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use. - #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX ) --# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \ -- !defined(__CYGWIN__) \ -+# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) - /**/ - # define BOOST_IOSTREAMS_WINDOWS - # else diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch deleted file mode 100644 index 7932b0e124b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- boost_1_40_0/boost/python/detail/config.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/python/detail/config.hpp 2009-08-27 23:41:34.092545400 -0500 -@@ -83,7 +83,7 @@ - # endif - # define BOOST_PYTHON_DECL_FORWARD - # define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) --# elif (defined(_WIN32) || defined(__CYGWIN__)) -+# elif defined(_WIN32) - # if defined(BOOST_PYTHON_SOURCE) - # define BOOST_PYTHON_DECL __declspec(dllexport) - # define BOOST_PYTHON_BUILD_DLL ---- boost_1_40_0/boost/python/detail/wrap_python.hpp 2007-04-27 17:16:47.000000000 -0500 -+++ boost_1_40_0/boost/python/detail/wrap_python.hpp 2009-08-27 23:41:34.096545600 -0500 -@@ -82,8 +82,8 @@ - // Some things we need in order to get Python.h to work with compilers other - // than MSVC on Win32 - // --#if defined(_WIN32) || defined(__CYGWIN__) --# if defined(__GNUC__) && defined(__CYGWIN__) -+#if defined(_WIN32) -+# if defined(__GNUC__) - - # define SIZEOF_LONG 4 - ---- boost_1_40_0/boost/python/module_init.hpp 2007-06-07 13:08:54.000000000 -0500 -+++ boost_1_40_0/boost/python/module_init.hpp 2009-08-27 23:41:34.101545900 -0500 -@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char - - }}} - --# if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE) -+# if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE) - - # define BOOST_PYTHON_MODULE_INIT(name) \ - void init_module_##name(); \ diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch deleted file mode 100644 index 969bb814bd1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600 -+++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500 -@@ -28,11 +28,7 @@ - - #ifndef BOOST_REGEX_NO_FILEITER - --#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32) --#error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" --#define BOOST_REGEX_FI_WIN32_MAP --#define BOOST_REGEX_FI_POSIX_DIR --#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) -+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32) - #define BOOST_REGEX_FI_WIN32_MAP - #define BOOST_REGEX_FI_WIN32_DIR - #else diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch deleted file mode 100644 index 1a00851fa92..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch +++ /dev/null @@ -1,12 +0,0 @@ -OS_CYGWIN is used to assume cygpath, Win32-isms - ---- boost_1_48_0/tools/build/src/engine/jam.h -+++ boost_1_48_0/tools/build/src/engine/jam.h -@@ -245,7 +245,6 @@ - #endif - #if defined(__cygwin__) || defined(__CYGWIN__) - #define OSMINOR "OS=CYGWIN" -- #define OS_CYGWIN - #endif - #if defined(__FreeBSD__) && !defined(__DragonFly__) - #define OSMINOR "OS=FREEBSD" diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch deleted file mode 100644 index 4bc6ec9d36e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/build/src/tools/python.jam 2012-04-25 22:35:55.000000000 -0500 -+++ b/tools/build/src/tools/python.jam 2013-01-21 07:22:30.814373200 -0600 -@@ -376,7 +376,7 @@ local rule path-to-native ( paths * ) - # - local rule split-version ( version ) - { -- local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ; -+ local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ; - if ! $(major-minor[2]) || $(major-minor[3]) - { - ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ; diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch deleted file mode 100644 index 46308a59cb0..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:54.186255800 -0500 -+++ boost_1_55_0/boost/asio/detail/socket_types.hpp 2014-08-31 12:43:03.887868700 -0500 -@@ -332,7 +332,11 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB - # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK - # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE -+#ifdef MSG_EOR - # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR -+#else -+# define BOOST_ASIO_OS_DEF_MSG_EOR 0 -+#endif - # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD - # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR - # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch deleted file mode 100644 index df3edf51e7b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_55_0/boost/detail/interlocked.hpp 2013-10-24 09:01:53.000000000 -0500 -+++ boost_1_55_0/boost/detail/interlocked.hpp 2014-08-31 13:01:33.830313500 -0500 -@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc - ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange))) - # endif - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport) - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch deleted file mode 100644 index 3702d475c8e..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch +++ /dev/null @@ -1,1835 +0,0 @@ ---- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp 2015-05-04 17:33:18.798985800 -0500 -@@ -42,7 +42,7 @@ protected: - BOOST_ASIO_DECL static void init_native_buffer( - native_buffer_type& buf, - const boost::asio::const_buffer& buffer); --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -61,7 +61,7 @@ protected: - buf.buf = const_cast(boost::asio::buffer_cast(buffer)); - buf.len = static_cast(boost::asio::buffer_size(buffer)); - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - // The maximum number of buffers to support in a single operation. - enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len }; - -@@ -92,7 +92,7 @@ protected: - boost::asio::buffer_cast(buffer))); - iov.iov_len = boost::asio::buffer_size(buffer); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - }; - - // Helper class to translate buffers into the native buffer representation. ---- boost_1_57_0/boost/asio/detail/config.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/config.hpp 2015-05-04 17:34:30.756623300 -0500 -@@ -474,7 +474,7 @@ - #endif // !defined(BOOST_ASIO_WINDOWS) - - // Windows: target OS version. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) - # if defined(_MSC_VER) || defined(__BORLANDC__) - # pragma message( \ -@@ -512,29 +512,29 @@ - # error You must add -D__USE_W32_SOCKETS to your compiler options. - # endif // !defined(__USE_W32_SOCKETS) - # endif // defined(__CYGWIN__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: minimise header inclusion. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) - # if !defined(WIN32_LEAN_AND_MEAN) - # define WIN32_LEAN_AND_MEAN - # endif // !defined(WIN32_LEAN_AND_MEAN) - # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: suppress definition of "min" and "max" macros. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if !defined(BOOST_ASIO_NO_NOMINMAX) - # if !defined(NOMINMAX) - # define NOMINMAX 1 - # endif // !defined(NOMINMAX) - # endif // !defined(BOOST_ASIO_NO_NOMINMAX) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Windows: IO Completion Ports. - #if !defined(BOOST_ASIO_HAS_IOCP) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) - # if !defined(UNDER_CE) - # if !defined(BOOST_ASIO_DISABLE_IOCP) -@@ -542,7 +542,7 @@ - # endif // !defined(BOOST_ASIO_DISABLE_IOCP) - # endif // !defined(UNDER_CE) - # endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_HAS_IOCP) - - // Linux: epoll, eventfd and timerfd. -@@ -599,8 +599,7 @@ - #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) - # if defined(BOOST_ASIO_HAS_IOCP) \ - || !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # if !defined(__SYMBIAN32__) - # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) - # define BOOST_ASIO_HAS_SERIAL_PORT 1 -@@ -609,7 +608,6 @@ - # endif // defined(BOOST_ASIO_HAS_IOCP) - // || !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT) - - // Windows: stream handles. -@@ -633,11 +631,11 @@ - // Windows: object handles. - #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if !defined(UNDER_CE) - # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 - # endif // !defined(UNDER_CE) --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) - #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) - -@@ -654,12 +652,10 @@ - #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) - #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) - -@@ -667,12 +663,10 @@ - #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_LOCAL_SOCKETS 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) - #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) - -@@ -680,12 +674,10 @@ - #if !defined(BOOST_ASIO_HAS_SIGACTION) - # if !defined(BOOST_ASIO_DISABLE_SIGACTION) - # if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - # define BOOST_ASIO_HAS_SIGACTION 1 - # endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION) - #endif // !defined(BOOST_ASIO_HAS_SIGACTION) - -@@ -700,7 +692,7 @@ - - // Can use getaddrinfo() and getnameinfo(). - #if !defined(BOOST_ASIO_HAS_GETADDRINFO) --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) - # define BOOST_ASIO_HAS_GETADDRINFO 1 - # elif defined(UNDER_CE) ---- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp 2015-05-04 17:33:18.826989400 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp 2015-05-04 17:33:18.830489800 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP ---- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp 2015-05-04 17:33:18.833490200 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP ---- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp 2015-05-04 17:33:18.836490600 -0500 -@@ -26,7 +26,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef win_fd_set_adapter fd_set_adapter; - #else - typedef posix_fd_set_adapter fd_set_adapter; ---- boost_1_57_0/boost/asio/detail/hash_map.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/hash_map.hpp 2015-05-04 17:33:18.839991000 -0500 -@@ -21,9 +21,9 @@ - #include - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( - + (reinterpret_cast(p) >> 3); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - inline std::size_t calculate_hash_value(SOCKET s) - { - return static_cast(s); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Note: assumes K and V are POD types. - template ---- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp 2015-05-04 17:33:18.843491500 -0500 -@@ -21,8 +21,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - -@@ -448,6 +447,5 @@ int poll_write(int d, state_type state, - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP ---- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp 2015-05-04 17:33:18.846991900 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #if !defined(BOOST_ASIO_WINDOWS) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset() - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - ---- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp 2015-05-04 17:33:18.849992300 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_ - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp 2015-05-04 17:33:18.853492700 -0500 -@@ -19,7 +19,7 @@ - #include - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP ---- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp 2015-05-04 17:29:21.281324900 -0500 -@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_ - max_fd = fd_sets_[i].max_descriptor(); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty(); - fd_sets_[write_op].set(op_queue_[connect_op], ops); -@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_ - fd_sets_[except_op].set(op_queue_[connect_op], ops); - if (fd_sets_[except_op].max_descriptor() > max_fd) - max_fd = fd_sets_[except_op].max_descriptor(); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // We can return immediately if there's no work to do and the reactor is - // not supposed to block. -@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_ - // Dispatch all ready operations. - if (retval > 0) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Connection operations on Windows use both except and write fd_sets. - fd_sets_[except_op].perform(op_queue_[connect_op], ops); - fd_sets_[write_op].perform(op_queue_[connect_op], ops); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Exception operations must be processed first to ensure that any - // out-of-band data is read before normal data. ---- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp 2015-05-04 17:33:18.857993300 -0500 -@@ -60,12 +60,10 @@ signal_state* get_signal_state() - void boost_asio_signal_handler(int signal_number) - { - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) -+ || defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_set_service::deliver_signal(signal_number); - #else // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - int saved_errno = errno; - signal_state* state = get_signal_state(); - signed_size_type result = ::write(state->write_descriptor_, -@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa - errno = saved_errno; - #endif // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - - #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) - ::signal(signal_number, boost_asio_signal_handler); -@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa - } - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - class signal_set_service::pipe_read_op : public reactor_op - { - public: -@@ -115,30 +111,25 @@ public: - }; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - signal_set_service::signal_set_service( - boost::asio::io_service& io_service) - : io_service_(boost::asio::use_service(io_service)), - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_(boost::asio::use_service(io_service)), - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - next_(0), - prev_(0) - { - get_signal_state()->mutex_.init(); - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_.init_task(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - for (int i = 0; i < max_signal_number; ++i) - registrations_[i] = 0; -@@ -174,8 +165,7 @@ void signal_set_service::fork_service( - boost::asio::io_service::fork_event fork_ev) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - -@@ -217,11 +207,9 @@ void signal_set_service::fork_service( - } - #else // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - (void)fork_ev; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::construct( -@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - delete new_registration; - return ec; - } -@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser - if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the first service to be created, open a new pipe. - if (state->service_list_ == 0) - open_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - // Insert service into linked list of all services. - service->next_ = state->service_list_; -@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig - state->service_list_ = service; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Register for pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig - read_descriptor, service->reactor_data_, new pipe_read_op); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::remove_service(signal_set_service* service) -@@ -534,8 +520,7 @@ void signal_set_service::remove_service( - if (service->next_ || service->prev_ || state->service_list_ == service) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Disable the pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -544,7 +529,6 @@ void signal_set_service::remove_service( - lock.lock(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // Remove service from linked list of all services. - if (state->service_list_ == service) -@@ -556,19 +540,18 @@ void signal_set_service::remove_service( - service->next_ = 0; - service->prev_ = 0; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the last service to be removed, close the pipe. - if (state->service_list_ == 0) - close_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - } - } - - void signal_set_service::open_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - int pipe_fds[2]; -@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor - } - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::close_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - if (state->read_descriptor_ != -1) -@@ -612,7 +593,6 @@ void signal_set_service::close_descripto - state->write_descriptor_ = -1; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::start_wait_op( ---- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 -@@ -33,12 +33,12 @@ - # include - #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ -+#if defined(BOOST_ASIO_WINDOWS) \ - || defined(__MACH__) && defined(__APPLE__) - # if defined(BOOST_ASIO_HAS_PTHREADS) - # include - # endif // defined(BOOST_ASIO_HAS_PTHREADS) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - // || defined(__MACH__) && defined(__APPLE__) - - #include -@@ -50,9 +50,9 @@ namespace socket_ops { - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - struct msghdr { int msg_namelen; }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) - // HP-UX doesn't declare these functions extern "C", so they are declared again -@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c - - inline void clear_last_error() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - WSASetLastError(0); - #else - errno = 0; -@@ -78,7 +78,7 @@ template - inline ReturnType error_wrapper(ReturnType return_value, - boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(WSAGetLastError(), - boost::asio::error::get_system_category()); - #else -@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - if (result != 0 - && (ec == boost::asio::error::would_block -@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta - // current OS where this behaviour is seen, Windows, says that the socket - // remains open. Therefore we'll put the descriptor back into blocking - // mode and have another attempt at closing it. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = 0; - ::ioctlsocket(s, FIONBIO, &arg); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - # if defined(__SYMBIAN32__) - int flags = ::fcntl(s, F_GETFL, 0); - if (flags >= 0) -@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta - ioctl_arg_type arg = 0; - ::ioctl(s, FIONBIO, &arg); - # endif // defined(__SYMBIAN32__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - state &= ~non_blocking; - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - } - -@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, - // Check if the connect operation has finished. This is required since we may - // get spurious readiness notifications from the reactor. - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, - zero_timeout.tv_usec = 0; - int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, - fds.revents = 0; - int ready = ::poll(&fds, 1, 0); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (ready == 0) - { -@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, - int socketpair(int af, int type, int protocol, - socket_type sv[2], boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(af); - (void)(type); - (void)(protocol); -@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy - - #if defined(SIOCATMARK) - ioctl_arg_type value = 0; --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - # if defined(ENOTTY) -@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s - } - - ioctl_arg_type value = 0; --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - #if defined(ENOTTY) -@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v - base = static_cast(addr); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - void init_buf(buf& b, void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(data); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, data); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - void init_buf(buf& b, const void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(const_cast(data)); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, const_cast(data)); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) -@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recv(socket_type s, state_type state, buf* bufs, -@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(*addrlen); -@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, -@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, - int in_flags, int& out_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - out_flags = 0; - return socket_ops::recv(s, bufs, count, in_flags, ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, - else - out_flags = 0; - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvmsg(socket_type s, state_type state, -@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = const_cast(bufs); - msg.msg_iovlen = static_cast(count); -@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_send(socket_type s, state_type state, const buf* bufs, -@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(addrlen); -@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_sendto(socket_type s, state_type state, const buf* bufs, -@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, - WSA_FLAG_OVERLAPPED), ec); - if (s == invalid_socket) -@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type - } - ec = boost::asio::error::fault; - return socket_error_retval; --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - template -@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad - return socket_error_retval; - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (cached) - { - // Check if socket is still connected. -@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad - ec = boost::system::error_code(); - return 0; - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - (void)cached; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - clear_last_error(); - int result = error_wrapper(call_getpeername( -@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); - #elif defined(__MACH__) && defined(__APPLE__) \ - || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd - fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (!readfds && !writefds && !exceptfds && timeout) - { - DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; -@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd - if (timeout && timeout->tv_sec == 0 - && timeout->tv_usec > 0 && timeout->tv_usec < 1000) - timeout->tv_usec = 1000; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) && defined(__SELECT) - timespec ts; -@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - } - -@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::address_family_not_supported; - return 0; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::invalid_argument; - - return result == socket_error_retval ? 0 : dest; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - const char* result = error_wrapper(::inet_ntop( - af, src, dest, static_cast(length)), ec); - if (result == 0 && !ec) -@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void - strcat(dest, if_name); - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int inet_pton(int af, const char* src, void* dest, -@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v - ec = boost::asio::error::address_family_not_supported; - return -1; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy and strcmp. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v - ec = boost::system::error_code(); - - return result == socket_error_retval ? -1 : 1; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::inet_pton(af, src, dest), ec); - if (result <= 0 && !ec) - ec = boost::asio::error::invalid_argument; -@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v - } - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int gethostname(char* name, int namelen, boost::system::error_code& ec) -@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char - hostent* result, char* buffer, int buflength, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); -@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char - char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - (void)(ai_flags); -@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla - case EAI_SOCKTYPE: - return boost::asio::error::socket_type_not_supported; - default: // Possibly the non-portable EAI_SYSTEM. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return boost::system::error_code( - WSAGetLastError(), boost::asio::error::get_system_category()); - #else -@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co - host = (host && *host) ? host : 0; - service = (service && *service) ? service : 0; - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - int error = ::getaddrinfo(host, service, &hints, result); -@@ -3213,7 +3201,7 @@ boost::system::error_code background_get - - void freeaddrinfo(addrinfo_type* ai) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - ::freeaddrinfo(ai); -@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co - std::size_t addrlen, char* host, std::size_t hostlen, - char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - clear_last_error(); ---- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() - #include - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP ---- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -54,6 +54,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP ---- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_HAS_THREADS) \ - || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -65,7 +64,6 @@ public: - #endif // !defined(BOOST_ASIO_HAS_THREADS) - // || defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP ---- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - // Guess whether we are building against on old Platform SDK. - #if !defined(IN6ADDR_ANY_INIT) -@@ -211,6 +211,6 @@ struct addrinfo_emulation - # define IPPROTO_ICMPV6 58 - #endif - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP ---- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS) - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -84,7 +83,6 @@ private: - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #endif // !defined(BOOST_ASIO_WINDOWS) - ---- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 -@@ -18,7 +18,6 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(__CYGWIN__) \ - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include -@@ -114,7 +113,6 @@ private: - #include - - #endif // !defined(BOOST_ASIO_WINDOWS) -- // && !defined(__CYGWIN__) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -319,6 +318,5 @@ private: - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 -@@ -19,7 +19,7 @@ - #include - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -230,7 +230,7 @@ private: - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_EVENTFD) - # include -@@ -31,7 +31,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - typedef socket_select_interrupter select_interrupter; - #elif defined(BOOST_ASIO_HAS_EVENTFD) - typedef eventfd_select_interrupter select_interrupter; ---- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 -@@ -51,13 +51,13 @@ class select_reactor - : public boost::asio::detail::service_base - { - public: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 3, max_ops = 4 }; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 1, max_ops = 3 }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Per-descriptor data. - struct per_descriptor_data ---- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_PTHREADS) - # include -@@ -33,7 +33,7 @@ namespace detail { - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - typedef null_signal_blocker signal_blocker; - #elif defined(BOOST_ASIO_HAS_PTHREADS) - typedef posix_signal_blocker signal_blocker; ---- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -44,6 +44,6 @@ public: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP ---- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 -@@ -28,9 +28,9 @@ - #include - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -183,8 +183,7 @@ private: - io_service_impl& io_service_; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // The type used for registering for pipe reactor notifications. - class pipe_read_op; - -@@ -195,7 +194,6 @@ private: - reactor::per_descriptor_data reactor_data_; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // A mapping from signal number to the registered signal sets. - registration* registrations_[max_signal_number]; ---- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 -@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ - BOOST_ASIO_DECL int listen(socket_type s, - int backlog, boost::system::error_code& ec); - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); - ---- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -85,7 +84,6 @@ private: - #endif // defined(BOOST_ASIO_HEADER_ONLY) - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 -@@ -19,7 +19,7 @@ - - #if defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Empty. --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) - # error WinSock.h has already been included - # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) -@@ -169,7 +169,7 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 - # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 - # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - typedef SOCKET socket_type; - const SOCKET invalid_socket = INVALID_SOCKET; - const int socket_error_retval = SOCKET_ERROR; ---- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -146,6 +146,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP ---- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 -@@ -20,7 +20,6 @@ - #include - #include - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) - # include - #else -@@ -45,7 +44,7 @@ - # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_NATIVE_ERROR(e) e - # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e - # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e -@@ -225,7 +224,7 @@ inline const boost::system::error_catego - return boost::system::system_category(); - } - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_netdb_category(); -@@ -233,7 +232,7 @@ const boost::system::error_category& get - extern BOOST_ASIO_DECL - const boost::system::error_category& get_addrinfo_category(); - --#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#else // !defined(BOOST_ASIO_WINDOWS) - - inline const boost::system::error_category& get_netdb_category() - { -@@ -245,7 +244,7 @@ inline const boost::system::error_catego - return get_system_category(); - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_misc_category(); ---- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 -@@ -25,7 +25,7 @@ namespace boost { - namespace asio { - namespace error { - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - -@@ -87,7 +87,7 @@ const boost::system::error_category& get - return instance; - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - ---- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 -@@ -27,7 +27,7 @@ - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios -@@ -41,7 +41,7 @@ namespace asio { - boost::system::error_code serial_port_base::baud_rate::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.BaudRate = value_; - #else - speed_t baud; -@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::baud_rate::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.BaudRate; - #else - speed_t baud = ::cfgetospeed(&storage); -@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con - boost::system::error_code serial_port_base::flow_control::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.fOutxCtsFlow = FALSE; - storage.fOutxDsrFlow = FALSE; - storage.fTXContinueOnXoff = TRUE; -@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::flow_control::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.fOutX && storage.fInX) - { - value_ = software; -@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ - boost::system::error_code serial_port_base::parity::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case none: -@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::parity::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.Parity == EVENPARITY) - { - value_ = even; -@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( - boost::system::error_code serial_port_base::stop_bits::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case one: -@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::stop_bits::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.StopBits == ONESTOPBIT) - { - value_ = one; -@@ -507,7 +507,7 @@ serial_port_base::character_size::charac - boost::system::error_code serial_port_base::character_size::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.ByteSize = value_; - #else - storage.c_cflag &= ~CSIZE; -@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::character_size::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.ByteSize; - #else - if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } ---- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 -@@ -24,7 +24,7 @@ - #include - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) -@@ -600,7 +600,7 @@ public: - friend bool has_service(io_service& ios); - - private: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - detail::winsock_init<> init_; - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) ---- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 -@@ -21,16 +21,16 @@ - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ - || defined(GENERATING_DOCUMENTATION) - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - #include - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios ---- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 -@@ -85,15 +85,15 @@ public: - private: - static unsigned long openssl_id_func() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return ::GetCurrentThreadId(); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - void* id = instance()->thread_id_; - if (id == 0) - instance()->thread_id_ = id = &id; // Ugh. - BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); - return reinterpret_cast(id); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - static void openssl_locking_func(int mode, int n, -@@ -109,10 +109,10 @@ private: - std::vector > mutexes_; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // The thread identifiers to be used by openssl. - boost::asio::detail::tss_ptr thread_id_; --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch deleted file mode 100644 index 97acc72689d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 -+++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 -@@ -39,18 +39,8 @@ - #define BOOST_HAS_STDINT_H - #endif - --/// Cygwin has no fenv.h --#define BOOST_NO_FENV_H -- - // boilerplate code: - #include -- --// --// Cygwin lies about XSI conformance, there is no nl_types.h: --// --#ifdef BOOST_HAS_NL_TYPES_H --# undef BOOST_HAS_NL_TYPES_H --#endif - - - ---- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 -@@ -68,7 +68,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 -@@ -41,7 +41,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 -@@ -17,7 +17,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 -@@ -13,7 +13,7 @@ - #define BOOST_NO_STD_MESSAGES - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 -+++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 -@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) - defined(__CYGWIN__) \ - ) - # undef BOOST_OS_CYGWIN --# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE -+# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE - #endif - - #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch deleted file mode 100644 index 3d9726179be..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch +++ /dev/null @@ -1,600 +0,0 @@ ---- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 -+++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 -@@ -29,6 +29,7 @@ local rule default_binary_format ( ) - local tmp = elf ; - if [ os.name ] = "MACOSX" { tmp = mach-o ; } - if [ os.name ] = "NT" { tmp = pe ; } -+ if [ os.name ] = "CYGWIN" { tmp = pe ; } - if [ os.name ] = "AIX" { tmp = xcoff ; } - return $(tmp) ; - } -@@ -581,6 +582,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_i386_ms_pe_gas.S -+ asm/jump_i386_ms_pe_gas.S -+ dummy.cpp -+ : 32 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_i386_ms_pe_masm.asm - asm/jump_i386_ms_pe_masm.asm - dummy.cpp -@@ -715,6 +726,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_x86_64_ms_pe_gas.S -+ asm/jump_x86_64_ms_pe_gas.S -+ dummy.cpp -+ : 64 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp ---- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 -@@ -0,0 +1,108 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "jump_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _jump_fcontext -+.def _jump_fcontext; .scl 2; .type 32; .endef -+_jump_fcontext: -+ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ -+ movl %edi, (%ecx) /* save EDI */ -+ movl %esi, 0x04(%ecx) /* save ESI */ -+ movl %ebx, 0x08(%ecx) /* save EBX */ -+ movl %ebp, 0x0c(%ecx) /* save EBP */ -+ -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl (%edx), %eax /* load current SEH exception list */ -+ movl %eax, 0x24(%ecx) /* save current exception list */ -+ movl 0x04(%edx), %eax /* load current stack base */ -+ movl %eax, 0x18(%ecx) /* save current stack base */ -+ movl 0x08(%edx), %eax /* load current stack limit */ -+ movl %eax, 0x20(%ecx) /* save current stack limit */ -+ movl 0x10(%edx), %eax /* load fiber local storage */ -+ movl %eax, 0x28(%ecx) /* save fiber local storage */ -+ -+ leal 0x04(%esp), %eax /* exclude the return address */ -+ movl %eax, 0x10(%ecx) /* save as stack pointer */ -+ movl (%esp), %eax /* load return address */ -+ movl %eax, 0x14(%ecx) /* save return address */ -+ -+ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ -+ movl (%edx), %edi /* restore EDI */ -+ movl 0x04(%edx), %esi /* restore ESI */ -+ movl 0x08(%edx), %ebx /* restore EBX */ -+ movl 0x0c(%edx), %ebp /* restore EBP */ -+ -+ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ -+ testl %eax, %eax -+ je 1f -+ -+ stmxcsr 0x2c(%ecx) /* save MMX control word */ -+ fnstcw 0x30(%ecx) /* save x87 control word */ -+ ldmxcsr 0x2c(%edx) /* restore MMX control word */ -+ fldcw 0x30(%edx) /* restore x87 control word */ -+1: -+ movl %edx, %ecx -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl 0x24(%ecx), %eax /* load SEH exception list */ -+ movl %eax, (%edx) /* restore next SEH item */ -+ movl 0x18(%ecx), %eax /* load stack base */ -+ movl %eax, 0x04(%edx) /* restore stack base */ -+ movl 0x20(%ecx), %eax /* load stack limit */ -+ movl %eax, 0x08(%edx) /* restore stack limit */ -+ movl 0x28(%ecx), %eax /* load fiber local storage */ -+ movl %eax, 0x10(%edx) /* restore fiber local storage */ -+ -+ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ -+ -+ movl 0x10(%ecx), %esp /* restore ESP */ -+ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ -+ movl 0x14(%ecx), %ecx /* fetch the address to return to */ -+ -+ jmp *%ecx /* indirect jump to context */ ---- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 -@@ -0,0 +1,189 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "jump_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl jump_fcontext -+.def jump_fcontext; .scl 2; .type 32; .endef -+.seh_proc jump_fcontext -+jump_fcontext: -+.seh_endprologue -+ movq %r12, (%rcx) /* save R12 */ -+ movq %r13, 0x08(%rcx) /* save R13 */ -+ movq %r14, 0x10(%rcx) /* save R14 */ -+ movq %r15, 0x18(%rcx) /* save R15 */ -+ movq %rdi, 0x20(%rcx) /* save RDI */ -+ movq %rsi, 0x28(%rcx) /* save RSI */ -+ movq %rbx, 0x30(%rcx) /* save RBX */ -+ movq %rbp, 0x38(%rcx) /* save RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x08(%r10), %rax /* load current stack base */ -+ movq %rax, 0x50(%rcx) /* save current stack base */ -+ movq 0x10(%r10), %rax /* load current stack limit */ -+ movq %rax, 0x60(%rcx) /* save current stack limit */ -+ movq 0x18(%r10), %rax /* load fiber local storage */ -+ movq %rax, 0x68(%rcx) /* save fiber local storage */ -+ -+ testq %r9, %r9 -+ je 1f -+ -+ stmxcsr 0x70(%rcx) /* save MMX control and status word */ -+ fnstcw 0x74(%rcx) /* save x87 control word */ -+ /* save XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rcx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps %xmm6, (%r10) -+ movaps %xmm7, 0x10(%r10) -+ movaps %xmm8, 0x20(%r10) -+ movaps %xmm9, 0x30(%r10) -+ movaps %xmm10, 0x40(%r10) -+ movaps %xmm11, 0x50(%r10) -+ movaps %xmm12, 0x60(%r10) -+ movaps %xmm13, 0x70(%r10) -+ movaps %xmm14, 0x80(%r10) -+ movaps %xmm15, 0x90(%r10) -+ -+ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ -+ fldcw 0x74(%rdx) /* restore x87 control word */ -+ /* restore XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rdx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps (%r10), %xmm6 -+ movaps 0x10(%r10), %xmm7 -+ movaps 0x20(%r10), %xmm8 -+ movaps 0x30(%r10), %xmm9 -+ movaps 0x40(%r10), %xmm10 -+ movaps 0x50(%r10), %xmm11 -+ movaps 0x60(%r10), %xmm12 -+ movaps 0x70(%r10), %xmm13 -+ movaps 0x80(%r10), %xmm14 -+ movaps 0x90(%r10), %xmm15 -+ -+1: -+ leaq 0x08(%rsp), %rax /* exclude the return address */ -+ movq %rax, 0x40(%rcx) /* save as stack pointer */ -+ movq (%rsp), %rax /* load return address */ -+ movq %rax, 0x48(%rcx) /* save return address */ -+ -+ movq (%rdx), %r12 /* restore R12 */ -+ movq 0x08(%rdx), %r13 /* restore R13 */ -+ movq 0x10(%rdx), %r14 /* restore R14 */ -+ movq 0x18(%rdx), %r15 /* restore R15 */ -+ movq 0x20(%rdx), %rdi /* restore RDI */ -+ movq 0x28(%rdx), %rsi /* restore RSI */ -+ movq 0x30(%rdx), %rbx /* restore RBX */ -+ movq 0x38(%rdx), %rbp /* restore RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x50(%rdx), %rax /* load stack base */ -+ movq %rax, 0x08(%r10) /* restore stack base */ -+ movq 0x60(%rdx), %rax /* load stack limit */ -+ movq %rax, 0x10(%r10) /* restore stack limit */ -+ movq 0x68(%rdx), %rax /* load fiber local storage */ -+ movq %rax, 0x18(%r10) /* restore fiber local storage */ -+ -+ movq 0x40(%rdx), %rsp /* restore RSP */ -+ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ -+ -+ movq %r8, %rax /* use third arg as return value after jump */ -+ movq %r8, %rcx /* use third arg as first arg in context function */ -+ -+ jmp *%r10 /* indirect jump to caller */ -+.seh_endproc ---- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 -@@ -0,0 +1,115 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "make_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _make_fcontext -+.def _make_fcontext; .scl 2; .type 32; .endef -+_make_fcontext: -+ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in EAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andl $-16, %eax -+ -+ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ -+ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ -+ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ -+ negl %edx /* negate stack size for LEA instruction (== substraction) */ -+ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ -+ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ -+ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ -+ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ -+ -+ stmxcsr 0x02c(%eax) /* save MMX control word */ -+ fnstcw 0x030(%eax) /* save x87 control word */ -+ -+ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ -+ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ -+ -+ movl $finish, %ecx /* abs address of finish */ -+ movl %ecx, (%edx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ /* traverse current seh chain to get the last exception handler installed by Windows */ -+ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ -+ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ -+ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ -+ /* program is aborted */ -+ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ -+ -+walk: -+ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ -+ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ -+ jz found -+ decl %edx -+ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ -+ jmp walk /* inspect next SEH */ -+ -+found: -+ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ -+ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ -+ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ -+ movl $0xffffffff,%ecx /* set ECX to -1 */ -+ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ -+ leal 0x14(%edx), %ecx /* load address of next SEH item */ -+ movl %ecx, 0x24(%eax) /* save next SEH */ -+ -+ ret -+ -+finish: -+ /* ESP points to same address as ESP on entry of context function + 0x4 */ -+ xorl %eax, %eax -+ movl %eax, (%esp) /* exit code is zero */ -+ call __exit /* exit application */ -+ hlt -+ -+.def __exit; .scl 2; .type 32; .endef /* standard C library function */ ---- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 -@@ -0,0 +1,132 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "make_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl make_fcontext -+.def make_fcontext; .scl 2; .type 32; .endef -+.seh_proc make_fcontext -+make_fcontext: -+.seh_endprologue -+ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in RAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andq $-16, %rax -+ -+ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ -+ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ -+ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ -+ -+ negq %rdx /* negate stack size for LEA instruction (== substraction) */ -+ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ -+ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ -+ -+ stmxcsr 0x70(%rax) /* save MMX control and status word */ -+ fnstcw 0x74(%rax) /* save x87 control word */ -+ -+ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ -+ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ -+ -+ leaq finish(%rip),%rcx /* compute abs address of label finish */ -+ movq %rcx,(%rdx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ ret -+ -+finish: -+ /* RSP points to same address as RSP on entry of context function + 0x8 */ -+ xorq %rcx, %rcx /* exit code is zero */ -+ call _exit /* exit application */ -+ hlt -+.seh_endproc -+ -+.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch deleted file mode 100644 index cbb5757746d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 -@@ -1966,8 +1966,7 @@ namespace - { - errno = 0; - --# if !defined(__CYGWIN__)\ -- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ -+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ - && defined(_SC_THREAD_SAFE_FUNCTIONS)\ - && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ - && (!defined(__hpux) || defined(_REENTRANT)) \ ---- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 -@@ -36,7 +36,7 @@ - # include "windows_file_codecvt.hpp" - # include - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OPEN_BSD__) -+ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) - # include - #endif - -@@ -831,7 +831,7 @@ namespace - std::locale global_loc = std::locale(); - return std::locale(global_loc, new windows_file_codecvt); - # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OpenBSD__) -+ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." See - // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch deleted file mode 100644 index 16208385a9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 -@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla - - } - -- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) -+ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) - { - ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; - result += no ; -@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla - if ! in $(properties:G) - { - if windows in $(properties) -- || cygwin in $(properties) - { - properties += on ; - } -@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla - } - - if ( ! off in $(properties) || ! off in $(properties) ) -- && ( windows in $(properties) || cygwin in $(properties) ) -+ && windows in $(properties) - { - result += win32/lcid.cpp ; - } ---- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 -@@ -8,7 +8,7 @@ - #define BOOST_LOCALE_SOURCE - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #define BOOST_LOCALE_WITH_WCONV - #endif - ---- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 -@@ -59,7 +59,7 @@ namespace boost { - return normalize_encoding(l).compare(normalize_encoding(r)); - } - -- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+ #if defined(BOOST_WINDOWS) - int encoding_to_windows_codepage(char const *ccharset); - #endif - ---- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 -@@ -15,7 +15,7 @@ - # pragma warning(disable : 4996) - #endif - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #ifndef NOMINMAX - #define NOMINMAX - #endif ---- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 -@@ -23,7 +23,7 @@ - # include - #endif - --#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - #ifndef NOMINMAX - # define NOMINMAX - #endif -@@ -395,7 +395,7 @@ int main() - def.push_back("posix"); - #endif - -- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - test_iso_8859_8 = IsValidCodePage(28598)!=0; - #endif - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch deleted file mode 100644 index a7748ec58d8..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 -@@ -96,11 +96,6 @@ - # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS - #endif - --#if defined(__CYGWIN__) -- // Boost.ASIO is broken on Cygwin --# define BOOST_LOG_NO_ASIO --#endif -- - #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) - # ifndef BOOST_LOG_WITHOUT_SYSLOG - # define BOOST_LOG_WITHOUT_SYSLOG ---- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 -@@ -170,10 +170,6 @@ project boost/log - windows:ws2_32 - windows:mswsock - -- cygwin:__USE_W32_SOCKETS -- cygwin:ws2_32 -- cygwin:mswsock -- - linux:rt - linux:_XOPEN_SOURCE=600 - linux:_GNU_SOURCE=1 ---- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 -@@ -18,7 +18,7 @@ - - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - - #if defined(BOOST_LOG_USE_WINNT6_API) - -@@ -50,6 +50,6 @@ - #define WIN32_LEAN_AND_MEAN - #endif - --#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_WINDOWS) - - #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch deleted file mode 100644 index 35e6905b0f3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 -@@ -79,7 +79,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) ---- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 -@@ -32,7 +32,7 @@ - # include - #elif defined(BOOST_HAS_PTHREADS) - # include --#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - #else - // Use #define BOOST_DISABLE_THREADS to avoid the error ---- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 -@@ -65,7 +65,7 @@ - #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) - # include - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - # include - - #elif defined( _AIX ) ---- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 -@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch - # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange - # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - namespace boost - { ---- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 -@@ -49,7 +49,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(BOOST_HAS_PTHREADS) ---- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 -@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); - - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #if defined( BOOST_USE_WINDOWS_H ) - # include ---- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 -@@ -8,7 +8,7 @@ - // http://www.boost.org/LICENSE_1_0.txt - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #include - #include diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch deleted file mode 100644 index e241f37f203..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 -@@ -33,7 +33,7 @@ - // Standalone MinGW and all other known Windows compilers do predefine _WIN32 - // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. - --# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin -+# if defined(_WIN32) // Windows default, including MinGW and Cygwin - # define BOOST_WINDOWS_API - # else - # define BOOST_POSIX_API ---- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 -@@ -97,7 +97,7 @@ namespace - char buf[64]; - char * bp = buf; - std::size_t sz = sizeof(buf); -- # if defined(__CYGWIN__) || defined(__USE_GNU) -+ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) - // Oddball version of strerror_r - const char * c_str = strerror_r( ev, bp, sz ); - return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch deleted file mode 100644 index b60a3ac49d3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp -index 8b2bc43..d04f2fe 100644 ---- a/libs/units/example/autoprefixes.cpp -+++ b/libs/units/example/autoprefixes.cpp -@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return("€"); } -+ static const char* symbol() { return("€"); } - }; - - int main() -@@ -140,7 +140,7 @@ int main() - - quantity ce = 2048. * euro_base_unit::unit_type(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ - - - return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch deleted file mode 100644 index 15ce4007675..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- a/boost/pool/pool.hpp (revision 78317) -+++ b/boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include - -+// std::numeric_limits -+#include - // boost::math::static_lcm - #include -@@ -358,4 +360,13 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = math::static_lcm::value + sizeof(size_type); -+ size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -+ -+ return max_chunks; -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -400,7 +413,7 @@ - } - void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -410,5 +423,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -797,4 +811,6 @@ - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- a/libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) -@@ -0,0 +1,27 @@ -+/* Copyright (C) 2012 Étienne Dupuis -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include -+#include -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch deleted file mode 100644 index b7c91284d9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp ---- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 -+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 -@@ -27,7 +27,6 @@ namespace boundary { - int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) - { - typedef LeftIterator left_iterator; -- typedef RightIterator right_iterator; - typedef typename std::iterator_traits::value_type char_type; - typedef std::char_traits traits; - while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch deleted file mode 100644 index 6c1d0a021ed..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp ---- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 -+++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 -@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ - { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. - size_type partition_size = alloc_size(); - size_type POD_size = math::static_lcm::value + sizeof(size_type); -- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -- -- return max_chunks; -+ return (std::numeric_limits::max() - POD_size) / alloc_size(); - } - - static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch deleted file mode 100644 index 8adf8ed2080..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp ---- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 -+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 -@@ -147,8 +147,8 @@ namespace detail - template - inline PyObject* registry_to_python_value::operator()(argument_type x) const - { -- typedef converter::registered r; - # if BOOST_WORKAROUND(__GNUC__, < 3) -+ typedef converter::registered r; - // suppresses an ICE, somehow - (void)r::converters; - # endif - -Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch deleted file mode 100644 index cf9756e40ea..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ./move/core.hpp~ ./move/core.hpp ---- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 -+++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 -@@ -43,6 +43,7 @@ - #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) - - #include -+ #include - - //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers - #if defined(__GNUC__) && (__GNUC__ >= 4) && \ -@@ -65,7 +66,7 @@ - template - class rv - : public ::boost::move_detail::if_c -- < ::boost::move_detail::is_class_or_union::value -+ < ::boost::is_class::value - , T - , ::boost::move_detail::nat - >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch deleted file mode 100644 index 561cef19eb2..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp ---- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 -+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 -@@ -52,16 +52,15 @@ struct print - enum { n = sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else -- enum { -- n = --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned::value > -1 --# else -- sizeof(T) > -1 --# endif -- }; --#endif -+#elif defined(__EDG_VERSION__) -+ enum { n = aux::dependent_unsigned::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n = n1 != n2 }; -+#else -+ enum { n = sizeof(T) > -1 }; -+#endif - }; - - #if defined(BOOST_MSVC) - -Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch deleted file mode 100644 index 57e6206bba1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 -@@ -28,17 +28,17 @@ explicit valgrind_config_check ; - local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp ] -- [ run test_pool_alloc.cpp ] -- [ run pool_msvc_compiler_bug_test.cpp ] -- [ run test_msvc_mem_leak_detect.cpp ] -- [ run test_bug_3349.cpp ] -- [ run test_bug_4960.cpp ] -- [ run test_bug_1252.cpp ] -- [ run test_bug_2696.cpp ] -- [ run test_bug_5526.cpp ] -+ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] - [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] -- [ run ../example/time_pool_alloc.cpp ] -+ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] - [ compile test_poisoned_macros.cpp ] - - # - -Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch deleted file mode 100644 index eb9ea14011f..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/boost/signals2/trackable.hpp -+++ b/boost/signals2/trackable.hpp -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - namespace boost { - namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch deleted file mode 100644 index 282962987c5..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 -@@ -282,12 +282,12 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base helper_base_t; - typedef grammar_helper_list helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - grammartract_helper_list::do_(self); - - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else - -Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch deleted file mode 100644 index 30ebb981b70..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/boost/uuid/detail/uuid_x86.hpp -+++ b/boost/uuid/detail/uuid_x86.hpp -@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT - cmp = (cmp - 1u) ^ cmp; - rcmp = (rcmp - 1u) ^ rcmp; - -- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); -+ return cmp < rcmp; - } - - } // namespace uuids From b71493598a47dbe7597ba33832042a4cd958fade Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:20:04 -0400 Subject: [PATCH 020/637] herqq: remove gcc6.patch not referenced in nix code --- pkgs/development/libraries/herqq/gcc6.patch | 1320 ------------------- 1 file changed, 1320 deletions(-) delete mode 100644 pkgs/development/libraries/herqq/gcc6.patch diff --git a/pkgs/development/libraries/herqq/gcc6.patch b/pkgs/development/libraries/herqq/gcc6.patch deleted file mode 100644 index b0f7d8d0c6f..00000000000 --- a/pkgs/development/libraries/herqq/gcc6.patch +++ /dev/null @@ -1,1320 +0,0 @@ -diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -index c4d2ebe..707dbdb 100644 ---- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -+++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged( - { - foreach(const HAvtLastChangeInfo& info, infos) - { -- if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0) -+ if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0) - { - HTransportState state(info.value().toString()); - if (state.isValid()) -diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -index 40f9fda..6739a58 100644 ---- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -+++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const - { - QString vrs = version(); - -- return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) && -+ return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) && - (vrs.size() == 3 && - (vrs[0] == '1') && - vrs[1] == '.' && -@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const - { - QString vrs = version(); - -- bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 && -+ bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 && - vrs.size() >= 3 && - vrs[0] == '1' && - vrs[1] == '.'; -diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp -index 8ed2492..94ab1e0 100644 ---- c/herqq/hupnp/src/dataelements/hresourcetype.cpp -+++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp -@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - { - return; - } -- if (tmp[1].compare("schemas-upnp-org") != 0) -+ if (tmp[1].compare(QString("schemas-upnp-org")) != 0) - { - flags = 0x01; - tmp[1] = tmp[1].replace('.', '-'); -@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - } - - tmp[2] = tmp[2].simplified(); -- if (tmp[2].compare("device") == 0) -+ if (tmp[2].compare(QString("device")) == 0) - { - flags |= 0x04; - } -- else if (tmp[2].compare("service") == 0) -+ else if (tmp[2].compare(QString("service")) == 0) - { - flags |= 0x08; - } -diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp -index 9b0fad6..11a8640 100644 ---- c/herqq/hupnp/src/dataelements/hserviceid.cpp -+++ i/herqq/hupnp/src/dataelements/hserviceid.cpp -@@ -64,7 +64,7 @@ public: - return; - } - -- if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0) -+ if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD( - QString("Invalid service identifier [%1]").arg(arg)); -@@ -72,7 +72,7 @@ public: - return; - } - -- if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0) -+ if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0) - { - tmp[1] = tmp[1].replace('.', '-'); - if (tmp[1].isEmpty()) -@@ -85,7 +85,7 @@ public: - } - - bool warned = false; -- if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0) -+ if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg)); - warned = true; -diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -index b3a58fa..d1853e1 100644 ---- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -+++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments( - } - - HActionArgument createdArg; -- if (dirStr.compare("out", Qt::CaseInsensitive) == 0) -+ if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0) - { - if (retValWasDefined) - { -@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments( - - outArgs->push_back(createdArg); - } -- else if (dirStr.compare("in", Qt::CaseInsensitive) == 0) -+ else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0) - { - if (firstOutArgFound) - { -@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable( - - QString strSendEvents = stateVariableElement.attribute("sendEvents", "no"); - bool bSendEvents = false; -- if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bSendEvents = true; - } -- else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable( - - QString strMulticast = stateVariableElement.attribute("multicast", "no"); - bool bMulticast = false; -- if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bMulticast = true; - } -- else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -index 2e375a0..2d6a8cc 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents( - - // this appears to be an initial subscription - -- if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0) -+ if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0) - { - return PreConditionFailed; - } -diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -index aacdfcf..b618ba7 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; -@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; - } - -- if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0) -+ if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0) - { - m_subTypeValue.first = SubType_UpnpPropChange; - m_subTypeValue.second = "upnp:propchange"; -diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -index 0faf7f4..addbaaf 100644 ---- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) : - m_value(-1) - { - QString tmp(timeout.simplified()); -- if (tmp.compare("infinite", Qt::CaseInsensitive) != 0) -+ if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0) - { - if (tmp.startsWith("Second-", Qt::CaseInsensitive)) - { -diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp -index 9f2084f..ae8e9ae 100644 ---- c/herqq/hupnp/src/general/hupnp_datatypes.cpp -+++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp -@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType( - - case HUpnpDataTypes::boolean: - { -- if (value.compare("true", Qt::CaseInsensitive) == 0 || -- value.compare("yes", Qt::CaseInsensitive) == 0 || -- value.compare("1") == 0) -+ if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("yes"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("1")) == 0) - { - retVal = true; - } -- else if (value.compare("false", Qt::CaseInsensitive) == 0 || -- value.compare("no", Qt::CaseInsensitive) == 0 || -- value.compare("0") == 0) -+ else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("no"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("0")) == 0) - { - retVal = false; - } -diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp -index eb1a56c..42e93ca 100644 ---- c/herqq/hupnp/src/http/hhttp_server_p.cpp -+++ i/herqq/hupnp/src/http/hhttp_server_p.cpp -@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op) - mi->setKeepAlive(HHttpUtils::keepAlive(*hdr)); - - QString method = hdr->method(); -- if (method.compare("GET", Qt::CaseInsensitive) == 0) -+ if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0) - { - processGet(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("HEAD"), Qt::CaseInsensitive) -+ else if (method.compare(QString("HEAD")), Qt::CaseInsensitive) - { - processHead(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("POST", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0) - { - processPost(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0) - { - processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processSubscription(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processUnsubscription(op->takeMessagingInfo(), *hdr); - } -diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h -index 7285190..b3ee62e 100644 ---- c/herqq/hupnp/src/http/hhttp_utils_p.h -+++ i/herqq/hupnp/src/http/hhttp_utils_p.h -@@ -64,10 +64,10 @@ public: - QString connection = hdr.value("CONNECTION"); - if (hdr.minorVersion() == 1) - { -- return connection.compare("close", Qt::CaseInsensitive) != 0; -+ return connection.compare(QString("close"), Qt::CaseInsensitive) != 0; - } - -- return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0; -+ return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0; - } - - // returns the URLs as a string inside brackets. This is the format used in -diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -index 6641d14..7ea567a 100644 ---- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp -+++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok) - bool retVal = false, match = true; - if (arg == "1") { retVal = true; } - else if (arg == "0") { retVal = false; } -- else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal = false; } -- else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; } - else { match = false; } - - if (ok) { *ok = match; } -diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -index 6531929..8bd05c5 100644 ---- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -+++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status) - HObject::WriteStatus HObject::writeStatusFromString(const QString& status) - { - WriteStatus retVal = UnknownWriteStatus; -- if (status.compare("writable", Qt::CaseInsensitive) == 0) -+ if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0) - { - retVal = WritableWriteStatus; - } -- else if (status.compare("protected", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0) - { - retVal = ProtectedWriteStatus; - } -- else if (status.compare("mixed", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0) - { - retVal = MixedWriteStatus; - } -diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -index 25ee560..bea6ece 100644 ---- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -+++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type) - HMatchingId::Type HMatchingId::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0) - { - retVal = SeriesId; - } -- else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0) - { - retVal = ProgramId; - } -diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -index 06ab6bf..e7cec20 100644 ---- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -+++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type) - HScheduledTime::Type HScheduledTime::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0) - { - retVal = ScheduledProgram; - } -- else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0) - { - retVal = OnDemand; - } -diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -index 078d719..31e1af0 100644 ---- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -+++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type) - HSortModifier::Type HSortModifier::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("+", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByValue; - } -- else if (type.compare("-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByValue; - } -- else if (type.compare("TIME+", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByTime; - } -- else if (type.compare("TIME-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByTime; - } -diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -index 65b67f8..f51e6b2 100644 ---- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -+++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString( - const QString& type) - { - RcsInstanceType retVal = Undefined; -- if (type.compare("pre-mix", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PreMix; - } -- else if (type.compare("post-mix", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PostMix; - } -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -index 9f5712d..cd4dacb 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml( - addNamespaces(reader); - if (reader.readNextStartElement()) - { -- if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0) - { - h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element"; - return false; -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -index 30af243..af03c5c 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn( - - if (stateVariableReader.readNextStartElement()) - { -- if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return false; - } -diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp -index d35a559..85b7e32 100644 ---- c/herqq/hupnp_av/src/common/hradioband.cpp -+++ i/herqq/hupnp_av/src/common/hradioband.cpp -@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type) - HRadioBand::Type HRadioBand::fromString(const QString& arg) - { - Type retVal = Undefined; -- if (arg.compare("am", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0) - { - retVal = AM; - } -- else if (arg.compare("fm", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0) - { - retVal = FM; - } -- else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0) - { - retVal = ShortWave; - } -- else if (arg.compare("internet", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0) - { - retVal = Internet; - } -- else if (arg.compare("satellite", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0) - { - retVal = Satellite; - } -diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp -index 37ab7e0..c7f2109 100644 ---- c/herqq/hupnp_av/src/common/hstoragemedium.cpp -+++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp -@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type) - HStorageMedium::Type HStorageMedium::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = Unknown; - } -- else if (type.compare("DV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0) - { - retVal = DigitalVideo; - } -- else if (type.compare("VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0) - { - retVal = VHS; - } -- else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = W_VHS; - } -- else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = S_VHS; - } -- else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0) - { - retVal = D_VHS; - } -- else if (type.compare("VHSC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0) - { - retVal = VHSC; - } -- else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0) - { - retVal = Video8; - } -- else if (type.compare("HI8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0) - { - retVal = HI8; - } -- else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = CD_ROM; - } -- else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0) - { - retVal = CD_DA; - } -- else if (type.compare("CD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0) - { - retVal = CD_R; - } -- else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = CD_RW; - } -- else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0) - { - retVal = Video_CD; - } -- else if (type.compare("SACD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0) - { - retVal = SACD; - } -- else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscAudio; - } -- else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscPicture; - } -- else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_ROM; - } -- else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_Video; - } -- else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRecordable; - } -- else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRecordable; - } -- else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRewritable; - } -- else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRewritable; - } -- else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_RAM; - } -- else if (type.compare("DAT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0) - { - retVal = DAT; - } -- else if (type.compare("LD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0) - { - retVal = LD; - } -- else if (type.compare("HDD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0) - { - retVal = HDD; - } -- else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0) - { - retVal = MicroMV; - } -- else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0) - { - retVal = Network; - } -- else if (type.compare("NONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0) - { - retVal = None; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = SecureDigital; - } -- else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0) - { - retVal = PC_Card; - } -- else if (type.compare("MMC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0) - { - retVal = MultimediaCard; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CompactFlash; - } -- else if (type.compare("BD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0) - { - retVal = BluRay; - } -- else if (type.compare("MS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0) - { - retVal = MemoryStick; - } -- else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0) - { - retVal = HD_DVD; - } -diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -index 89d44ae..bb364b5 100644 ---- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -+++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction - HConnectionManagerInfo::directionFromString(const QString& arg) - { - Direction retVal = DirectionUndefined; -- if (arg.compare("Input", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionInput; - } -- else if (arg.compare("Output", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionOutput; - } -@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus - HConnectionManagerInfo::statusFromString(const QString& arg) - { - ConnectionStatus retVal = StatusUnknown; -- if (arg.compare("Ok", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0) - { - retVal = StatusOk; - } -- else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnknown; - } -- else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0) - { - retVal = StatusContentFormatMismatch; - } -- else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0) - { - retVal = StatusInsufficientBandwidth; - } -- else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnreliableChannel; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -index 5c0c0d0..743ed1e 100644 ---- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag - HContentDirectoryInfo::browseFlagFromString(const QString& arg) - { - BrowseFlag retVal = Undefined; -- if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseMetadata; - } -- else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseDirectChildren; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -index 0a663dc..1771b6f 100644 ---- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo() - HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg) - { - Status retVal = Error; -- if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0) - { - retVal = InProgress; - } -- else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0) - { - retVal = Completed; - } -diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp -index c3f93a9..27d98a0 100644 ---- c/herqq/hupnp_av/src/hav_global.cpp -+++ i/herqq/hupnp_av/src/hav_global.cpp -@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg) - addNamespaces(reader); - - if (!reader.readNextStartElement() || -- reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return retVal; - } -diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -index f9e2dc4..69b7648 100644 ---- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -+++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0) - { - return; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -index 651e727..9fb4958 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived( - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -index 174f423..bf7e9f2 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection( - return HConnectionManagerInfo::IncompatibleDirections; - } - -- if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) && -+ if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) && - remoteProtocolInfo.protocol() != "*") - { - return HConnectionManagerInfo::IncompatibleProtocolInfo; -diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -index 1ad337a..0f5e209 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName) - { - bool retVal = false; - QString trimmed = svName.trimmed(); -- if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0) -+ if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -index a614e17..fbb3258 100644 ---- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables( - foreach(QString svName, stateVarNames) - { - svName = svName.trimmed(); -- if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 || -+ if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 || - svName.startsWith("A_ARG", Qt::CaseInsensitive)) - { - return HAvTransportInfo::InvalidStateVariableList; -@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -index 751a3d9..51c1ff4 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -@@ -110,59 +110,59 @@ QString HChannel::toString(Type type) - HChannel::Type HChannel::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("MASTER", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0) - { - retVal = Master; - } -- else if (type.compare("LF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0) - { - retVal = LeftFront; - } -- else if (type.compare("RF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0) - { - retVal = RightFront; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CenterFront; - } -- else if (type.compare("LFE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0) - { - retVal = LFE; - } -- else if (type.compare("LS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0) - { - retVal = LeftSurround; - } -- else if (type.compare("RS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0) - { - retVal = RightSurround; - } -- else if (type.compare("LFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0) - { - retVal = LeftOfCenter; - } -- else if (type.compare("RFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0) - { - retVal = RightOfCenter; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = Surround; - } -- else if (type.compare("SL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0) - { - retVal = SideLeft; - } -- else if (type.compare("SR", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0) - { - retVal = SideRight; - } -- else if (type.compare("T", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0) - { - retVal = Top; - } -- else if (type.compare("B", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0) - { - retVal = Bottom; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -index fd52f9a..84f5579 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp -index cb18ce0..e3fcd64 100644 ---- c/herqq/hupnp_av/src/transport/havtransport_info.cpp -+++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp -@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState - HAvTransportInfo::drmStateFromString(const QString& state) - { - DrmState retVal = DrmState_Unknown; -- if (state.compare("OK", Qt::CaseInsensitive) == 0) -+ if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Ok; - } -- else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Unknown; - } -- else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ProcessingContentKey; - } -- else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ContentKeyFailure; - } -- else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_AttemptingAuthentication; - } -- else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_FailedAuthentication; - } -- else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_NotAuthenticated; - } -- else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_DeviceRevocation; - } -diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp -index 9e642c1..5f33847 100644 ---- c/herqq/hupnp_av/src/transport/hmediainfo.cpp -+++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp -@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString( - const QString& category) - { - MediaCategory retVal = Undefined; -- if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0) -+ if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0) - { - retVal = NoMedia; - } -- else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackAware; - } -- else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackUnaware; - } -diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp -index 8d3a20e..57605f0 100644 ---- c/herqq/hupnp_av/src/transport/hplaymode.cpp -+++ i/herqq/hupnp_av/src/transport/hplaymode.cpp -@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type) - HPlayMode::Type HPlayMode::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NORMAL", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0) - { - retVal = Normal; - } -- else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0) - { - retVal = Shuffle; - } -- else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatOne; - } -- else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatAll; - } -- else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0) - { - retVal = Random; - } -- else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0) - { - retVal = Direct_1; - } -- else if (type.compare("INTRO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0) - { - retVal = Intro; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -index ab29f09..a1a5de0 100644 ---- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString( - const QString& type) - { - Type retVal = Unknown; -- if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = Writable; - } -- else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0) - { - retVal = Protected; - } -- else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = NotWritable; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty()) -+ else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty()) - { - retVal = VendorDefined; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -index bf7dd90..b659fd7 100644 ---- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode) - HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode) - { - Type retVal = Undefined; -- if (mode.compare("0:EP", Qt::CaseInsensitive) == 0) -+ if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0) - { - retVal = Ep; - } -- else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0) - { - retVal = Lp; - } -- else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0) - { - retVal = Sp; - } -- else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0) - { - retVal = Basic; - } -- else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0) - { - retVal = Medium; - } -- else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0) - { - retVal = High; - } -- else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp -index c2ac69a..d3eee2b 100644 ---- c/herqq/hupnp_av/src/transport/hseekinfo.cpp -+++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp -@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type) - HSeekMode::Type HSeekMode::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0) - { - retVal = TrackNr; - } -- else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = AbsTime; - } -- else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = RelTime; - } -- else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = AbsCount; - } -- else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = RelCount; - } -- else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0) - { - retVal = ChannelFreq; - } -- else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = TapeIndex; - } -- else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = RelTapeIndex; - } -- else if (type.compare("FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = Frame; - } -- else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = RelFrame; - } -diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp -index d64b1bc..4a34b8d 100644 ---- c/herqq/hupnp_av/src/transport/htransportaction.cpp -+++ i/herqq/hupnp_av/src/transport/htransportaction.cpp -@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type) - HTransportAction::Type HTransportAction::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("PLAY", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0) - { - retVal = Play; - } -- else if (type.compare("STOP", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0) - { - retVal = Stop; - } -- else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0) - { - retVal = Pause; - } -- else if (type.compare("SEEK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0) - { - retVal = Seek; - } -- else if (type.compare("NEXT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0) - { - retVal = Next; - } -- else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0) - { - retVal = Previous; - } -- else if (type.compare("RECORD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0) - { - retVal = Record; - } -diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp -index ecfaf0b..8ca9b1c 100644 ---- c/herqq/hupnp_av/src/transport/htransportinfo.cpp -+++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp -@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type) - HTransportStatus::Type HTransportStatus::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("OK", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = OK; - } -- else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0) - { - retVal = ErrorOccurred; - } -diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp -index b460065..f2a1ac3 100644 ---- c/herqq/hupnp_av/src/transport/htransportstate.cpp -+++ i/herqq/hupnp_av/src/transport/htransportstate.cpp -@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type) - HTransportState::Type HTransportState::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0) - { - retVal = NoMediaPresent; - } -- else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0) - { - retVal = Playing; - } -- else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0) - { - retVal = Transitioning; - } -- else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0) - { - retVal = PausedPlayback; - } -- else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = PausedRecording; - } -- else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = Recording; - } From 374e8f4e28114547f052495b83e73031d22c751a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:22:53 -0400 Subject: [PATCH 021/637] pharo: remove resource files These should be checked into upstream --- pkgs/development/pharo/vm/build-vm-legacy.nix | 1 - .../share/icons/hicolor/16x16/apps/pharo.png | Bin 902 -> 0 bytes .../share/icons/hicolor/256x256/apps/pharo.png | Bin 52181 -> 0 bytes .../share/icons/hicolor/32x32/apps/pharo.png | Bin 2368 -> 0 bytes .../share/icons/hicolor/48x48/apps/pharo.png | Bin 4602 -> 0 bytes .../share/mime/packages/pharo-image.xml | 9 --------- pkgs/development/pharo/vm/share.nix | 4 +--- 7 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index f2fd6eebd56..bd84dd06e7f 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { preConfigure = '' cd build/ ''; - resources = ./resources; installPhase = '' mkdir -p "$prefix/lib/$name" diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png deleted file mode 100644 index 7910e17ebc49ab5b0f4404ca5afd661747589b19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 902 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>l~}ah_$_#u|LqoJU|<&Zba4!^IK6bTcgEaM znIrZ8i_d+p{XQ`~KW~y$Zcw&P)}jeou{Tz+$OqJ{S>%*Gl|$<8ijGHmmwIPAMRROC zD%Q1Pg|=f&gLL-NHZwJ`Ss8L>ceZ_8c1>k_=DXi@_bv5SZCzl^o@Q)t*uda}z2bjW zxmhRpwyFJbpPlsUn$>xMjG5c}^sDn%SaVo3%$p}SbIzO+rVHN=G1l4tk!qg*|IYoJ zmwp6h?|pwgyHL8sHECVjY7to_A-2*r0`hk@TK9)H>Fv{5$*~C+q7vU;O*G}pZoP90C%+Hp_W2jKXrCe@Q@GOE8!vwv zb0xb?E%Va0*cjl@d3fjQBaG*aHismhe-QSrdc*9_qgobsf>eJ6zI?UnSLyY$mm9h4 zg_m0Vx@_cqRO*`B4GpDDVy|Uh&wjke^!dj-lJi|IInS9K{8{|_jlKTylh!Q`-Y~6K zG+Fw;#<}ET-H=O_B)&${FeM*UcatkU{GN2ba4!+xb-Hse2+}( z)w*-m#<#zJn^hI;*~&8M!X*aHAQndvd&LFv950ryXy9cz+VqLDCMbj@aF&SXB}EQS z0nV0b6Ig;cUY^{$bML!%Z_fO#tM{o+FZ-tEA^PpC{{HIs({A3qX?ec-T=BeOzJREu zp+qCoA6+g=UN3e2r0axPu`c~uxBlW{_v_QnIb}}0w!Ff3hQUHRvF@pUE+?5a*7`p- z;%VM=Gv}qt6ov&`?0UUJLz_FiVjMt9OMT~BZ7n?1!nss9Fly=7%$Ve3J(5vY+)D)( zY_VI~U3||r^U{({mu6}(I%L*zT|d?<{oCiVj{e+EA%-c}mKXTWFkmz_HC0vGu*K{3 zvx`rQ=N+-u-@}~XF1SE|As{d?kjvD5S-02n2lh!K3^UK=rS?8AR;Tjk%=ja@C_=JdXs^HW`T#g)!iZ;UHm!_XpbWjiw^w>3*BO&Fl zih#)Px~UAu7+M9biq&ozscqwzxN$Lg!A|3D-nq;-cGjNmD~*o6{&n-0+0U%kuRUQ` z{rYvr?GKwiGd?>v*E;XyB-Q-lbFMF6>o7WGo{Vo2Q=WLb10&yAc5jGSB)-<*=FD2ry(-d6VT zV*TD-YnH12Px-em-Y(@`&F86;$^)1h{5!Jc8&AAuFxc~E_V#%(v2wpZeaZZNW`@}! z8FuqyEli8{6nx8zD71dC>svwZ)%-IJsdLsG@cqurn6lmO!82zjCUzDs8%9o+7=0(J zX&Y<>ei}Y$Q$1w0Zvg`br@?h)MGXcasl(6q*~rCQ?+w3}`>wj`={0vYvHO+m^>6>F z>-IM=aKtgS2r<9Y1o4qa-+Dx>02K zW`RxTwco6;5$IP=*t3n%Xj8BMkMeS*Y4H8dzYM=?_5!D+}^xl{^2+0#REC4#2>9(`}fO}S92@Av`*zu3D@6gy#2$j>bC}t zHxdsm7vj;<(zHHz) zbYM&Q&jr$QcOE*jxH24J;W%TY(8j>QQue`?gVljybN|zWeas>vRWiq!C-C0pWk2yg z(cu}_67I8y1RfUgbJV5%{@Itl*pMk%Meg1W_kNxGId=O>zRvy2A79ICwtp9kPvC*G z{-OdtGYlA4tvYt=_U)~6t;@enV|cK*@Ac)-ly7Amx%1D<&9VElU*96*ey92w+4$y_ zR|OYJf7_O``RlR|lM2uISB8hFJT8kZ{w=Py`@*Jf|8KR4h5r^TbWoIk(CBc0`v$W> z!6iOBfeDA$1wXL;iDSCCu<6gvwaiA}Yq?!SoQ{d?D39fTSMjcQ?&`4I9d^~9Z(e79 z@pnrL$L93&e))HH81Ae6{Vi6N|H0z;iJLa(|Ct|{JWFqeeR9y_KMxBT86Rykox${A z+ehp4SuLfzM72yL!VK%FunV?n~U|q(Fglx*tUr1+<4lopwME!S)q}sX}xA8 z%h5fI@4uel6_xpZ=+|97;WzU=dpE4|KAyY&&5^n1_kD{vZyWw6D5vr(>k2{Mw!BBe zGdyS5R2GG*2t8cC|6kSh-<5ZS7~T{XtQXj!$zT!|S8?Az{jKf0*YjuIXtoy)%)|hDmVV^apV@PG0$K42&x47>x>FelFwSoOepTu*Nv*me0MEBp4p*Y)#_J2YZIriT2GKj>hjE4H%+szP1(dCFSSv;bMggarOFSQ z>{n&J#qYQNvLMs=8NWZr*+-8Ku->^l&-!HLN#D|*Xin323k*-^R2bNO=Wt|qDU;`F zS^B?gLesZ(zw#Uv&Il)bs!n`zZPsrmDbFiU{wTe9?798aJH|Q7PcCQ__%xwIAi3qK ztmU08CCcyWlTQABRsZwYdB!IU68|+9I_iiyo6SCYXJ@gx?e{yy`DP|23wG}O*}U_d z_cFOVpOhO`D%(B3!o2!<{l{6#eDmxcPncM!xFdCI3`1q!(Qh#vCkt$z%1ka#%MAZ= z^wS0&sWWvw0t&b9h9BC~V5`6qE3m91Fnq{7U z?@0Rm+Hbz>Ja!v;*QI>?_qNUS&DQY4H^c9jJZTJ0KQAjMzOA>JJ28HO(=LXSw?95S zdd=tDbz_H(z1C;A3(9>ZH8gCd-Jcww(8J$wR#)Ljtv(miy1$`?cO*QQ2KlZIUmy29G4`vfRs9Kz7uMIp!{*n2f6qU= z{(xq?sVWPzpz?tSOuI6r?f$IW^Z1&U!t5=@Pqs8yFqTD~Hne!Q#u|ptSA};&A;Jg$G@PW{dK2Sr5hoT-mlclhu3`}>m;5*8#q zJvDW<-I?6?!Mh(#PE-E;OlZpd&&%V_%&7g~dfa!NDCcgrYfl=^wNBl?eZ5Ii+`f4S z*Jpj^jyiF-)pqe0iQ33Jk9YhzxFsRb>4JDZw}GdE%JJ(uOBT5My)~S_<@(8;+}95% zcZKrhOl6Ape{<1y&o1rmrP04OR8?E^b(AJo1SQ-rVl)ulm?5%inW9i?*8BJ-(>gi$(V2XF|duzIPHu? zRAl7I`Bkr0&XwPG|M$w+r~kj67H)fQ|Nq8Ea$lyJuS?6!!5~ zG4ilHt74p1csj0Ow{g2EHz(p z>Y*E(IDUN&Th4rW<$|Kts|^C%%n$1r^l7N9i@oT2{m$1XcWbZD{m0w2^q0#v|Nk26 z4%dFaTfTmwbNe=%KOYXq%74qQf5qUiI%`3Vd-2-~-tzSiPBbr*Gg)n@#1kwa==glv z>GP^#w|W=OmA(3n>4429zJ0M*y4@wY_A=PtmRDf8@2ep&$?!vi!;Y8ktV~?WE+TC$ zr!LGnne3V^Hv4wb1D6|@W-~vRSvz;H#HuHT%cI3<*19n@$^XgPpQUJN|S|ao^x<+R9WBZ-i=K1%|Oq({%TuMr+s9Rj$jg!G{!O@_r4{G0P*#AAnyQdp0um2+low6A?d!wX?Q&2= zw8ya8J=|Ge@|e!|c{!1rbAG(5-rQUwSk}tP9>AitTI=G?i!ZD9*~chostD*6SSUK% z&2LYXXju4oVH)e}q{D@0A37g&c)*v*&F}FvsJ6Jv#OG{p)y>p8bByduG19{OM`B-8J7f&!1a+zxKQB zXUAth?7uQBm|}k5O`hA&ru%UgUoV`GEBtdMYaxf*5uNb+LLV(QYC5VqwM0hM26I@; zY}mo@?9DBq&F7ZHy7*nK{QB-Frz4jJ3p+1sO1b@lf59CKv|463RV?>DK0iM9pulEn zcXO#3bHpxqHZF4&?2P)jYmt_iqqspy{2n=j4G;L^`PA=UzrMxoD0ui;zND|dKj(?? z=@0%E4PV}7XSM%-HFLV3UD>~IKDn7}EQ0Focf|$zZlBX(HexwGJGU}JYN6gbr{Fav z((UDezq+HETJ^#TUhaIwvgxYbriZ^$wmf;iTRkT{-omQZI;Eh)_J-a*ua=f&3af;s zZA~dW{z~u7tzDw_GB=x>r9yaCdnwP;a@U&cW+Uf*g^gkAN}pEx&i?NcNT7 z{QJj+HAyjja@vO|uAe^`em1^)E~2O5rX+Z}clsW_`3auu_&@Ar=h~y+v}i@Z7LH>} z8a&r9i|?6oa6%W$v2d3}u1O2doqWf!y>V5;Rzn`&RX=_;E?#BkXZKHfw(DDme`j6w zZ~EP+W@?-sSCz@~e9y~H^?4Co2fokrX82&Y{>s95>&*9`*VX-;!t8ea+7XdQWdZ42 z?#%gb=NYbMWR1%|_i&;3_1wyb_2>V8`z0IucD0i7ciV!DOJ0qf2MWriiz4e-SS(Z` z+tvuUIJ9ZUpK%EI?)UDUp8bS3I?T+9>x@!%9=NK%J@MwP+>A5ZANTCalL=U^G|fkG zs-Clr*yget*N;2D9SS^S_{=z<=qAr?gPGxy8qzazCTuc)(5UFC_U!G8d(XFji+)z+ zGOc~8kIKZeY21hUAH0uKoXF0^TEic_K!YnNP_%vd?hOUG+Up|IlVWmt4o_Oe8)1|) zng9EnPq|iQIiha{`3yP%r2ulToaG5_q%4;Cl}CeCtcYS{DPh)!Uu;wk~NlGiuxq$Ztwq{@AJ zo#kh(M7}Md^U9893iJPdQ+eEXm1wA8D@#M%U6$v46>10eS!-@>+OnYLVw(m_cPgvG zUba25@rtV*-BNuHnyxQhuzs!R^Zs*-Yy_L7I&ZABIGg@v-A7Nme1p4cyDxmY`k?zN zb6(B_VUDU_eycNDQZ_AAEkmqGWtMj5%x z?!?7m?eFCS`U{^5rttC|o>p@B8;7h&!M^xbj@ZiJn$Q2P-ZX!|>)VWd&-3EhvMaiF zF8BFgcwDwTA~p5ttmyo`rN58&N&i0b<_G&6hn-vXuk!xC7^^R5ot+b0>s0vrTH$Wy zb%z+7IX>Pw7I$lBsrT_~;qkjNADon)ceXqyF7%#B<(C)l|Cc^|7~GzftZgE(jb*|8 z2L?XNRhNsbzO5wF&M}44ad}U9d5gl5H4G0pTV$**cp9(bQe0{HC;K4J%<%b8DM0vFCX3tbRrYzkQ9ul9!NOl?Gtw94x_%jB3I9((Vi*I|t&3Nz9I;#+g z1x7;qCNi;s-3lNU13sYrlyIPm-$-!{c?H#jZ2q4{dnAOe^2^Jj2FWP zyLF!)?<+sCBH6F@*^kU#C&rE?=cWp#eVrM-P1$|@-c2<(zs1Y_mu0xk_+-`jJ!Ot| zVTBLYSpKg6w_~psi}194*Pb{Wdl2_sZnjF(nKSGhj*AvJ1zfsuc>STN<%dU0GlTSLFe|o`s!oj7tr9VEl zJiM_ymS@@GUo9Jg+Rp9Vd@{l2JU7!{zM#K9Tq5ot4n; zxiHuG=zg=33%kt2Y;V-wb~S$zZN7$SLaGX7xv*Hv(~sP|@h!QZ^f-33skU5^I^%WKlrPi8+nbx^yOj1G zdj$rS$(&!lf8DLq@LlP`A`KcDxh-Tu$RW0{wiCI0;MR6bhxS3he*;&h!O z+fMg6++{7lTYn@yt-da%Rcq-N77@2c6SwbrId}U1uMW3M<9DCvyS<6Q>hkfr_p5*F z{#PIFoGTBtNmSRdA~ zpvf`$z&b|e?Q7p1c`2GZBXYHZl)utM4~NjJOicc2ce@xJ8{Gw1nhuzi_{2E*T zPPHhhkv%sji1Y3f1B(N!-=}m4HLUJQV0u(97o{Gz^W~?*zv62%R-Q=x#PCBheU71) zQ0JMSm*@X0dF?*;@&6-C4YnzZ*Ss|Eo+e|Nd}oT)?rn2!i*GySac6H%_rG&r?^|1L zPCMy!`@?R=Bd_ZJ^hZBGfAjr~$ghElZ(c>*6)|WDPIRkV{Qc>7!we095Dq>y;cuTA znYavBuq;vHk>2&WBH^gtpS&dd1xF`%Efwf>J1Fu@D*B+GZmJ;HqwfbB8Ui$KXiob- zUAluS)51X^O`k>RM^X1Wb%6`q8MC@pt zK2v*)9{WV;1KF}N{F2HamM?Zw$}X_h`M}*VC(El}=Bz1oIa4cBA_T`PgZr9Y6yB-%hr#ei}OS*WA zZ_U4d>CYu?b!R6&D-WIXZFTS>=kLER-MjqV?$d#ZnG>%`L|Vr8&EedB<$CDto7TpY z{Q?vj_S_Co$Z?sjY8BM6K$AysYQf_!zn=5&4>e7cIk}1J^waBGCVYujoc#XYH@yZ2 zv7;i~+-zUjR6_61Yhn42`sgp)8B6!%WM(TXs|nXX@0*b5@2KFT6A~HO`0X3t?P8&I z(-oR$XU;nDw5Ve1*#k*tOyOssWot^i}?xue~;jlSI4eE#m` z!oT75yrHjG{5s@%x$V65v&Kl_whJ$eLJg|-o9=k}N;>a)-06&+8)6FG6AryilJdTg ze0Tj0`?n&}$=~iz%Rc`$hoO8k)3=Qhn>VpOiCu6e?VTxG&im7k?_Hl=cyL8skB^~B z(9>zB*RQN&7Sjm%a572yrb15Pxdev?AqKmoZIY)&ix?zXu9aY6ntpzRW4jQF`Th<&`HF%rToAx?Xwb zYuPy;Esn2$c5SiJB8D?ejCwW~CqI~$u{!*D$+sm&SB~!c(R%;RB!kA|@eNm-bpFpz z2>u`Fq_DK^&X$YEbtCGITw!x%^tf?s>&n{)YWsC-a}WE9&%gcq#`||{30LC(+_*k_ z+4()+o=6@JSSIKwFmv1P`A;3xZ>=O*Pb3BvB;>55( zBdltr&7uU?Y(D)pcN?|Uzbw`gbzh~^o1&EY_D^5dx%-8eW#47q)X_Ewxqd=Lfuo3} z&QR#VgynTl<#x{BoRB``m}71-@T846@L^yu!=S_ zD9-C>oIOqM0KZUNR5%;sF_92A4&ja5_SK~f$M_1JS7@`Z z+*+Zr0~n?cMJ_ z!BW#q?9%7_ey7HS?z~NV+FMpR1as6!-D{lbW$h>Fc;OMJ%4E;%>*_0S`Q6gxew2UG zmhbMu=AZxWPH2sb2$*3e6T%`QBqZ{f^-mS!|6fBil z14dVa?VtOU{_0E~C5`J4$KeY)jEAIZMa~O2FsuyW+880SJLYv_!de^{pza#s6hGOZzhe2)* z(-`0DX+JP!-8j2w1y5n`!}8O&K79S9cV-RKqLW5P9v7PLb$9gU5xy&;{PUi>!iP%c z<`w@BnJ_1=bmDkZI4dADQ4t|)>l{FZF?`j$=*TI;fa^b zf!+6i_TPNI#8_^osg9;kV&s&Aiu39=PYt_UcD1}pe*d@k3|3j^cYoD)mn%KNIeC?7 zL4%LqiGuFd!aa`Pvz5NDnzHL&)%5B21zPscINCl#WXIY3IYq_Q#~M0TH8B6U>}_3G z7;L`m$}vIjB@;YU7G!G8h@I`9*VVwaqFDVJfA?F)m5ccA8T2W*2YfJJm@&=a8C%nP zO^Kw6%gxNp3^PL>q=buA74DAFd?DDmEK_NsM?=Si(@(iL{Z>vg@aQ@fo4;zTU7im2zk}xAy-X-TR_>k9pcXinHF`-4va;^s&sw zb|sD`MxO%j<>xJ1?%rh=k>mRDlVMYPNyMp*E1X_jv6PG3D16=Lq=JzDqCI<he)PJ0-=4hVuJdOmz7G7P%AYVHwD^?&0+XKkmjAk+>&>!MQf*NP zlK7AoE%!g_%OU&dy4pwe%r6*S)GgjimOhNXE^o2Q$w28;apN3?85`JhS(ZmSXdNkh zRP<2w-^sg?d-k_pS#UU)Pi)ag{xsGT(>@;yZHse$uyN|{f~!jyj|6A>-#9#@pSQgK z@Sfb0$4^<8bNn}viDzSAOq&}p;T6|ui8m|F6_yy?d0^OVz50Db;?whqXZG%0TokM@ z)9a7{k3^f~iA6W8ScP2Ut*3f1G8i$>Y_eT%kQ%k)_wLG~(4!X;ohP15*|2&obNjUK zkL9y>Z3ya54y(O$HiqN(oel@Xu*jCgZ$FN`ay|K%|3!S!ciX%(9}OelJWlzuvCx>) zXRg&Z@B49O4#80cd4iSFyL@!2AKaTAwa(_L4#QpsD~2y2^FJSd{Y@&8zt@n7vC`3C z=LR*mN$%$?E(N5|>i@jGpxgdI8n;a6st=v6e`3@3{BDhQd=?^mC{S4|?9Bd(&kXNk zH*$yjy>Yjh>0~w6%|vQykHL|rax6S|q?r|)^hGnis(dSZ=EG7( z>HEx2o$c{rlTNh>Ac(7kr ztUK|=hJ`O)zI3dv-u-mr(cm9dllz|eMsM7EpTQwOVzasi=kc=}yjWS=^NM(UwRSwq zZkG$HyC?ho)-CC^PZ(M5dqncOw)M!Hy(x~bPyTkKsZz!@gARxY-Aaec>+TnV}c7lOUGI)-6NWAD%qj>$9jM8cKaDKj;qTq z6Ig#h{C)fJ@2o%n+va{z6zp}p+Yqm&u=Baoj#aLfYsIF$zrR*J;r=uqHA97^%y)mc z%;%Z9v){v{sYI*y-n}^UfBFw(1o+&}Jzu|Kg@dmz@2%UnF5bTTn%Q?*)(w5r2Jg7D z2_e2hrG;0oasFuM=J>t0knze95uaHGRc{{cYn$~)+Fx(eUWPa(28K}gT5jgm;?w*8 z9L&{z<}VrL$DrABB>439^!vO19b&ER{`YCa({GE#k9=C9+UCFiLwWx>saYGOtGQmt z7`(l4I=4aa#p!qfrX6|<7aL9HuyM>2msaCFKKX9^%n!=ZvJ&BvMKV8bzt;Ux7_6@r zetd$@bmggDii=$D)YWWqWV!poz<}d37aKEExVwPBn;$)_B3g#iIQJ$gIxaXpeYf%K zvi~lj!HKh$ZQtD{@%n*6!oDETaC11D4 ze|@`8{NFwifxFvY=QB8&#MS(t&p+R+NQp7!R%M-@jdP34{N3y3-dQ;4;6fRP&^Gd+MPa{{s&D?y)mB zEl@IeaclCOavv7n35Tv$E3zy+-dmxdkdx?ZBlrE+J<*#RyBix)d(@IXTA27c*Z+4& zR1TgWar(DRXlQ8I+y4&BUTi%4gF(s3IhlFUMTw|cv)4MRxEyWt3N%!|+dhA-kVQp` zWK!AMMo#;D?r7H&iW~e(MeZI}t4}+;?Ob?|Y_@r`wEW8rm-^>18+=~z|KI)h^G#E~ zOsQxQWcXONyz~0I{h#^o`rqFo(6pWL1=E7fE;|_-j!pDccNI}mT(j+7OoeRnUb_!v z?`ED@B_wjLfjfVCq1ySP@^Us<^1!$%IWw~IAfI*t__KcyFAlg99} zgzM#|EwdkgXZz;qrf&22%hJzI2NX_ti8D8CD2X*tE1y+<>QBS$RooLrt9b)8r-(1u z@X?iljg3v9yZWe)z|rLIPLH?5+0Q=f5GdlJJn_KZf94PO{C81eWKx`d_NPVX1Hbpz zn*~H#6HiQV%UIPVd%Ij=zWJRi2@zEnX3kx3B>2bC4zrjqU&6M$US_IuR8%5zQlh$! zf#rqy<{#(2G)+2ZX}>FcwWO(Bm)Kv8w;z<*8(#h2_v_N%H2DudORfkVT$6F~vbTB6 z$L4dl>kD?uzAtAscvLOxP_w|=?$s%AGauPNO&>>toQeIflTN(~-QlFm-S}4UPK;54 z(t2Hs?Vk2UZIK0vzK1{F$UlBU$L@epTqvWDKwjNe+3EeSoPu3>I$f9qb(2aTES=Cj zk9E?9MJN1xMP{A8uPe}UM?i(EmQA;inYHbG3(JB4euum(n#=-*Z8^uXzRdJd{Vu_h zvbcEOe2*iw=eNE-z;z_(WQtHj@UQMe=Nl6qPPnSOqR>ORMc~H9s`@IOfwHiubG`MA@GB%TITwkL)|5Z zb~GO3IAkEeQO#fUy7-)>&taEHSIM3|56{KO=*WCXD(Z{4GAsMS{p;^TIogiA?^?8A z&mtKChxG8}CRbX!Ce^Mi5i&KsdgA%#jLe%)FSEblOnk9TIlblLmEPOYLNjbt_!u`m z6X4isa_Dl%EE$vh9N#xHKUubav#mb9R$f%|$3zB(?&*Qw-iEJsumAn)>hHca0&^VB z?p2Gcd~(p*>fMivPt6`)f7_u}u}u7M-M1T$7JrjB_X%B-v-ccp$?>(*JM9(U#9lXI zV5`;xx1XY~b-h6#_E*wi(zrbp@)&x+)zROb<>bn?oZ7{5;GN#EXY)1NH4lbX5j zs#MQ}F0G0TXZd|`w>v$r22NRex#MWkw2#faySh*9s(Ti>H~xU~^na(~SQ588Ftps* zD=RkP2){^2gT{f-1b(mT?*c3x95a2`KDyjFb@_SGKBq-V#~;s8p1CE>q#)K^NyFPY0>&i0D-|O#O`L}B4+q1e4p0#^%)u|M^ zA8swbx8whwo9SV099>RHH;?5-{hln$cfEXFG=GA)&dDV|x&$h|v~cs!FZ)%=z5L3G zyqx(DgN}z6nCqX zbBgN^%iP^HDf9nK{v+O3!}zxFr9Nl8;RI%ZgHH1AOAiH9OyJsox8(Q7z4cBPc^daG zU$*~?*}M+rsa^}WFBfNKX5KgP(Yx22>nk&Ib4|CErG9w(TJAvi>U$f5dW25&NEx#1 zxA-h^Wm&SrHu=Nak50V!d7)tGx^;XMSQmcbNepe?bnRf}yv$h! zMUj6>yPE_bAAdAKkyFA+A-kyH-8q#_j57~ND9Q#NIqIJ;a(<3kseZ#Y#z)StRlhBq z)bRLyp8MIC`z@>9oM}F%(=EU&DOAA;9NbsOXL5U>jmMihff5~ zw@!YzB+GTip;KS^XZV$iy?-RW?bdN4iPN>^)+cX>?+lh!SmL8le#g+7`Go3spA#$# zKCmTmF|0Zy(63SPY_8p$t49R=mrm$V-y?RnNIYidm*mC>dxsB}^BVhkcs6`}=NIeH z(YYuk@#3#VN=gfunhcg)Z1>@7OXXnu%p#F|f+yv|-K)JJR;{a6X=%#{80jb5+DTq6 z_-w5G;i&feS6DXQ&;(u!t>9q zeIp_eAj0~U_iI8AC@${C-c{7G7fs=P^6k;Vjj8|6FgXT_thgw#&rGTRd0778XaDxN zig_s<+NmmOmJoZoc9*C9jN2~0`)l7NI;{91U|m|9p~%oZec{`4^TSQ%)*gL5xow)D z!?(eG=8+_R& zne-m(75>|6EAz;IS6!`a&6C(`j10?{n6EOLa@^$3-!OeW`RnbkN|;`j+%l>=c{Sx; zj{NzKMyBug)OTqvdaJ+ceY@!6UwS8$K4vv0zFT)lKc#Jc{WQg&o`(gVCKw77bVOV> znRvO_Lq*6#MM$iA{`I@(CmLJ&{W%)@<9YV$jj8U^eY4GFMW1Tg{C(uLqO1JnswkH9 zx;!%_>6szkjMG zB|V(*+tz@UUA4O4=j;||_vyEtqjeSvwwHgjWLbE~VY1tmt2*!2^*s-_+bSaepyE^i z5#|Ro<#_hK=~P$mUzNH{;L76SHFf`XwpaiA`CRou+Wx(tKWAJvVQ_d`xjn|R%Efu^ zGJ{8lf__Kpi74ni<8L~w8a}5x?8Lmr#rzCAW$P`U$lmS#y0c{VgkR@9r!a`5O|1LA z=G}px&btkE8TGjsak_@CS>-s1(`NU2IVT3j#@M+(w=#b6(|iAH;jcO^AH`EvP34by z6_)57kp1DwVOl4?gK7Q#-ESHm*Uo6`?CawzNId%UYUtH~8BO2z={)=UAuT8O?WW~A zoO^bqakqsn4UCU}Y;9ir{Wf>iJt3L3_373k(lV1aa@5t`zPzLUXxWvp>kSS!wq}bL z?Tir&i*GrfQ*wT?t)$YF{Ey5Hi!?4I71r#|lCJxbV;qvbOF%-|Q#PZWx5?R@<=Aw? zns-<9>&@-{zWBRf#YKM~jtMjD%-covvgy1!)u>Lzijr?+T3cV z#_+^U_xJ^Q`wxHSDD(fmcY=%8DdO*Mp5Ps=Ht$s3%rs8$s?Ny^2;#eDnpY7U>$>1n zn8(~TEsI$N4z2sL$x2}9BCdbiHp$v&NFDgnrgG}kX@Tye52k$LiYz`eV|IHvLnE8u zzZ16_4AwiS@zpvoh-mz3`p*AM(89~EJgZRR_x{)8>4Gr zKyYxcwAlXEn6U3Lp{@rfJ$;>6)L41>_-@6y>z*4{@8`_R*j81%`FGr>N?~q48Rjqr=6Q=x?Aa7!maWY-|FXOy;mgF5?6oU5!!MzF>=3w zu0nzJ?;W|bZ5}^gmz{V2Ju~;i)nX|u8C-{t&9muSc`6|(l;va!)2wBUhDEuy5gQ)Q zc9LH6;CAeq^GuQrNe&Ji;-4-4vjvL0^K6}ehMR|t$$E>F;l5__g`4^p7H6->k?31hB4wri!s+1c*|Xl- z>^`vF-t~opG&GOimKCj6~=d>q*~>qTl;Z&rM8W zyI;s7;SlqVLu3!r(tQkOJ1m;ypM80AU1ZO`mBRKnPP-`OZvFU4>(>f}w_Grm#;yEvR@)oCT>)MPPwoErwSQm7 z(fqvQN0wD(a2;M~tmfdo?Bd2;SwHE`lI%RM4?lc-y5Q!F+aE5k?EZN7{MCf{$2h)e zzCIAKQD*WNcf&fveM{J#;XtcHZb)OGeb%p8SF^<>&*pEh zoACCCT>wMIk858${N@zjYH5B}t1OzxG9hB`&StaNk{_AdZr|rUz!03UC4art*SYp< z?&gP>a&j0soY?&{SUPa7+1w-lmq-(jQ`%d}~o~Rh;4) zYO`sdc(}iegVszZqnT6Miul%ba0@?cX>62M3s{&`V4%Q}%Oa%nWue1Eq1&Ii>{)*Q z-haAj-lHQ5KXK!fkTY1D? zj;pP1##`;i!gR&}2Oot?|7_G$uRYw5?02;8u+JOqc?V{t=O4D-8+v1Ex8gFvd-ra( zCa3omZ}u>nAm+VLj8F07CZ|=al!Q7XSmS49h1O`5&23nuF#D`iLAFz2@6B%Y>fjkc zqKpTnT+>fo>3>@~OW?+SMYVa?kI7&BcVzzm2L26MADWpNl)mi!lCkFHoz-!&vC~Bu zGS2qNRs9xUE|>XjTW+I3Y}r0}0VZDY|Bt`3`^lTfGT!91J^Ajo{FR3%cNVR7-EMrY zo2mDA%%Qug-{#z0c<3^V$DeiF2HQ4f^aO|ne^@`)>fEZ=$7ZbBar=UD#Kv$PIUeH; z7y9fIU2S$VGVMG+Z~Z^}h;P~}Ueq3CaXH9kAAc*K-yxy=CgXwsQVbuSFQ1ltGdemz z(D1|MW$cAPXOmaR8cMpTDJVI-&2i{t{OPwK$>_pXwlxn0wC^PgcI5UqEt|(5qad z|0R`Doi0olXPB-#YvPmrYQs9^`RAKwU;7Z~uKqxT-_(uAW|v|2MQ5!ES7vN|T>S1O z|B2V~6P_>dRL;75{@WF;pXOrwGPob#D{s8O?qy)|=fS<(Y3J_!ztWMl^=ftI$GxdtStGS;pdbs!9w-mLS ziwo!86AOuv30ZT0{vC6Di^KXkLHUf2bYxVErqx3k1whb26Zw!UuYD}UoN@ofw@ zqp0nVqVKXd@?E6VWev`KeI$__FoP*H(2=WAuz8V|*~&8$Prp3z((*}>)t5P`PvUMQ z&Anm}IN`kvg8>io?dnZGlK*G?$#7#W(Yr9;JaN{YT-9eW%sqmql(g2>=ZeeO6kZZ> zs6Q@vV()yjUyU4mQ%X!#(`1ZupX}T0*Q>#z*b=dMaeq|Z|FiMTCvFt(XJkn8mkui4 zU-G!+Sj&T$2?}Z9KRo01%$=UTPkTzu61kQm(>VT{zK?x*>AuT@JNrJ!PEcSx$hpet zLP!(ig0+j;hDxF=weogFI z@z1BLHm@Ys-R-=>`sWkRroO$!ynp+0jjkmEE*G~f_#>e{`QnTa!%d~^*S@M48ZC89 z4iis2Xv@o`-eka9#VZ^?H?Cd0zUI5B?*3nYIJX_ot9j$hurU2X#k=?Oq^grfw z${h8#+t}~y`2?*+uv`jev*BdHC}PS z()-_w+17o#8~*gU@9vMKml7LJNjwr1_1|~5IsVO5=Tfb{9k#QqSM*5RaDAFmSAFZ_ z@(p>*D>4K`*jigzkEZ=N8QD_cW+Sj(_-FBtM7@7`2MRVsvEDT(JhEkDz%_g3wW+om z{NL?2seQO+ykOVfh6vM+=mV}Y|NdWa*m~LVs<30~VuzE84Pl%cEEGf(<~uLTQBvwM z-F(r+C#5)&=L`RW?aReuV`Haj&%c}~(RRgc?wbpR8<^G{bUgoeHiz;Sp1d0}2Njhk zHz-JK+cfp?$`Y0BKC!6|n+k8NczXJ}j_K_C_ZU0An~GH259ayU$sYXn=Jh%EO!B^1 zvP{EDkvv#adbpV_a4Rpv~)=jO2DvDLmq-qTNf`n5pY zGsRo?ZHyhK|2gG5Y66Fr|9lWPoB;L$f$+r4EzwgwA6|0T!8ZkV5}UuXHqRNdNj&XQ%# z#V0pyju$E?Eqb|ydwu(ZS!;QJ{AgpCx&5DNTkYfjb@7s$)!uAPV=1-!-#`CmU-JCN zhd6ATAMTI)b70D{sI(%-CJr`^WgpbORJ>bX&|cxBb#-c5jfc-Z7a^-y$AqmsiyMBw zZ0NqK>*0{f)7jB9J-VbOIf760rO2g|B3o8GlL`xnQC8sM6_hB^*`EGDXUqQj3om5C zZE~9O4=PM@U|Z5~b=sG|dErVkjWvQoR4xl~RD`qY9_3_x*sw>~sP(7R;wVW5QJ=() zH`O{*JU27wCjKqAQ{NmKbcdnDcFsN}rY#%`zB_NpVThWoSeDz6agXCmiL+txi@Bd{ zHFo8h*QDP2`9R{x((GjYjj+GUH+>P%+~n0UPF)Zg-_Jo7duYqv0k%fDNZU-_!%Pl`vE zQ+?H$6o=Gx;>E8eggPy@taz6FB+}tiqf_#qgwXhncg-RqHr;lUXY6ZmvYEJGwSKj< zV={m8>+YRz@0~etfJM0CdB23C;?Z}DeAX?DUVK6I;UtdlLJ^C&7Nv_{*eH76=H)RA$vjg7Sw(AiZzxr0ZQH>#)lhzo4#y& zDqG#Z>T1i~tLprpco%<}`i9HWww3AGe9t$Qjkh!HUw3kqyD@lXTFB3cSie+@$FMii zoBz1y)4Mawbvi?=SVIGAuVx-J4$l!Q)9rT z{#9)DL-C6KxVgJG2OAqa`?IC4ocDI!yvu&x|6ZQEX}tEfOzQlTZ|5(&8gN_0;c2eD zbI!}dVv^1&mDW9uFDy0E|1qq{D*642H`oFgH>L7(n_RqlyZ`=|o`XMshbiQ5ZkXRfwl#s0PYKYmm&@IJr)ar45jQy<*32ASW<+8#&6j-d)43X*>pQnW5U9w4+|s&A`%@F zqu&L@HE}sJZR(xgap&$W^Zfpa?~}In++5cy(3bDP)lwiI?9-hW!T>!NKp<;D!F;YN z<$KT58TuQ(L^On)Yn)rAx1xq4;XIeBDjlaD170%a`-vz3Nwg?QT%u^4y=Ww_c)LfQ_Z~ zUTZ=9q`RflB$$Imw3n~d2s53v$T2iDV-{QJ=DIAwv#SynxD$LXx6Hdd@od_}lW7wq zPbf@2nXsUqftmT*{}{dY9JB74xc0;+iL=-&%-`OWwG#iZ1d4mo!wX2SmrOz5|oLbe$;+@%A1vk&g7Q8 z>eG2L?VP4Q%dTR!eKy$@Ti(nz|Igs?=kJF5-*ve!eE7RtZ{_;64BJ)ul8$#xmp8Q9 zzHaKoQ!+1{_bmH3=hTkWE4yxAy`J~zp~1IC&I^6qrEf4j$u`$kd_-cZ_bmuF5E&JB;{(ZkC`N8|| z2Tv3}F_wAOu~HyZ`G9=A)FXHMmWVwP0h1OS_G>A+80um9vtBbdVQe(9?gKYLTPd)uXAo!*PoaB^Lr_C z2VZo-$wRj`S+F$t&As^Swcd};i~CX+zx^j2^;cusoXR_m$^BMOn_AMQXLB78d6N8F zck29*z3z45m&`vn%Uxr%em7mpGU}{;>Y;POoR&KlY4S|vNx-xt#_TfZ;be*eg|{dc=X zuix(|kNO=@_{K9M_McdoZd8}9{{F@nJ3LPWi_E;oV>P)nqU^l#jaxHae{1J2cz;n{ z!NYY^CQrsMAC<*|1$qZ$YO^fpVB6; z`)|)ooxW(B$|1FewpT`_k#!kn+y9&lXZSep#DVW`7)|EXNlMjMe6Rd!D%#iJ{-z@P z>Z&uhp2u$zt*>M_u|4NWZ@k6(`CC0-pOtEuJ4-m|Bx9m|8KvEv=^iId~|N!9tGYfS}A5tHT!m zeYJYypKZH0W+WSjrCTgYpVyu9pJ74Pjep1O6OJeMJN3FuSht>irPh~qe!E%2MWom7 z6+5H1*|#st>Fd2zKs^Zvc&VJJPNFKgWCF0yBrakp@rpwdK+kkG=Z z@w-!P4_Pp{cPMu?Fm^T>zh`nku;H*%bAoW6fxw5--xJ**EHJotSC@mMevRFXqzkgM zjAs0BukyWjzyDkI`h&Yp3U7S);{2kwyIxOt`?B$v#J62PlDJQl%D%4q6sWq=Pzsn-l+3@_cMA@sA4}zY{ACs7|D(U##@<&@Oi#NPH{h#&k z&7&Iqu7URh`ZG+p4j$e8h^fUPuz;gXjH@qsdj91t9Dee%jymUWJ0x-~B{MWJ$nVbW zR15JJCyQ&+=1)BNX?@H-h9i&OADvw9&#++1)u6+b=5wQBd0#O%6pDJPiLYs=;VmcR=#=*^_$QlPZ|YB^J+i6!`b} zhQ_NULK1?X<{0SCa&Th^#dDrS-`h5Cdi=H)*U-=v^GsJi=$RP$xOZCmyn~;F{g1Rg z?q~N_35*Qw{PnBqh?1fC5veoWH}+ZyRKKwl5Nwe;`v1z7$NAa69X9M?NIw)15-f04 zq`{CQBJRKyu27zthQDiWb6>C%Vlb$Va^14<<)bZWPahbyIh?u?$8L9g9#T^C^$47h znfERJ%&azF^Lrfk?(-)~WZ3*n;fU4Gs?ZT~eBG_TXz5zsyLay@xUE>X(k(Vuc1uTE z`3xCA3T_o%M~nw4s*P(kCqJ)ZMt zS{7EMJW?#yS^If^`sx3637VeaFMeOU)>>>!m#wZ%tH|`#Anq?oT*udcEPwp$}mNeHpQ` z6?*J@moNVylObgmQ>hwZ!ZporaoN8=j*PcI=CT<@ZZX-uVDn)q&A8~`?pw2>rt|PE z`_NU%IM3nIebbB$Qx;V3U-an4Egrc$a~K&iw49w%E3$4ggs>e6VQZbZmRn#(=<=>r zllTAjz0Dk87sDVRvo-$j)mF``B2F9yiY~8bpPtXU;cnS~*@;b2=5G&h2hS?qSePfd z$|3RA`L~y}d4E3Xt7zY|DgNeMk$rv#3)D9?{pN0uIl0~VL9?J)nWV+SiOsG{KHgQF zTIjekFQU$msXu}i<{JS55d@ZHYe4;9PbOY^YYDUM}f=~~V%cq{(G z_o{D&JAVFuv$t}NOzBMfe|2{ASJ^$AcT#1tw1<;Ydq<3$r3ed4h)95VqU+yPE7t73 zx9Ck>XxQ~++iU9=t?u5Tq_a-DL+L@QjMt8QjtLI$eAH(CezSU&-TC+ZR=UjJQb|Ni*FMVrq#ozGmJ_?*A4;ot4NW`oC@qsnAb#Pr*? zW{Z0qi~qdzVd9&AFZ~%6FO>FGI^OwEz`}1ZykQ0@XMJ~^7wf|Rt$UR2`|`L%+PRg=aU88OWj{c>I?hctvp;B_e7sLVewjKZu_#g)wiRI6OQL* z-|$lQtzuhu{beFg!{JYN*SJ<>91^jTSn(&rzcHDk?{%tR6UW+RN3MM|Iv2sXX zXUm;Bec#)d)#vVa`_~V+>MR%%{QZ^gZ-4Xnt|h1Ix>qZ?OfCvW9g%dYbui9aGzgqem!mHwBi#fMw-(ykL0)ZrZHUPS@`fp zevk5nsZER59=70f+Iu}Ze{KcG#(u+3M}FA`DJ?m~yeO7Y=|JIyjcL4Mu@#E*{ytF; zyb$nrN%Xqy;%h{>n3)BFu9b?+UcZZLL+%;-=W`UM_Mg=fIM1izxIu?o`LObh&DH(d zueW9h?%KUOIWFDEaD`mEf|N&#!j@;7B=jN-R1$OJ#kPz5DkyrnlXw4(5QX@KvrdHC z#Z3~o_|c(!|FP_$Il}A@eE5o&m0wJ?eA$+8^ub2o^Y>m}tYiML{_m0PdyD>cU0p5n z{?YcCt2W)f)nlKzdgrRYRV*$I2O31&Juf{}XVLRb`@U&+6 zgQ+5c=}jMQtzQ))w(!V-o3^TJUK!mDy~kPmWs8KvBUgeG{6EB9?dp%-& zrT?-gE@$J6hG#5`wmeg~biA=bL{I+FjHbe+4FXI%WB7uTlV4Q)wX`V8;VIh~A^YOe z!;-h>ycBQWS^zM|k|1G)3wtB;lChi3?>^HBjHvF$0-@36z@`1l$5DWK( z17WpuZq@gDY4-H@CtqI|s~|8Ur++Rh$Oe9M%+ z_i5APc{`r&xBq`&gSMAeD}%AZ%#FV~uI7I}*Rk=wY(vJ|D*fr{|I$C*lb)Yp`=({< z<=ON1-ph8LvQTsC7QKj~E=|@Mt!9VMCMvs@DzD%F`*7~pzzT1EleG8-#()n~O@A4@ z&e|DMs?w&oA@j^Z*3%rix@+HEVw?C*+2fYdH)?Vnxhs@Xmhrc@>~(8snFtJHv8zAFFpl6rnYaVW(fHR>99-@2ym(@XA~3alDx@U ztMUE@<20iu2CppnCZ0_AynTP~yX$+{e*XM?a2xNnXTP)EHZA^ZTPvAul4WdQY1#R& z?z*5(0Z@0DAU_#pQ)_YIquEU#|p$M1dAbW-}?OX>alzOUrvI&(<+ z&MJ!@;jk}~HmhD z!+Wm1i@W^sT=UVYFMRIVf9L$&2oX(FW9e1XO`AsO04BZ=YY*HBW z%^Wj_lG2rLE}Y00_EY2(@Hxdb$*Z|4wmIPL+CuKEA72e0Buo;%z+UCl5F4|^|Aj+~ zhf}E+iMu625(1xTBi?hQZ$Xr$2o5D3_UM ztmssk#PrvGpV;YpU-hP#=Q4S&+*{tKlgDd)IN(~Sdg=T*a~%GktK04tw@G4c?pj8@ zt1DO~#1pKF+1S!_Bv^Fb8yFmTdu;ak>d%?RkA<(l)mYJR@1eot3x1FKuJ3<;D9w`5 z*OFnv-@-Y+l6c5#j&>SQ(^8e4c;JvbaP3^fa9u@^pw=uiU zf01rQ>I%t(2|HSxRe6EQ1 zbD3F!|9QTCSKcptT&w4uaL+W}%()Iq$p%{vStrh!E_nX^`d}^&M*|+_sa~oxD)|>a z4QleNxH!LQecl)Gb&1A@WA?BZH#axT;>Yxu5Gze79r$gv7jpGqzs!y~TW)GEPBZ6IA{P&gMPRQFqMm$HH@KY^A&# zuJe4!5S);tH1nR7j~;7`q~YmRKaOs*{`Gdh*zv}lDV8!trIIy^Q#lM&WOlUWm6SI6 zFduzuePG_?6;{0W6GP^<{Wt#a_fstA&$a)DFO~0?J|)k(tUxTl`Od|aPXqg0co&49 zE$QI6eEIT?tM8jyyT$a2)cH$Im$3a-Z80hMc!+7bU-2%RVb0O_|9|NQF*JYw^NIbQJkO%~ zw5Ne*mP$Gs3jSVezn(8d%3^uIT{~ePhAh6uh~NVsPcyEq;Rs`G*~H2h(iF16?N0BS z>}c%-f7Rt_d(7X-y{&wGPBHC^`ASi7-`|sE9JlCr98piY)q2*VvBF2W?SQcJ{ocdO zUxZXEY-crkYd)~p_Pw5MNlQj%V@_`C)@pvW_j^uXefT}NOflAd!PWmhLN{5t87FDH zk!xXodC&8J;`i0BO;R41$Osj*RF}_XJQ&7xd;MO%b8ELJzPXic`1!bXB0rDAmMu;x z#R}&m+dCWs_qJPA%Qk#y3RPrTwtRW>x`T&Wxi4P26r?ODR_>$7ap}x~brB5$7K_ZA z)wNJ zXH-69ojxr`Lg8|WDdX1r>9UqCGR;3+78kXvKl=3fyoy_r^Q#`1 zrq{n;s;*;J6Zv}&!!NOtxyDR?7N_5yTKkIOSl-@OoD36exzC;S`cM)XSovC+zv@N( z1BMehv3IT3o3CD^vETlw`klG8U3W@iHA1FV|E=5qp@gxe{at6)bcdB%^}An1N-UA^ zy1wdqM4Yl~>-BXkOEQn>eeX!`D16e?v*7){;0GI$KU}Sybi{tK&)yv&2CKB9g;h1~ z^sl!%`D~5@ucN#3+rz7FUfnOay?DX1bRU7Wl|Hs#G|KM&;O_bJDr}0ny27T&3G;7m zDQAd!byjitn?&j; z`NZ?jFIw*xZ=K1MmX_w!7yo%f#MPw74>_g1qg2=|`!90MXMb=wI_}OF>EAz&<`tL^eJ9(V!wn}{@%)eZjp{LdnMbsUDCffeso!|q-eoC2mY6~g)PxZ zg@5Xp7JfL?UGZY;^9Kt*>mPX+e~0OGp+eMchQmAp)!#0a*@uQZ?Rr`DBK=*mSwl=Y zKi6)y1vcytelRSUP|&pd!YQ`3%?oN%*B_a2V~?b+_w=gs7fq5HFfAeL&v$8c877IKU8x5g=L*ez|Kn5k-Us(C?3-Q8aLMJi_Wha(+ArN>X3E^{ z%d&jmTHWrt?`>(Me{po{5nj`%b)Wv9Kd5hfV(GhIN{SbH=6$`NoSQS_VTSUtH+m7@ zzp%#iXA3`E5yqOjWA|;xyy${$5)JPpl3eYSa`vrI?qq)YDv|lusZ}>E8a1lqb(tq| z*tkSJ@yY0X*|6mQ=1YBZD;~TtPfl~Uck%WXT`L|{t?%&W@Y;PV4B6rxPn?NwIN5l& z!Q}2bhL`8RHrjKFT8O?(WSCdHAZzu6)*}xl`!D{zVsYZlvKt>Wj+cleKWk)9wq!h6 z`*+DX@3$=r1elfvaVje-C#02>mMTs@$#O&7VT0$Q)j=$c7p`l4yyL+d|KpIjpY*@& z#pwGm65aS%wgAMhm84S-s|P_ztuax z{i|-}-2LZ*6^)*C})^KW6B{cyLycqf3WMDO<%W!M;~p`(JUEw`}?Q>fQ5h_N_BKgU|PNRUP4&)0B8# z`6k~&;$NTSaJexF+QRnxmx$>{xyb@Tm^^e6aWhEn?kkDT%Pt|GW`)-O?YB|O9 zS3>ITb@9I+b~3X#a2-0QDZT#f<$$|4Pt_i^WDDfxcvbsrR>w?}7n22gUkmn6n&U91 zz&+%odS;%&G!>C>t^yvzW52K0T@j3^xHdEKuyE*M?w+8Gm)5Pk=lA~(oU1q?c8`Q{ zbMvjjRZE?=%C4~F)4d&Fc(YCD(p|66l?=ikwMv23=MOJ&T9BAxE! zIDC-_*AngN@850US#51}Q|6vozR>nuO-7!Q@@n~2UVCqd_csa$=3UWwl+UgG{Oz*aAr!)8<4 ziN_V0b=$U!pW0?a|^M+2&4f+4=#Imz5qBgVf1*9r-HGbQ=-r@Pn zLS#hG8s+x2?a{ky-P zw7oqv`Fa_H&Z`M8EZ$#UzU(3Mk|Ks~z5krQ^!`3movFGyUUts`pM7T+|6_Zxf7Z-| z^rRoY(~^8dMSrR5zL~MXAZ|n8rce%rMBgt)8mtSZGljm&7r4oM<@RK@?r;B3x{BBC z@b+ljX!PONPqUm%wpsNHmrmtKVDe%oz^lzQj0{-8oonTmKY8 zo7}`@LNiZ)JLs638(xxdqJAD1FJo(`(BR1>>V- zjE|rFOkh9zfBMVU#Hxe?q1@Ll)u<;u*nHMZOH?|*;dG$>(NFy~9Pa<$ ziA~5nBAv^lxgwI8eaE|78(tVLnPRc!s9SyG#p%-{!p}U`eLknsW=it;JEd=xt(WC+ z=u4mD2-xj;eAzaxzc zw0MEh&t+==FI~BBS0KDy&_dAqfq}b2{L@(H7oIcK+_s;0>zy#=+WzZu-DMW9bhWT0&HXT23)q_M`yP{Dz9 zekRiFFM-^gq?uv+`zMfRRQ-n}Jp4fa}Z^7+0MHfWhWU|QaCa?_zx zd8h&~5_c^ov{kV0HZDHy^CXq7!YfC=Wo!0M>J+bR% z8&|5d(6dFZ7Qfo$73(h;-8dTb;??3Cx!PMdGk#U7SX`Fy_|3ue>6|5ntY*yaXN(PR zZG5xh>}+#;>pcmYCpZ3+-tMm*UMAmj)b_2w+wQ&_>JkoRPcP0-dKxm**hyjcA64CX zAGQ0H9Uj;3cqcWfZQs1b4+GY&zYx7m^jMls&b{Dc*A^PNEzgbc3jKboTDsmTmSNqx zUtv|VCvr#zCw=c}zWlsf;VZx8g1rYAq$ZZW;;MByVpAh{VS=8*gsM5)+g=E7XAcN} z-pBV|WeU^B-|r6nU%5NPSZkSMgI4&3eQBcS{@m?7ab`BZDv!k>j(uU5iaZJ$|wJ}gAQE>Wtz@4JhN$OSS%9u=P!GcuG7NU?u!T27P&mw7WX9Y z3SZA`t~GDv7`jyAF2)`DWyt+Gn)Ta^y=)El{>`;sZeIU%((7$Kw;AIu&lAnC{;9h< zN$R?o%m9LAXy`$x7gYy4N%I-A~*U2q?T`yRWGW+EYK@KN|ZHFah zZrhN$p=GVJYL8E3fy{iaHJmLObC?zxJiQ^%qH4+da_!M;Pj`M3WA<1z`SOJ7tWAtZ zdag0~S~l*w*e=xfGM%k%OTQ+g5Tj$B8TW-v0`J|||N1sPKrhs3;%!fdZ@JS>=+5Zx zd?>i#nL*6+g^PcME?=0=yzg?yX|pw(S}T|DF;aVUY`ed6pMKqc_cw)$+SYDozWk8k zU9$Ri@r{L79OJ_t{cLL7zVF|e$2Q5g_Z6rA-|`{u+8&t;o4(DNUS%HMOPG-3(o#N#lSB2 za3If%-K;ei`QN{v)z+fQ!gq3KREx>#WA(K>3cY{I7hP~SUcA@CpJ&z5d2Vt3F`5F- z8LQYi*k(GM(s3wv`c-^8T(;-v@;MSqo^1X6C-iWeNx-~0Y(_Vwb`_XTHCMXJc0JHQ zGOkTve(n~XSguJ*sZZ9GE?T&;xur~@IQitas^<~)zHikQhG;1%b4KejzpwdyU*@so zj*Z3NPw*yhlNPAn%(Owv-Q*RENeM%2`ku!fuaZ3bxu>19d%U;Sy*jJ?P0R)NiRCA5 zh?_SFu$)eNGjqd+#BjlAwr+{p+nkw{?c6f0``C>NgXRC^$T~|cJa4jiZ)Z$hKvLMG zFIGu&9bz;E9zT$J$=))TYf@v$JXn`9J$GwBhZQ{yP_x%7xz^aBG{(#@@lSQOr|DU4299DYw;{ zmC1EKx$Gt7e%8zHsQTN%eIT0W%#5f0?ppo^XcA<@*Bs9tBz(w^ldnINZ0Hvtrg^!z&LPR6S?>-=rL<7cJ$GzJozl zvS7umXX)ZP2X4Hx4QPAmR+`9Cy8n^^!#Y8xiBZ-8Et`1V4Wszu`li?alxHrSaN|U; z2xCiHGxGvHK7s!~cOTNKziisn{w?A~uHcr;l&Y!oA6YxkmbXbd!Pd{BfX`?tH{zm)D#)VlS-wT+`qYauY8PuOx zl*k+`mXiB*{?d`a`G2bCRGi)4$P;;ZLXX?s3Bn&F*YGYmw1V;N97`K#xp+I5LdNgE zebl%kRM)&S+vr>>_e#=&QQ+_G^8eQuZzL|*yjYfD+QL2ukK}a)YP+?BtOD+Bsxx}F z@)h%P`Rx_4o?+U|X=kpUeZS6Us%(zrN`>fYFCttY{;afpwDgOQVv3F9lg0N~1e zKNVnEub;LrzMMz#r0x-JAGP~Tw?No^@Y3X)x1*0EmjDVvaXNMBEQ z#mc`kgL*%k6>)7o%al~fSZK_&;;G~j%f$Z`WgA&`#~hQl|EB-rull}@qN99^b|g7v zm-D-|yKUubkbWx~>S$*lUC<)<<$JAF!O?9OYo8=qyxzaRUs-QA%NvW8!G+JJSU5~} zh%aVX5a+k!{`wP<2AmZOt}yO6?Z_Br^QW0Vet+&79wn!HDqCc#e|_4U#k^_Lyhav} zUlmHs2Mm;~85kbi*{UC%BFr2#`@cPdxl%%;^@VwccYglYI3>HBea4rHxfk!dImv(J zG1=IcZ*XC9%Qf>P)?;sFJgy#Jf0+A2^*PhuERzl#@F;sA@1N##r|xF@#;*s}6*gI} z_Y+UZJixZ|&L5v+m;VYgeh^>Ez5Cev#=0l3n9_Dte|WXNUTk^I+&n+J>u7@rlggIbx4Q~rd}s7W z?dtehVNv(RJW<(yZ_k2-!W}EGzuw9&&Dd|Nmbj#8+2#h5x$RQU{fkc?lbAh)?cLvJ z{f2u=r%yj6J~qEUi+Fr}Dua@Y4*j}3rG9CPGOJc9_v-Vu%=vr2O0B6nymABg z(~$L+c`w~BJ(^Ip|8~xSE~ds_M#t~wVQJbDdKwWtd)~}=9Cj#{=hd+{y#01|QEE?A zC)yfTaUAfwlWI7=Wwa0BcM9qYFThi>pc|(tyxXmBzw%1<+vFX zRVrp)Io@x-kB#jYgLu-h{^UhZ=Y7?G)ER%D)p$Cmq|?=nMw?DgONu`F<;8xx&W6?N zZocmq?~bTErCo67ek{voQ~qtayfWXms$cqcCp)_Ft4#Hay>C?oW{3%-?3nYvRafY{ z$Sxxe%`}T`_gk0)yQj;Z$T&H#i=83U?(i*bp`F)M3)z_%R?a!xqTcvs1@lxU0h#uT zlS|W?{v4n2bqcq@qN?kcZ|<1?({Eu_Ps0xW-YfCeFD4f~TAkND;qcb_Ico7ykNk3e zPn_VB`}D`-3 zTF%?~eY(EiRM9C+yP`I8Ke*J``^=a@De&gLhx6WSGM(V0U~SsQQ{+&Fwsgkz8%B*J(b9p5Ai1rb(%e9^ZvZW-u>Xx$mdp?aQ4D z+2!2TZZJQHjqhvjW8G`BapvRI=@1iHndX>cZ z^#{Wn-(7mAG<_nou1+&Hmi!8wNs84tLwzIz|{?edHb zGy1Em)~zjNY~f&0;SZ5jU`af(C~860`(51!uWvBExUspwY(iW91ece++D8_7Tcl5B zJyOQ9W9D1)!dFM7j5jpC(5UqCwVrpI$IM8|_j-f!nT7|CD;O3eFi$yI(J=qFvGV<{ z@cJJ@d;YeECq10FI^i`#eD4ac8nFlWPZ=Lwwz#y!Wyd@Rk0`f zmD>^(vu-a#UG*hLK3uySa7#_WajQhb;ceDTc_}gN0UI}dd;9#s3~oPWZPwi>rjCm` z>-(K&vv2q_!}(!ESrg-RcBa>U<-U|FrVH~&iIx&M`(=L+ndZ$3~p zXJM>9_y2-nz^YsG);X_{&yT%wyFm10-S)cccb4gR-JN#xch6$2^sucpxi%Xcg;y;9 z5gg3*g6;fARi`-<)t0~eb-LHTeX(qNn?h8Jg77ID4g({$vOPPPXV#c~SkzZ%@zm~o zTl1u%1k0Yoag`!|wf}z_Y?9P?dSsP&;F&#jQ#OcPdNQ5q{J)=tI#z!cH0V#VI6HmO z;m!JaTYos;33uuf$;r3$d%mgJU*ZDW=Ue`}9(>R}t($rJa8B+)*ZAKW=YIXTf9OP- zRGN6_55F@G*M6)EwE2Ia%7?G-{H*|IE=Q|^TL~r>y&)BQjSjFaTpGl{@a5at^Dk8o ze0f}+r)R;mhT-DP+r1yI61@50>Zt zCe9Gz6YP7tZtnH#%b%1qp5IX&^|4>&fIj=1;KW~LsWZ3)u`DE?y z7ZxL`YqYsKoN3FRH&?aqI#z%8oyk2-x51iS!0y7Hqtkz_H9VeVa>4En|H{eMYC0Vc z3=%76H~Oee-ceO;mf-Vf+P#jCzokn%zPy$E%3d|etI^H0T7>&T_SYBh-}_2V=zAh^ znXji%Z}D!o1Iu3Wet+Sguwn6rjGsy|1wUOg-es~eQrv9jPOvZ;# zNbGnxzrJbZOQnPv60$P9-JAc3-jQM3wS!6RK%!IT=gG zm^QLA{8&9t-TlJMkZ`V#-^(#hV5*+zW+I| z#j~E|#Hm|zi>*#-EZpPaIxn&O*2h<;*B?7`L`31v>H4G;DHV=2d`rGA_x->3CnwXf zlfCbfFSD*V^r1?A&Uqc{BG+uUAIeP!;y9WP%$vEO;fqs4&ihkLFZiZ&n!jHY*TNxI zD%UZ4iqKoNWXElVyw`QuCS05NLQ<*NcjDYt#uKLOy6$^Z_*$=NFq=tp+4Ykfgs&F2 z3e1?L)26z|<4{iK(e{6DMC%z1+z4ila%Q_xxr9 zXJ_Me*Lh6$?>@J$By_@|%BlzKD*w2@yXfa9-dHfpT>S2-DE&z<+k*M$`irskRvT>C zw5x4en_P@}>iWa?^F!FKSg84V>`jj9F05&obzO<$ak6p3%T2+O2Ocf`{PEoR7zt*Z zYtMyMB-i|tnkkuf?7-dqJNUop8GL3mA z$hcrzvcLV6$=p^8N+)vP@%)k&bNxkgjn$9qKAr*o&$M$r1^*egdNpoYyL8u~MIAb8 zd{%}C=jtD|YP3>4pko}vp=e+iR$$IJ(dGW9){6Jf|8090HYY98}LPv~8afIcSShYP|!H1*f~Pm*V0F|gQ{d^%v3 zTTE=XsxotWQI6OBt4wKIz3=B_IH41_^#bo-_8-QIP0FhG>N%Qwe0mwrs@=U* zuYOW+iRHTe2O{TdA_^!^9ShS008k+KT(4 z;)k}`*dCv?)?KT%TQNyyTI%C)`+eO1KQ5IvGz?@~B6-tNPrz>M?K>Im9P`jauygqc+9Jl8mbjD zE8+5yA0Mv7&tz86G0;8pLr!73{N=Zm*SFne#>_Aye6ssHeyi$jYqwY& zaXIwKf5)O%b=xgNSW1%Txt~7UUGU_7{7p9*vk6O9K4-dF7w*97Hp#+P{BoI3>z(5+ zuPjOzq|Kx+f%)p7kgo<87s4%FV>4qg%>PJI=i7#~~v;V|USxrz7r2@6HWLdZTXpLB#E4=Hj$qmVZ@D^LvljPY#KGy>Rzcqitr~30>FuJ)+r`+zb)c zWlT%HP}nA3s!{lhVOL_vDKRab57)focyAYF9XS0e`*B5rq0!P433m!_KmPGqetzSG zc?>+KU(E|xx9m*bDd|W-FCGqN;pEo6hb^A%xMCWSs2x?fMa3tIr|H%b_g_6vRCyMJ z=;ZPr-sx+_pcKdz%i`h^KXs)gU}`V$tu#yS13QgRX4y zJocWu2NnE!=llCkEx5Mx z_(2oiaLI~k3Hd7{j@g#mbyvTuVQZTraMPzExnMz(w3tOf$tk^X`{Of{Qup`#d$)cz zi-BXLh8mAZ!^73~pQHc2Nw>BN7n5z9u!y0&=Kj1`PJwd8P%ZarKhuC)!AqHrDqbn( z>0xr%kZ5skhjW{}uwiN0%yl0ovjyg->@hWY$abREHmkryxWm`+waRcDu&k@2eRlgPmq9vo@5d;hVR}AvTC#`ILs7 zwEj7%@)^ZPx+Ph~4EFXEC48T^>FWP8i$7E_Ffgn(3M{Kwc+oQ7{La5+#?tH#Q?h3! zrY(DwR54-ZT=wm}83$734LgqURb;8$IlXs@#>F4bZTgSa^Tt2(j=y(vMeOwq+manT z9sLhHQyq3(_xt#ph3~@Iqz5OyebImT;qde&w`>>8pK#zqeznl+YkNCS?^h*P{81(cRwts ziR--0hU|O;hE-qo|8PjV*i~+9eRbC<1M97uPNgzDi7t0sJ-4&s+-1$B5*-tj`6q_& zIJj-mjH7cI1+FOwdo)i9|H`}~ifzTO~;R#T;>O-9&AgTz@W)@WADtP+G2-dEx*jEKeZ#MQci{Os6tS2 z96O6&EaPF(F4rTSp4ZuOPchV-EL4B$I_Zkw4Bxpkw?r&C=J0xosOQ{<9Yu>Iy*}KV zzvILGkqXBwoKq@TpYJe zgirg=);nU-W?HFE8#9t0eS7~;%;Dnd&z8Gi{dgSh!+ex$@s~4unM*%Taa*4Ld%FGo;^1u06izp8!i#a!>C3nzQ>i2Qx15J}zo060EE0%ORm}ntvy*)X0uH7M24BJdB40if1z$ zI9qZ_r!y>^^NNRIxyXq%*~>+~^!^o&EtGJb{m`OEJN_0|v}r&0pZ|Z4oiSK)pme)U zvwqxGzQd12H547&9_Dd;yVlsc?f;}T_geRBp1A$zwPnkz^EK&$|Mop%$gjTaU3g1V zJDv5PYFCqrMVCf+QvNzYrVV>1HEMDQH&@Gjl`Hzwyj`~L&mnO)?HM<&?mt>>bCGdL z7IT#H?&D|YwZ`t7oXDCYw%$hmfcV}=2O5(<@7Z4WgC*SNNbYirb9eIC!@Lfzx-nzZ zri!$v2QRis6zD&Da>V!k)pC}1=Z&L|gme9fpPc{C>7H%S0rUT#6Gcv&ZTiV0)2_%9 zu6e@s^J52Qwi!%+L!UD5J!0yeId|55)}lz}>3d(NM%=o-@BaFWZf~!-UGCrL=G~L7 zm3t#DP{a1iZtFd_>}M=|R`l>h*VzZ3&UD8$+*^ItA>i`k+ZQ%(@P2O@xNfVk;NHUY ztUVgHV^%VR{pxyPd0I6wR3@e2ipb<;dkdOp{XKBj`A_NHB?>ls>IClp{uz8?R^F*~ z5&=O6)0n&i&*nTNoueV)y5N!dJA!T=(>$(!G&+8}RNvyPGF3SN^&3xOI2j_i zZsg5e;h?ztQOCU(=Z(9=_cAlw*f@XnqVmnh85jc2Zj#zu9@zfefk}SvYw7pNU`LkU2$2;HGiD|wX z`Qi%Pj2z6DRd0KLJSlsZSFA1Ua&5dtNaf41$UgY$w6?X`K|%Pv=+4|H;< z)IJcq{GqO}YW=zWy9}-PO!fQTrBk{l#uvZw5|~+c+V^bF z^g}&sm>)BEwQ`vS@oj&*>cN_)ksLy$?J1Mms*=u~|9|h>E1~q9JBFR}|I}$0Nglq- z`rzv8Md#YjT&fjPJQUtgRJu`V|8f!K=@Tn%uVjBX)m_(N=c5HlXKl@w?(}#scvxzW z8{@IbM{QIXr=HySHclXXA9F$1WzoqD=}A}E43_-OxhBcrd$0KNd=DuRgBw$R^J&~J z+GW03lVQQr6T-j$m=`O^Fig~blQA_{f+c5OP=J@INy2~2(#7_F*9+fxeI=f&=CAm9 z<=MtITlPu)oV#Q9@_UcDDkQGT)h~FJ-138Ao6w1;#ydWI5&dz^eojL&|7+KyRt9hO zMI2q)^2xxqzC|Ho;eE5aPA19g`q@5u{a+S1!67x__2Gh-ze@S%X)#Oe`giJh)w$mR z9qUe=QMp|`?O?2j0^^D|itgW(Hhuo%P#GT9vnOC>oZI0}yLG)Oo8R94Z|ck>`m`_V z{4-sFhS%@!v3YY&5b=~>b3L5De%~qe%9j_0UH|B<>1Ui*K3b5p zy0*qQ^n9(<;@;Vh=f9nIV8cP9dHT;U<{4bM@jqo5>L!GGg5Qlhh(-+iZ|^%XeqXw=ERB zwr*zorl$*XR{rWUPkb6C^+qXBK;@`jOReY)t}ca6M#YVfPkqk+;9$qj(DSbKgiics z4wo4}4*SdJh5TR6#>jX;>Q3c!dlBJ)l~bEl!~cAD{dZe+`VrYrO~rF-4UMNHc`V&f zcJJGKo6U}dKK7q=+ke(pf95|5La~#Aj&4!77wV0wGAJtmp1bM+G$@N_@Ybc%hx9#KYk8>c>i9tO5DCp zyAzN2i-=te{y5`%&4RgkU$*6`_3Id(x*dOmBSAusHG;9hcH3;v6WO=DPjW{#IvdhG`s)sN4-#@uUY1OumCOr$Bm}>V{*1Xy?^~b6Ea&4yF(Se&n95_}* zF0t(9pPu%!y13AI!H4#jd>#h_mcGv>|B*H~-Ef)=!1>-djX$E?E$j(D(MhM$x=`z6Mid_bDhP@B8O!6H=t` zW$o^L#uxvoZvFRYN@L05fHNDW?wf5e>48~>?!Q#UpJ(qcVPI3!-JUDH=$X_lr+|lc zfn3}7zfa}#@`@06k#qXd`*Tr!>tp{2t%`{zAKyMZV31O z3v5pi_>eE{9o2a|#(SaOx(P#2)_6(D^9!l z>U#r+^8O$HWD9=&Kew-lL62)s_35?itS0a!8(I17eBr`i$)SAt|N8gU#-5%G&R&8Z zrRSgeT5?UD)H{deomAL{T?(3>}_gBM%#)cm+0!^M|X#%h+l zq4TE0l!X$9Bi1ZukJvuvhWN_WDmij%S#)h`PpF$LR9{_M&&eb{$3Wh`=6lwhJ-fJ5 ztN#mC%xL^q$X#x0{#V>laGhz$v8&0S9~dO?^ZQs_Zq{Gq#qdclVrt^*rj@1k(d}$J z2cF3`OgMCF^J6g~Hb$k4^bKzd&i|ZVdq6iZCuE!b)`L>FuAbMK(PCk+w85P-E&Ab4 zPV-W(+uiq)y8d53@nJI0q?v(X2O?Zs=Qz0ueG2OSGslm6fhNNS&&R$?IR);PUk}Jw zBE~XD=hlWDarfun`B|eFP{46~ZO-wn@8ep{Wo`Mpo-Zq%WytZr?!3S!UA4Al|2A!7 z5foIhuBceX>cTYjpYQ%J=gLl;=skDO^l7fN+~p08wJ#W^9NxX}-@Euj%-_G94Nh z#$W$H)+MiWUbxNQa$o=9*7y1~idvl8Y7aFTe2M(?BG$=q(dM&9!p}vw_0QdAFk{P_ zn`TQa7gcrC>M}?b`rNv{M)5=QZ?_HAQH?x}w#H>|Kk_MTo;vfPMyqWfr-!if^?#@J z_rA#gdH%F~-KCGm{-oBPyK+L__Hg;7D>KhdVcuZ~wfFtzMV$Sl8o>vJ5d zL&44k-)i1ZuKy(4I^kZ-0hzicAC{*YH$=ImmvI^|<&rsmQ(ay8bX)o z&7TEw4^!Rwbt}$``zbr#_}R*x?-(k_^ZODb1B>SY{nbX1|E4}zQ2RDg|9hYN)3@hs zp853ORw#E=4syF%E7o{NgdyyxV;obxRQ4V|o7%L6LX8KOY>WSKJ}bh7D=9GPm%Qh9 z>6eUV+@D_ynq{gxD6>DBTvpb5TOm;TrzlI+EuTNXS-lHC8s617|52}VjY`b-BPw;9 z7cwO7y2;sc;KG()-BJ=lZyvOrluPm4Xu9XJ`w!-c{OLtgT4z?e@2tP9@F1s6kAI)P zEJO45x<97Z9i--|3p2i&7hU_NdhcUN2A9g?$K;t;F!SS-)IK%yj0v+I?|#kNWEru-4UR6Vb?`SZMdjziP`nRMOH(QuM7nqiVMNkY%+hj$js z4Zg?ooY+02Oe){&+JElZFT@m8JzXxb|J}ZuyN$elA7|X5d3@TbK5;Ym(pSda;W`W# zURyG}+3{#jzjbgjD}#X#^CgjDZnmnvlUlcT)OHvIuVdkJ*l%tmb2oE|)5X`z{%zg* ze@&-rVMF|x-woLUauQq!=ICc5?>cgEI) z>dm_g7M=NVBH#VP6*=jY5M!YVhNl51Wi#zBeBEDPy<$eYCr_we;+yIBf61Es(oc=f zxOjZsKk1v-S{w80zoh+5|9zN|p`l>e@%79~+S{idI<)`)z1s>Y+zg9yx?^u{etY`g z{1YiW(;Y3^eI1XN1@KGzZcX#OKCAE)PEG8z&*v~(3M&ap$^v8D%Isz)H?(*+dkl|=3*m>aQ z($(kJzqxZIpMT$nFEJJj_x{b?yl=VI)v1k692<%(_CNd4@3ga+Ge+;mZGHRCRvy!N zT%1@c4#Zqz^gGHp#{EUPt>dPXD@e6{=zxyZp0OX;?CC^ zOU@`v;z?PwB%m=n!*(rO-IrrOBPL8YRanNqW~t?~oV--_AII%|AFVpxm2g;8l6RNT z#A{Cy1Pxq_)(KYq*L==V;vU3(sOoiS(t(@y{?9Mwr!!MV58nh*ip&u_4)UPueZRmjRzULJgDje?+?0yZs4!AR^PSWp>-- z4-Fy43>WzhEaBBuU84D6adFkfq$~H&h?v_-UT5l=rcrqDe(p)8?fH6-=kA|*pv{o= zu)w-q6GQ?o$@+bIzweC2k^==F4?O!@_x^wX<+lbMJ2xdizP7UTe{s4`OTOXnY5Mm+ z-ZcMv<9B4RN?WAwn-w!XtDoD)*Ua6dm0&PATz_Ni!*|8{wY&LQm{hja{<%_a)#^F> z;GC0^6WZonUMjpsWX+`B9)@?)j~hg1urYsle{s?R&BxdOI?TOdf6gO$as4HS;4@tx zUsU_#{6AVM($L1TplyMy#B4QL2Z6epZ+l#H7S8NhH1Y9=mCqv`EAq}9tgf@~m0z## z>=8Ltcy*#;)*lu{hoGbtEBG|n4xE{>fwOudiwr+zkdFUXseN~ z+7TJv=pVv$Wk;Jf<@^cX-|#TRiOZqapka$!{QA4gufOii`jWP&enqIbCi^TVJ?RpW zOK)6wuKvIE`;O7Vf}^*}O43~JPEyWwo7fWgBc7MZO{>TMZulYld*R0lS{>Tb9@t4p z-qAe4^5^*k5eYqaS?^+*h95=?cCI@*fBEMV)er7psIPk_*06l>i~Sj|_oO^qY5)Jm z?=RZLPZ@5^l-cO^@A+!;O^xY0=Or!%AU zF;Sl8I~S9bHhg%0OCd-@c!d?~B&Nkr_xeA4y#HESa-oVsv+SRgBsmtwr)T}|KawoJ z$o}6YTV40}^yvHQMQgd+>Ob9#X3#U4{qKD*^9TQhfj2ik{CzcSy0+M@q9?2Ec$fOD z7fE0^683Z2f^CLNZwt;4mVe;2a|*YZQ9@0UZG)F#0aLXz-zDYxtMhiG&Dk;Wqx#Z+ zh0RtAjhZGcu9qo@D0g&~S*VeEO71Gdg}+yC?c?DxQ=caB@4xgp5tTh@%?%HY9&`6k z|Jb)%tD<7Y#Pd=MuO>R)(qHn7!{)fdp`+=w?v5-RhfwoX`mbr9rhN^s-Y;g+zO#sdVL@5l%enVIZD-_E5-{%RtDJd{d;JcE zOBs#ZEm!A7IXCxG6?cSPrrXe|UhNOPNDX|~>&udSR)nlEN{rH8ZeYSAj zEHRPg-oGDnSazz+&0tqd{c>H_X|rsr)MD4Uj0;Y@x8%{uUh1NjsBELyx9jx0=CfQ0 zpG_Wb?hh^a7%L_x#r7$!bV|hfmtQrVRkKbveptu&ed9qR#|5)?vCpp-{la&`@8yac zU!xm-`EF`n?e?tLO-jS=`-{1)U+ZJo!^`wV9-h7Dnx41+(VYJuHZ?E1@W1vM!<&P; z`ct;8+0T1M#)reotbG5!z4x0AciY-DXj{*(y&xw!LvhEKghY-rQ{yBA7wE7bUCH!j zQ)~Qtp&u6>i*5+@yLcsYj%N}pB<+j|tH-quj`>p$RHpXrh`1`N@zU&>*EQ;CwL8@z~MVGBvLXTg8`iL^?Z28p(V#4U=E8-q9oB zUSJzw)x4$0J<-)9d4YuQZ;hJiNYJz^Gu0( zD);Rj!S+s{oYLe{64jP@{C{D}(oVLVpKAjR0OCX=&i zlSG+M$IFd(<6gzPeqZWn+<#|c>g|0QMR$AoE05)$y{7f8vuOE=?S3NjqRLr4D%RMC zt61z#IV#BT>%pnkl@I^_I&}8ihjpCaYfosYC-6zH?Mq#36U=1Ulb>g(kYmoRkYBX+ z+Ks;+>kl1B5_#$``Bhr7{*BurmKM9LIcHt|7j_#4tz?>ZWNYpkH-+%MU+ljWJ-+bU z#fCw_fX5*3&Pj{M{(SrPPBhHqKCz(hdU%T~?<|vB2BW}xTj~y9@VBcj_AM#TiTik$J#SX!qx13XCmg(< z&j0(0A*8Uayzb+n_g0rDpPJ7Q!X>a)cIH0s{grYtX$x8srKZ~6-p?zfpqP-t>u}~H zm*CMnO@qJ#Ey^F}`trT$ddg_c6`JU9_l8E!7s2=mYOl-}s|tjFKfd%|Va@j~7whMF z{5!PnNwRuPFtJTExi@Zexq>5eNIIu_cuMMG12g8;0S7~)SkqSNgf!uYcb$!whF1JBPG}!oPkG zo>Vu==YHOHVbZ-rpGBKZZ{_jsJl_2+=rmKup_`1MymK{eSf1Fcrwg5n&rm*l$LkJ{ z!&(84TJ?axJuLQSM~}vq-z_`-HO|Cr*!k3Ze_u_!S+B<3&r zzpsShLC`_TUl*U}t1C0di%RfJlD#`~-Ddj=Gmjs?Q`An+p11F;Dyv}1u{p);2N>pb zwXU3)xkd7T>FwCB3T(|Hu0jmggc$f1)y7n>3A{D`$f@it9aCmJFnD}JPtxbY(WUebJ98$*Xh5m-`A2e$8c4Upx87!!V|U(x*ienfit7 zRvusd@?@>fmFwbFf8SfPf4Ws2lFNC_itoCnh{A`d(?j-roxYXlz!n*X$qmc9(|pwx z*YUoXzyDrq_ls@y|6aH+|6lM`{=utX?6Yg5;_Ixuq~*@etYxpQI)8QkAJ!S()zW{z zuViLe&?WtDfBu{8*Z(m`r#7{-Zb<&T=d<2lr3gzob%&gvCo-oWHaL)wQl!?R_$;LH z=vhCJHARwBH?`h&^VtyERy1XHoO@7Cti~1deI})Ki%%XjnHazRqVDvdsqZX2?H3!Y z+mOmOW0TSh$F6Hh0$+rGJzTSXcc16~VwWFR@}GUQ-tg&_`n*|{f8MRHoV)eXJ-2#=h>bhW=OsP+ zXm5A9>dQ(4aUIK>v&B?y-n`6sDo1Bc{CB1q+6_`KEne;^POUDVZ@{8C`(cD%X|w-_ zMkXmgA%S>~iR^*i%UzyCTwK5A&V25}4HqZ5x*GPqR`NJp@buglj@vCuA`hEBUSa=8 zntPw>gs!Bm96R~+4m{*IpYSDxL(9(pA=CZA!kIE+v)3I8h^bWI+)=uSHQS2C&*I;X$qYB{9ebM*KY!Qx zy6^YD*FT+fzT(*YsITekj2Og|HftSy)aE|Fam6pOZMp9%zWxlaieePHwBXUON zn5f96e0x%(K+?P0P1Bk$g)o+#JY;Iks`XST=k~m-Taq$_CxpMgE`7u^_s@#+8a>AU zj%tC_!;2ce+v$Gz{+jieR!Ht<$IZSj*NtEJbKRf0O0w~i zK;6=*%v+fqf(~E(!7rI)V0(hTj~w8S9EJB8(c{oB~`IWeg_>+ZeZ zl6l+wW{8uM)6RwvR-F^9jIJ#DVl1b(#s_wZ>Tr|=1_lVaIts9gYARh~aar1|Agi)B zchcLa@)qC)Et@zZXxwad+nC^mDi8eXpFq-SZW{O}J6v#R&a> z6^DD5x4-_PWl;R}=$UnqSE>(*^GWaiyM1{}#jS3kzuQ}w85m3}ZcfktXtt(?t&Q`= zL#a*a?{^$N^S%BxGsC0_jCV}^ZCLe$CB#US#^Pp3mgns3cei@I(K{JioaoV&)j|T^?yiHBg5kx=WLi=c#1TYf*i z|J|SUcbMycs(K_dzWmE)%iFNjoBz?n`~N>!r(`5en7U!xFQ-7J1x&2#Unr(B$XDEI z>o~*V^R&6|73-0}s@YuaW;4a+yi&OMY#IA(!LFoq&VQ3%#Gmzhw0Qr&#ZycDs-qrc zdz%`xy}Wiiwe9$U+i4X$3j1Z^?#dl_dXjyKT1xKuW(Jd)`!*!Bau*lBoEiPU+Sw+sXBgajvNVVBLANiwmaO&ucVZIab5Q< ze!GXI3Y!?i9+&_9XBK)Q>&g|QgotC;YVDj1E@)2)I5BO*Mb(<8HyKXpUghjKCix{r zNiq1Yh>U4b=v;M&-XI&-$Njs{ooukrnxdYq^lRhI7xI(2m>c4{TsE*i-rFzuPMT52 z@NZlElmm%(8Q0xc?(aXN=lJQ!aot`Xg>+Ap89s8fXoM^Chee&PPVll_3Zox%4m(}(-ocn+6EQ8dkH@x;X zFWH|i?f*Bi+bp7~`Wrh(9 zdQs^~wf9=z|1NF2!*g-Imt_DmliEVQ{S1%$b-5R5UobSxoy#EMcj(t@%anN%f0bvt zMKT>f$FlC8LxqlY?XmMbA}Sx+@;asC0}niZK7E217uS;ag~pj%t9&OfJ9fY0?h)%J zzc?MzTBoWqyRV(o?xW?IKBw-O;@!JzghbPeteG0d3;}rZ$Z)Q zKcVxjo=i3}4@=Or-1++7amE*1JI|=*|NUgooFK$v{j{NH?P>mXpP0Jz+^+E-X8Z8X zorh(f^lqONr@7Zt${k{O<-BF*9pW%FOujL<#z?=fRNOb%SHQ-yP^n!0LnA6nZmcQqVlaZ;!izPA=Z8OByc(5_v$q~HSsKX?%Z*Pd> z&$zjb=ElFyO8#qEah|s%*(taz@#uy$i?h2KCNKRr_4~fc$%kgY({o~U4i!WYl zY?y6&z10!67C?|8^V&02CK2NZubTP|+sR8g`gR z@SoY44KBqG^0jLJd#OKssB`$9)=K-uDvhq5$1J^L?raGcJpSd^tp^oJWg_em*V6rF z3o;y4+10tR>-0k7sY3E`=F-wk!pl-G`c9AeQ8~fG=i&;| zLqUd~#Qtq7ZUisgS6@5*(EIN?k1yTzstBF!;(3*c-Mqv|&HKN(^_I&FJU+`9?sWW+ z(mL?m{G3Cd>1@OQFJjG~=k0zXw&ByVr;PWzVjFf?ul&S+XUmy4bCf50f3rK1@%~k@ z*qfQ>?$*BDo4h@4+m`RP@iweFjw%nPD`)T7mLa~t@a$EkMLLpaT2j;+v&}eVu0CCK zccVg!pkL;tBT=)}q{^nc$!wNcBKbpX`laIw|4zMPl9!$!`lY)>ykpDe441!;#oDhi z*H7FQKUuCqREPEPHOE7r9(BKG6k+aa5KjMTQQz5qcvsC5UWX>Nm~7*eeUZQ9UH_|3 zW|+@2Wo^A~(@CNIvbl%vb8DWpJD<+2?Qi$NBBOQwNAcZDx35iS2(?Lg+`7EZ^_iQ^ zv`NP7GKEqNt_;8Kiu&6f;xWr*Zj;^iVA;!KEc5yg1&Ag8P4*Cc{3ex6BSbh&^qi1S zs!N5COu{Ce6eFpRA?cipj>U_woy9TT#Z^mZ){fT=voqM;40)OxzP{_u{4e}hW9zIj^rP^ zrFeix^1^}C_*#As5yqZHj`#mReZnB3dgk-2BgtB8K4kGC9u_9`)>> z7?{y;F!+WS4}%&<`rqhe?xr0podR4xDF4cz+_3ds_h-&2svEqc9^RR2duL0zr2BUk zjg=OMf^6IZmp&0HaI9xKKlRM6U4JVV{`cLcc083y%}`G=^Z4CX5gmi#of_fu|4lPb z{ar+qh z87I#e!%J=2ZnqzDu<>xe-v9UD_b2amzq8XYWxD%*`VF_f8OOfs?OZ*-cH5^jmfYpm z3%>t2FaJ6}rj*%uvw??qyZ_?;RSTYOdXiZ3mm^1`CV6VJX{2}~&#PYlqsxCz)?_p7 z{#B^ERNTmEO>a}u!DF2!NwL}G(N$6JZ}nEa_A~Z9F-tI^7tGo{%Y5S?Oon@KK6g{rB#<7J5nM$h&g>(jbEm2oo1RI{LY(wFL`g|7Fi6r4G=bI0-tmy*vpCHy(} zT2F4zpEvdn-PJvd8(*p$#coK~fAhNPvb)`@+=x79<9~6dVjF%<-u?Pk`=#G9+fKZi z`l^6D2z9zVb-KUA$^FH+m&^K>Pi02Gym#o*Yh#lzW$^3Ulkqci-aa2;khw z7ka;^!Q;*xhnQLSOS&d3%ll&*`|spdmRH8}xf0tHonPgM2J~dEbv=0OdDnrn&08b? zpKYwRUfx(-&RK9Mr?X|no$sBU@tZ4KE$S^E+PPKy7S_D*aqs^Z#aDbpSQs|VJ2L%O zbz!yLTJz-A`$2IZuf%4buX`=H8ctUl?>wH}FTMNa^XqNfULXDX6Moj`|C>o{WSO5=W98;Zd3SU9POFO8MRzaZ_I0x_*VIO%m#hkj3jf#F$M7adIEWc;y2oJfcyD@b;$wfmzo|36?SGNH@3t!^ z1H%Ny=kmLL272%;`(F7s@Q9EK%M$sFiGEABX$fjZ2 zx0U_R-|v4JHd9uo?Y=SVte4)#%qt!|FM9F)dCaWc&yRU0LH4&R^EkF0zI)_f?LSMX}r%oAD*>*EZU$R9B9o%Zw1 zgInw8{n+^7ICr6D?fKny|MOOtpUWygdzsZ>x1%OvgxhfJAL zBX?Igww#U=OsH$Rn9I~9b>Z)dQy*1k_bn6pn=M$I^ku#WZ(skv!Uys*5>_$XfAju; z>S5V{kllR;coS}^347lvxOeiso_+QGO#)x_O{Bi9@&EIof@vw6-p@nK38s9uPtDiP zX~;dw7&6!4-^APVHl)4VptbY1_WfgChl+Go6tvAvJ-gd~I&();(;A7eL&vl-lhuzO z=JRY4ShOnFVy0LAnuq51cxTP{B+R%!M%Pf^(PMT)d-Y1a*8jm@8t>;Ye9OJg?Zva|>#;?-4znemuQfWfWzxlD#_;!RXZ~7!s>RiF z=}!(rS(Y>f^{-+Nj+xk*Nw1z_BiMdvhN+3ww9eRRoty55UKb5o#LISVdZYi^mj^em zV-9}te$pgGTh7a7Gw(KS|1`zip%cXe?Oyr{!!Ax>dX3m`^_#%axA<3 zVw);^z`^Z*4;|iao4w`x)XBTwl}kh%ELxKlz2TR+|7PZdxl@0n%FEhj<`i%qFPYAG zdDfK^v!(2gGuQUMFgJd@)s~5q(Ia&JCv$DfMaNYR*)HypogC8sOi6Tu+G zo54&KrR|3vr5xd8+&JeyXSLs>U;l!;{(U_+{naP#w)a0Rik-K|#R)alDkyvq(K((_ zp=$YQ`TTw9UyjYUX9_!9So(jD{{L?!8gFj@zx)5M*p?mce76sXJP?_*Cexm&YW0Ud ztoQeSKJ`TJ_nYI5=UrTm=5QX(VZ6lu@rAAlw}U8O#gADV*QzK^c$Me;{g0eS;)5lY zsWlahjDA_4Qq_5x7Eaw|CHCa;j$aZ6EbU$9llz5@U(43?Ka=R5+|qJzs~E$@DIG3n z8dN13m11@_ZqVVMv)9GRXrX|?CAAL~eFdj3v%RYc4S2ga+{M7K@wEIj1>V0utuCyK z{L+6yI6QjU3X55tv6El@Hu4Ynv-0uZ_Wx&D9`9^AaQylgCB+cYH=n)i92(|sm=SUD zQ@?CQg~67z(2PGoVr+wQpsYw-OZ{^@i%q~(kTY@0rtNW6 zOE=suUU@gZG(z=jcw-Y+N`zR>U!Dbg0$-RbmNLBT6Zsdpq2Ry9hi7{H20bS)|J`A= zKhU1xt44il?o5Sar<4|-o_FhjT5fV}o>P@<>bad!-AHXY-yhdWQ`@>aH?Hy6vE_c7rtO!= zRc!}-6n|xZ@R#0y*zVoATR(0tGtraHYuC+^pAi1(K!Sy5yI{qZhwjVw?fvtfeIDcL zg&Dj1eWc$^-}s@aIzRRN>!|NjAKOV05qw?tznY8z!kTv^JjJ_rrOntQ_ls zutP4pj9D*lToztrRkI^x!2_`_iCA-s> zayibh<*l}2I=?}Zy<|mJgPG^#iFz;16Wc%kIJ4`y{(&8p5eLL(?DEj8IJD#a1ow*n z#cy{g&Ti7^Q|8EWjuL*(^ve9-3$+F(CL#XkEcbThsO{UgQMiA)>{?ldrZ1{@_HaA4 zxZFzAd%h=hxola+yLqqW+9xeeyrs{mQ2gNHk;dy=Kd67dE5^gmv+nOF!})y5|IADo zci37sblt3YqH@~%{^peQ_4QBhDm1;E;Ze3E@zyi5!ilFQYxF)f*pcKA+{S#Uuz%K$ zT4%{q+Rkj7PF=~q!ghf_Y45JQr`0-4dU1;rx}V+p>s!gfJ8|>*Ysca}fB&8{q2kNh5Bcb0pjT1x;Xy2AlU1=>UX86z0ZAWfI!up=3@Vm`1WyZCvQZ;)YZ8+cI>lPa`ssxA;$j0 zv0jSZ{%*VR_0olFR_xmA!OHctiF^BtgIjoS%v9O)Z)(4uZQ;eZd&^S27d}~*5#s;0 zbOT2l`?EJSS8q-Hv|qkD>Fv$@zd19$rEl!*sL#olaJaM8iot5ypR%V_6VGr6x%_;{ z)RoMtp;>BjuS>#Vjk_t!nGmMA#k(iwcq;@PV0mdN-Vy7!r5kSTn&7o`m1;xK zuTs|;kGM5@stzc#a=)%&o^8Wy-oHG-EpIN5$elghk{%NrHwg31*~YS|e*eR+fA9Bw ze`D|{Tw`A-zuoW2_La`R59aUB{c`N|KC^<8lKXjfGv01_bKUzWBLhQc$}z)R>F+mQ z)_+&ev1Wlva!#_C-YB?94BTt z=yXXl+_LH4TY2jK8DXEaKWtm->h6AtZ+RL1a#zm}hv`dyKc1_0A=U6x<1?`U7M~BI z6GW;mxECIFTNF^9aJ+ibj{N^ZY1XSe-Ie8jT%OU=^hI^w_FD(st=KMJyT^EX(*Yg} zjt?mZkCZC&UE9GH;~McQ>V=Vtm(HpO;ZLufbl|V9bY1JJ$d6AQG#b;$%L7~iM|KBH9%C_%+-p)LI&fkd>U!U7=>+|#YwyRs}tIHUsW^a35 z|F&Oz+4s7;><6Xhp6!1kFr`*w< zQCrympT7GU!x@_-kDtHR?8Bpw%COuf`;f>1%kEm1RsWKv1PQQ+s3y+!j+hf-dUS49 z`f|sK6-~eV8ZL)zdwBTd*BP^gJkl=}9N3Y5=g4_>qlmXsQ8SoL7{8=0l{Ga!tpD@F zU50(Hn>!M2unE0nkyg9-VEw+*PbcKh?^o^lBdTj}mVRb=LV>RSpNp~AZ+tGdUHAXD z`d-uW?^pfX+V-Dy|M&JLW5@>X}ZdU5G%#(=V0{8Cy(s zxjWC9Sf!O7^1GFAv|y^*^*LKT9(BxQGH`l0`32K?waveSjsA5wu$dchTJEXrl5T5P zx^FDUP<=@k?Ah%9Q24yWjvxC~-2U8Z<*7Qb_AuK$ zQ*DRP>nmT?Nbo;r;merLV65`mY1V-S0SA_JU2A{WuGH7hDB<-;TskMlaLzHwnV}WF z<`2uZONa9iupUO0Klj@G6Mt>HuFMYDbszF09K}B}PHdgh=3)XJub>f(!`r(=+ zqu=d7#mO5IB;10T0*w#n&-!GZ^FeW4VC--29!t-&Dm~jIc$sWm4H(Z9NF2A(DY&UE z@<%{(${P1tOBr6ii1VA|er{+r7Jqr~|7xp{69H>}-uIH9q}*^k_b?k@*7S;HDjVY6 zm{@FV^a?&tI3QVEq;PrN+U|7S46~517lxubK^6}><5WCfOMKywmtMl#ofXTQc0haA z3Et-q#bZ70ua0%D2uu-ZNj%5x@fwlJ5Uy;Q&U&k@G=?45=iq`H;;C^RFQ0$EKDY0ekK5FhjkYDTFJM@4$M*VNze6wm-|hN8+f(4S z=j=5typk_A#%kP4vT4waUlBB6U;lzPhxK=9q;&^yc`Vh@(dUlYcksZylSXMbc{l>E zC-qo0J`-;Hs#(8uM{m3x*Othsc?`84q^n2chfTRZ}@0RbJhvjaYq%ic_`YIjRl53IcS#s`W)5{qeYzH33 z+MSD8bK&6(g~JyvSNLuhI__S(Of6rkS>B)||KBd(mdC%etQcABYYLks?#F5tq?kWW z&t|RLRm~8exxv59h}WElTjsLv#zi_CEF{yoj|l%@7Il{>-PjhiBe~_n+)~XcOQ#76 zADQ6u!TF7&(ZcINC)h&PJ{M)~c9qj(xmLVt*0brwsv^g^Cd}gxy*Rn!=0*n>tEc`} z8S}5UmZWo?(oKHx-Tue^iP?1p?h&uUXVmgA6x)@5eE71KZ|_l$@{WnpdjDP>IGX-P ztLMk!8OJLBO=DhR!I-GBAmx42`#Ya*KGFL<|4@P&lc<}wMz6SHZRAll37&as>;d8z zSr2+yczoRwx|?-f(wpncZkDuv)p|2a@r*Zv9Lo%?D@k4bzY2A2u4Laeea&{`$d5^{p11hb{!( z_foxJw|TB`uBVn=;r*-G`%1oqJ1mmud)aqg@_)Mi&zRq@`+lxF(?8uTw&vN#$L0UN zt@N0kzuWZR^hwMs{^+UkC|~_}UtR9P_lNm+R3>FIHZa9IRS7l9E7;Fz{!&x0;1!2b z^kv2?mQ2kFGt}0!G@t1yTeADo)#p|T2htUinet!o6sg=F6y}?S@B3} zi0!p<^ChVh-gp?z$o%jrzrNL9#{Nh>N#ybV@JtiR>8_YMTaY&upblHQ73wM!Gx*dFJ)eo z=16s#$Vwj)3D|c(& ztbz@E?%w-#rq7P=ecBQo;kq3g!zZi|zAE#%k#BXKPFYi5g3H-_Trdcf1bIk=gTT&gA0%J6;K1S+OhCOJ(Zj z$MZHnt9vJ2zx|h(PTQmp?dH7S>tFwUucupEASvbHpue=^XOLam4ZRYVMa37J-rxJ- zoPJPmeQP2^(Dr$In%dtuh}9`Rd9A&dC3}~QgYxqEEq!HSYMtvWV-0k9`M8qa%uLkr z^Qb9{6Ks5_kjcrR)KkTk%6Y~^;=`+DccinDR`uTsVoYYdko@|H%LK9CKOQqUYChOu z*Xmx}a^5yQX#r2nhU$jvWh*)#ACbxb!w~SLM&?_EwNc{#l{0je>?gTb>a2hNxw~;~ z%Zq)Nr@3shZB0q%YI~dTV^{Y%*&RQM?fGnd^jzM>GR!Ey_TFyZoyz;`yL`g=Bh8+^ z+xgP`_5RXB;f_z5D|LE)9rQl=Bc6|M!6$1ehDi&JJ+}V;{$K9W?{kyw^UlZD2rNlS zTXx5RuQf+*)05_@SI#zN7BFn&-+JNiE0<`gne)t4ZVQ)+ww&Kpn%-deO4!Asb$jrn z!j%4gXDd~)Wep5WLW`n`OqTr>(fYlLO)Jm!bDUHbqTfnE@v1E&%72{>Y#N{$G zrd^z(a)cp<)q*Yg{gy+Cv35DZ32kR@D6391`EpG8vcUq0g3#Qj-#!T?)-e^VaI6*Q zVRi_(n7&3>BI}5dgc?J?q?t(E_x0OeeekVY(y+0#c|zO=d1*TVp|vvHWm=sj;ZjdK zvu`jka7%f*IEIv+O4Oda;861SyH-Va{q@h=SNx4ld=ry zB-B*&{r}TVU+-HzyghNne&5_rxt0y$-@k8TxbbbxQSWE9Usq|rwd5{uofOdMRJWz! zQG}f1$+bcr%c9E{Y_w5ul#=zg$aw#{#ekzxdm&Totr>l++L?_@o93?hSl%qaKSfb> z(cyp>8$~t+CA1y2SYdnMciNN-4<#zrr6eQ+}Au>#zKKUZ*|peQ3u1S5Ff-DkQBLnF86)%&0!LzJ7w`hYtRU7mlus zE(ny+U0@S;MPu`%(21S753elUyNy#RaJO5=bB8uF5hGp;Pxek9rp|9Jz6(^u9GJVj zCg)YzhZ4jt@h_|J-+AlydbdA5LMzXi2xYeO9$$Frle&CV>8scF{4CmEmh|7+@xXd} z&6OALtWVC{TQI$ANz7Bx(3K0^@_&B4**tyj&(|O9LznDY9=dw}Q-)>iIzERy-fsEu z$6BvM>|L1vyWM03t=`=y_){N>$Fi(jpSeVTg47<>O-(25lI}(d2ux$OPR(vOZh*L)%E?k;_%KSd31ju}pIE4GThxn{ESTHmZ_16gUm zXr`0fMCSBdlhf9(ew6PV9{=I=HHcmzHPhG>uS=sRA&-=s5+w~L^X+>6{m>R|XAhqJG7DyCGoRTYyiM&w z1e?!o25p58H5x}hbk7qzE5M?ic(_RCgu@}-9SKWM^9i*S?c-5@dtigllw;i*y`lm; zFIGQ_eE-VoRqcKA zTe~NVe!Up9uIG+}SlmXQm%nEBcif(5y<%O6fse3kan%L8&3mV9=5F-$Hdo+qHBfIW z4DqxK^eSexT=OnxMX=P`iIq#_C$*~;&QoDI)52>#*Wve>vfk1Nw#k`+FK^cWJstb| zeYW|W|Mm4u1}R(4M_T;P-fwHYvEcjR$95fE4|i+NuPk~H9{<1S;X-NczyFy`rvF#H zeks`ouJ{x(Opyn$zifITY{8zh%b#Cu*KnJ*=OwfIS$XTU0~>f%tZ!W~Tg=u~lnq^FMZeo8!87LfxIOp}h4U%y{hwk&o<-M#s&G;w1?*L1uO2o>0kN5vrw{CmQhibRzbZdrBdl`;iRO(v%ctRY* z)6<$)p4@)mtZ=B)c~O*x=<3&gnY1$-&u_$pa ztrDM8eY~=B?zbA_*3G};B7-~Iuk$%h`}*eRHWm@P`JWPY$#JH&WzKwYYa{rHu2 zZgJONDSTnwFY@x++&MeD%UV|4*9rMKGpp5+#YlI`G~2rG5A^r{JA5d)zEYv*gXp$+ z)mPj7PBZRNSa5-90^5b1ADVvGKh?SM(^N-QSg=x+|MBci1)o)I``2YzGj6j_H{j(v zu<_#F1ht^KD-EP4?)rXV!L8F>iY>?FP6!0d<1RlM9KP1>?+b2*^3o;8@|XV7W#8c1 z$Eq8c_r3PX?e!=3yjsz{Hu7`2lcvVX2V%A&ZrmJRdQ0S8j%ca{D`r_T95$NxD%1V@ zo_DKu`7eFDN~BprU>O5v(x#kG*Vjww=vF^@{`dah1Me41{3Dd5GH=?$?J@_%_LqzC zTyEkq_mWuHjMzXWl-Z^(*EwvTxEe&PZi9eQ?3R_r}aq z7F$HOF|wX8NRT*^BDLg>(H_(DcelJ0PmhhOdM5v!A%!W1OV;7^hiJZpSu%~!1QxvA zdR+cy@tx!M^51Vb9eBu-Nh?7h@WIJ~KRY@Od^K6=p{1dEu;}yc+PE$@|EV+U6%%H( ziM{c#@<^Ff5VY;xe`%(K1$*9fx}VaX|L5>AZohqMJ|CM6ZdG46aIZ}N+{Ge>+xB(| z4zC3)7=&!|f8Pn5*?g~J&gRE?`8`(5FSFAhOl98jQ)tO+=Ti==MOtqqf$KXBrE%-Fg=58 z*4rnJt<6|)J8cfLdxrDYtGgLASl+Ol5HZN*PT{av$?|3k^J&AxTWTi^6i>TWto~m+ zeRtl=c(Xa*FWNil-(<)#iPcZ~vNq#>5yNfYu!J_%CWZxXSbxhHy#BwhaE3=pUqRWO zRR2wLS2=J>e7Ni2-Lc#5&nEu;Z^A6u))-M@C4uA1=o_Xm0XUApz}uYPY^StH=~^O(nd zqhHgQZ{)o%ei|1Z(ltr+kHY5v7uUb6Jg&LEJyZV0n+>1qlxAL&HjE5q`K?gP`O=$Z zUrV%x@`om^`wh&js!Q*+g~V#Ny?S-O>+z5NK83aR9Baj#CLV9|VLWW&=v41GgKbTV zY|;O(*Li{&njBIbPBPq^we)l(>-Y5h-LKwVwEzD@FC$G(iA`TR>({i4+hq=Tf7&O# z!hkn>DHFqltJ_cC+x!046T5RwvES6Re`;l4`_rm4)6w++)4~bMgLqU$mxw#C1${rU zG|x56Jxp#Zc-TN8#{>`>q9D45Co8315$dX!rwb(pd??vOB zQ~%dj>l(dct9|mLL%xS^UFgw|Pu;4ocYWL+|NqL5xz}~Ro7sKNf3dG7RW{Kw=>_Af zz~5n0@+}*#W%}%MRu5RHbo=4_QyFosQ%^8FTlT&BGT+O+eD@SL{t(^V<5S(PCHCC8 zLuF4Jmy}!cvW*wO6}71B25c<7mIFaxLXu9wfnJ7GgF9x(>7Zkp`DL} z`Pb;%6`p@}srdgLjpNtW^Yz~8a4GG)6?GsZ-tO1((kQ+KrEv$+Lks!R4u20Z;eF%L z5;}3ew)!~%ZAp(W_mw_v?}%}h6jt3FqOxhR-T#ca)0i{nuAOQc@-OG);tNXmw)nj! fh;j};|Ihf~l`X%kwYLoe0|SGntDnm{r-UW|r7UF( diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png deleted file mode 100644 index ec8a5f95c6c4103616e68eb4186bbe36cea6e5f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2368 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_B)&${1);b+)qU^FmRmpba4!cIDB?`^_0+1 z+2i*6YtPl55q@TSz~Hbn*BRDl21|Z;Y-Zvt<_WnMw@cQ&PlVaTiS69!9{P^>u`rNBmt{iFOm6kBi zlhM`Heb4*nX7zRE4_}YR%`ZJ(e@m{qpnAF8&h_E*b6;NG%Kqz4Hv8|=;%cYuk-1Nq~~I!xj`|BN2oW`Gjiz?+1p|Jc0ImyThIRY+Ml1F zC$F9Q?pDHcmHzudUgM~%)eJ|oBK#be>~%0WNRg>)fjv-!aXW+!~Xf7QmmIB z5BAaKkO+Su5iFD%;@NX?siBsyLdlj%R<}%(FIF0Vzqh~ezW=o~kzBPN@p*68iomX#X8lt=9$ha*3z=RQyb1`tqIoUyisrG; zCzf2cSl;1KZq#gF#q_@9%i3K?lhgxvOJpX*H!wI3xzpZ}B?|gUWSL=JJ zHt|2DzeCx-zlpkQ@c2tLoAc_(<&z5gN*+X5xUJC9JkoJcxY@ADknJPSJVS-1_dhH4 zosT`g=j7kl-vsn^4q3V(IO#H1E%Yy2cCR#5>fEqnbpVmT%?q5y8Q2LHphQ7rFEUwx_Kq?@D$D7CB~6C z5*zfTua;zP{Zn-GvFXRQ%T{JO^X4Wm`1>wDFg(1xTg!T_yruQ)32R!ngr-f^x}5Fx zv1j__7@lLNdCyn;nAiTi+C@oFX`_a`bW2yc(hvQuhMO19Eivm}by)Mt#0f5DSM=j+ z4(^o}JI{82eMQ8t0G-)>^0I-}WtD0nUypKXNQUZ3#y2T-Fa|mX&M8)}n6TnO!3~#5 zviJW>1_g9%R-E}PO)Y1qfOvm$uGIPOD`nnH`giCQYiju4Ri9oko0m#92#Ti8x4Lxg z+a%L_GkQW#ws{>pbjNG{rbQOVo@_Cl=lE%x`J~_C6YpG?NV*!@a&>XRKL1T`6;wYz zOHM9y%Iuk*BtBDw75j-=FZ->>FwiUf#(J19?cQzbj$d_ma1^U@-S0N zmXz?a1sk_oFFqS9dFwaRq=lb4Z#5++9OL<4{cMJS^Zg26(dW5!Q{P2sx-VY(rFX@m z+xlt8wDlF|&FA+$XtmTPZ`n7sVD>iFfQcnGkF1qF5*9ADS1_H>=%M2Nz3_oE`^=gb zl7^M#0$o|zA7-C>*b(mZ@uzsfzsvnXntE1=^E(1koqo-^f98#=axKH-YTIT%wMIVo z=O=cs|7678AVXz5KwYllEpx0SRh5773iGZ_(${MS9vggb{!>MABTV;EG z@2-CJuzXkN_IT5_Q-M#_1uYiXRr8g-eY@xNFK0{PBV6vcN;WY+`l;M{-P(v}rpu>u zi{1xqb7u8_F!Af}%12L~E0%_yv0gmu{294cD{p~0H#AMv=X!tn@`l~ye1nbt4U1

bsN^JZG7%XFuOFFNbK z?#Qavs#vC>^fK>&OV%;rGTA@9KQ=z{IPzt}`|pchRlIq7#9+s&XFd*mH5GL)N>7RU zn#NRznF=;4dmiu2p1dZLxtW>uxyb7Y?6VI4jy0QWu~5dpa!2W2-{o;K5?}JSH6CSU zyg1|h!K1>3m22DEin~@RZ{VA(fB2lH;MO-%1%DFPCp)(2u7%^6wR1ypCz{O<%-%@nL|^7rsxs&3{jLeBi3)6KTQtPlqO4 z&U>ks_)u&BXaliE}GH9Z1uB>?Ik(h5&cuy`7wbth~-ITIG-{yL& z*lgaD7RQ&Z_e~4xG|%}RBU#4N*46GD^0R#U<72S`t3JHsIvu(-^3`I-nFkW*s&46f zpXd4i+s^f8Vt&ob{W)bS`?nHVFQ35K!UtLzr>3^P*|Uss`GYyqX3fFvXTLM|%LT=~ z6wI49W9gNMO^JRdE<{-woth+@_E~zm|19CPvz@l(zF#@}lBRaF=bf^r?%t=9^H<27 z?rOjN`{%J+a!OAQFwZu2ej&2B@7|1&tM}izD_;y|hl)pR3|lF0Jt5Xe_att*5x2ApB${eZLn=0S&)y#f|?VU}3Kg>1XvVZ;Ti%;64DqeRL`s~U7 zoyyGlGr0b^gQuRn(n7A%#ojv$k_<0vFY3`2)NyJ}uUzH4plg#M&ETf zzghRbW%<#at9HE;X?<#|ueNHZ)8!AxW$pcVcBG!1mr^I>D7sugQ&YuwMsZg1TCrY@ z1w}q5>v%8eFDc85DSI(3d)Cn(E4c0d+%3p>d&E9}zm1{58UD@d0u6;lJ{Cz{v<$rc wNb;^o|L670*UjyCQi4~BbbYA*`$s(B#_}Em^^boU7#J8lUHx3vIVCg!01gy=a{vGU diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png deleted file mode 100644 index 3f206cf8b18cf18ae1597a0472d3147f24c7d885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4602 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FH=O_B)&${1$o(XP!!CU=VEgba4#Hxc4@yx+FGr z>i@Uzt^0qU+wD2oEOT~1*!+M6riVgw_+N7521d3?XQPU*o!a$$ z&g?t8>#P5N%eVJy_}{vCix@>shOCXUcCKt=A*ZN3}&vWIQ;!|nz<8);p5lEPk}j=J2$lg{d7gml|>#Iv-GIQsh|1vW0EaI{s@_ z4jb=1|M_cuZSu{x;diz@EdTNJ>|%xu&64kzn44vun`3$9;>CmcnoO(ZYZ%Yhy^47d z8{c{FQ@;GqS94ZPTAdp_EnT90#T_P2!lQV5T}zMA4w(;F)#O zD?VO3*Vrrn``_g4Pp;iJC^;|JDlK*@^ZxFlr(QXCcZqsW(=m*>9?H%qQ<2TEt}@F% zX41b0duDC=EhMO|#hK&Pq}!q6xPc|Xqe+#8g^^97jUh*=$4bxWuyTSqw<1f6NJ8d< zDmT$^l|?4cH2)somTaDR|L4Qf=X1^27}Dq0nr+L!-{-BjljZQ?!)a=hFRtJBYt^sW z#SYU#9idGy;wY+M#N ztZ~qCxWuq%8mAh=EXAcQudO_u+oaq`S-oVA)@m&S3#*Oar=DxnuTQ($q|TUd_SRM> z)<#fBdkDE9U2sZ1d?VN&Q>4ysIp%vDqE& zmHCS+K#IfUaClEcM{^XbS?}Lp(dCQFRV@`zGeM$dw-Sw)5ed^8aYHYvDHp+fJl@_wsT0DbgR%E7H zJoCP!imt-2Ge^5#X)M~t%jV!B;MCC4Ai(0t)WmV({&c6NPYp{143;nkdr7o0Dz&A$ zPuRqJ#o}+tf@*={v?*(LzJ2!kzc52n$@|&v3tqpJe|V=o{$~s0R;B5uZLO>G4)1Mj zQ%PcKW?*Yn?D)_Z!Ka-S%)lwYm>9xUx7>iq^`3sl{LEPiX%>ygw%Nu?ociVA;;WJz z$k6b3$AqQ{U(_!M->})ft0eL5Px&R>{%b4$`7*A#wIO|Hz`f<)_Wk%>AG@dMsvBz{ zV-i#GJr1V>4#ipre)4LvtWVbXWOC~Mxy>0|E!U*>vB}-~se9WB*-}m;c}2msH(*$n)#+_s8EneSV|yeca{0hn8jg zN0(n+>~*3lEp6>gr)&wIo>s%w;`F1=k2OuYxF#*&RIq*ejw!J8MEycWH3jPek@@`Z zoU^{ND=N46oMosAR(o_&Mdo_z>s<;A#yt${dHI#%EDu{PUH9yCxb2tU)84d-r+|3{odR_BXt{+hI>yR_d#6FPXjn<(pr}GPS-~2#VG2 zf65cKYSo&&vaQEA#TfdFt#UB5IU6vmFw&cW`Pj>oO9@WgKH~h{m$f>MyFgf|e zzi-=LRMbfu9nR$0vy1!XKgBQh9~kZ=A5Vx7Q<`|<$$ewaE7EeZZ)ML+ov!k1?cayb zwyK}VFthzMZ(cKdol4Ntvy2M0N1tf(X|GMQV0`$uR7kb+#u62=45cL;U-!PKV+>(T zm~mmDldJS|$9Y?s8ecnVvR>=SaaY%}|86;>*Y`sV`@H9hLR%G=GAcExN^JHypJQ+K z=T#=R|IRugheo!EDJPxY-P`M$sl!=vLro)%<>xdc&^7(*LS&X+(UMrwUSQe6L=P%mU$-39O9{W%4_oHYIpT*e=jdx9qto!LT7E=`cHQbTdvOWyTw|{xBHIi zt3;L64}K&bjg3iE&XiPib@7<#`E=n+5iN#Ueu_;7ymQK)=Vt7A`FVyx@`+o8J~Iqc zk~CA2Jbfetuhf5*Uh(fl`?5y;C!t;%9GQC7SIRPyZ6-$8M6!FFPz!r?peIDf$brSt zW!>_NlfNo#al528WdCLBN6t~=#qlkg0d>mL0rpMJBc?b#XJ+T&pLp^Dcy zQT)2RC(F@>$C*oVIE9!(ROT*NbiL`90>1`-&x`{h3>*S1MTaxD$iHAzQZ0}<)>QgD z@uKK^*ClIMq!N!ubtnbzTlM^Bl$yw<&Qo4fXTIoN0j5p49bHfh%@`#unZqlS>lPIGmIIpWbaCGGj&jg@&v0@!h8^w|&JTcw3+h_N*$o{?eI+7)so(j%17n#fz@*(Sn+T4s1$EC|01S2xf zM4QQf7Qg1`)p)Sc(B}7-_=19R@jYw0XKi6u3^4H)F>PTm@nl)EwzKoigN*!sy(bP* zZ5w%dWL5lJ7D#?5Ni^VG-!K1s#|*8IDe6aUWf{FPbs}Q=CvMbdXjX znP?s+``z};pJlUoFDtysl0SCWKKJOd>HP;grza^*a(a4aX2t!~^oKphQUWZ$zE0<1 z$vV#|Q<+%&dV;g3x4DOv;;if?r2S4@=)QdE(&e6ah4rUA)EXq+0!_M>e*NKW zC}5BvWH5{K!(?4|!xvHyx?z%LhILeY~?SiI&(!QQw8&s7=CmxqRpX?QoZuNb2+w6C7D~`AG zGd1j(B>7i*-?ZfWcXOs(U!(fezBWn8_}{J93eqn=OzzS#SsB3hqx5A6Lx@J%@l8ET zdsBaWn#H!~{~0b8ujUzw95=2#eKb$@F-LRkomK4;-%?d~{C?nnV#~CWyTA6;GAPVj zF;l#3@$T*QVJ^bYIn4L^a!s_fE3vMUk&!M}|NU#_{K*p0Jd0lJ+IZ*C@~|n3%~B71 zl-$PfYm?OWtrist{tb%CO&b$}9;r35@W{x0E_=%rbobzejSoE&Km6uf{O+3ig}-0< zziygc-L@n&*|qoJC$P+JfwCaAqx5U$)*Jbzq?TYuG&Auytx6Ksq^gnuC z$EJBttqzJ3YAs@ASjMpJo&3RI*+_|y6rH~AHob~ywEV5 z7mbtGi_Mn1`JY4EcGAZ+=YLr8M`^xrXl74yw*~x zX%+pF5}!@%{z@%WmR_|*Q(~!5gt_v8)TwejVIQWpT~cJo=)Ei1xI3CX|4!jq%lmq| zo=GOQb)U}OS+o9+&61$JM{pvP+lO{J;O+e@QcvKYz9j2LskDoH{S&kJi$}iH~@h1#ewQ{!(iD`NYgk+2tmG@3eg@*!{&^ zr(E1t{K1Kwgm=_+^a>C z+_nq5rAJP>7_(>sH^apE2Fu2_&Vr|t_!`=OFZ!}MFWKPlYxeWoA8Q_dZF%Kw>D#aO zE;;WDt}FYnZewAM;q-G%UYoCVl`J^m#oTtJ)jR#cuGFOwp@KoG8eJ`y9_GBw_rVED4Dxz;K`L< zH%mVDI(#}`s@>+8PxnJssqJz`8&}3Z2xk^L|IOh4BmL$t(;as1kW=Kl0s65`0 zlPMW?U24T9PF}+U0uFA5eNQ;NA2YHT@4J=vsB>DK#p1^kf}Di@L`0S-Jd@cOyyR57 z<@C<7ntx60|Mbpx&c60OX8OrXU;X^%&-PAt{yB4&q@Y8?A~O$;5EWmOGg_{$4-^8V z=7cY?{VR8j{c?_b&lcH*`zl-yP5toQ__N~wh~tZ6x39VTbDRB(xJ|7avqOKp_Wl0P z?9q>Btc#Mq{rZxy?Ud~Kq@rau|Kb^WB(+5RXHSTjH7QMR#nq!A-G7}|U-9DO z`x2}6xWF?!ioP58{@MAz690GZ_`L5k6leV29{0?BmEF4vi_@OZbDsVZOfz$wpds~) zQG=-_k>k4G5t-XuWs)-+-L3NXJP2f9y!Ytiw!e>$u37fVz`|dfBa|uk>8}{DpV*h=f%Llz~JfX=d#Wzp$P!V C42%W< diff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml deleted file mode 100644 index 927514dd215..00000000000 --- a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Pharo image file - Fichier d'image Pharo - - - - diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 1a24ecd274e..75ce2ff771c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - src = ./resources; + unpackPhase = "true"; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $prefix/lib - cp -R "$src/"* "$prefix/" - unzip ${sources10Zip} -d $prefix/lib/ unzip ${sources20Zip} -d $prefix/lib/ unzip ${sources30Zip} -d $prefix/lib/ From bc069315cb730c96872e5e9ae7fa4c88d6758279 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 21 Apr 2019 11:06:03 -0500 Subject: [PATCH 022/637] hostapd: 2.7 -> 2.8 --- pkgs/os-specific/linux/hostapd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b1b5401b88d..73174779c8c 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; + sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj"; }; nativeBuildInputs = [ pkgconfig ]; From 5fbf3067607ea85240987a7238fe69150c45508c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 23 Apr 2019 14:04:40 +0200 Subject: [PATCH 023/637] nixos/icingaweb2: Fix environment.etc assignment --- nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 644aad82df2..910e1d937bf 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -215,7 +215,7 @@ in { # /etc/icingaweb2 environment.etc = let - doModule = name: optionalAttrs (cfg.modules."${name}".enable) (nameValuePair "icingaweb2/enabledModules/${name}" { source = "${pkgs.icingaweb2}/modules/${name}"; }); + doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; in {} # Module packages // (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages) From c01ea27ce356e1433da01a7b46ba40c880f2f2ac Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 25 Apr 2019 12:08:20 +0000 Subject: [PATCH 024/637] nixos-generate-config: do not build btrfs-tools when btrfs is not used cross-compilation of `btrfs-tools` is broken, and this usually needless dependency of each system closure on `btrfs-tools` prevents cross-compilation of whole system closures --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 00c4d5018bf..59eb4a63af4 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -36,7 +36,7 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - path = [ pkgs.btrfs-progs ]; + path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; inherit (config.system.nixos) release; }; From d4cd164082df917745d6b6ab2f0f2a1427e499de Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 25 Apr 2019 22:54:11 +0200 Subject: [PATCH 025/637] nixos/tinc: remove ordering dependency on network.target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows configuring IP addresses on a tinc interface using networking.interfaces."tinc.${n}".ipv[46].addresses. Previously, this would fail with timeouts, because of the dependency chain tinc.${netname}.service --after--> network.target --after--> network-addresses-tinc.${n}.service (and network-link-…) --after--> sys-subsystem-net-devices-tinc.${n}.device But the network interface doesn't exist until tinc creates it! So systemd waits in vain for the interface to appear, and by then the network-addresses-* and network-link-* units have failed. This leads to the network link not being brought up and the network addresses not being assigned, which in turn stops tinc from actually working. --- nixos/modules/services/networking/tinc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 3379efd1afc..e98aafc2093 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -153,7 +153,6 @@ in ({ description = "Tinc Daemon - ${network}"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; path = [ data.package ]; restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]; serviceConfig = { From f052db16e48391a77cbe14a872bc9f54f06dd411 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 13:32:49 -0500 Subject: [PATCH 026/637] editline: fix crash with term narrower than completions Fixes issue mentioned on #nixos earlier today by @edef1c. --- pkgs/development/libraries/editline/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 4e228f8f432..161d85b02bf 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch"; sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw"; }) + # PR24 + (fetchpatch { + name = "fix-narrow-term-crash.patch"; + url = https://github.com/troglobit/editline/pull/24/commits/8660aef4b795fbd46a86dca804f067a81757c5df.patch; + sha256 = "0pcz1f141qv78xbq09yh0zfcjiqyavr66snz1hvxzvi8x0vixc4i"; + }) ]; nativeBuildInputs = [ autoreconfHook ]; From 786f02f7a45621b9f628f63649ff92546aff83b7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 24 Apr 2019 05:48:22 +0200 Subject: [PATCH 027/637] treewide: Remove usage of isNull isNull "is deprecated; just write e == null instead" says the Nix manual --- lib/generators.nix | 2 +- lib/sources.nix | 4 ++-- lib/trivial.nix | 2 +- nixos/maintainers/option-usages.nix | 2 +- .../config/fonts/fontconfig-penultimate.nix | 2 +- nixos/modules/config/fonts/fontconfig.nix | 2 +- nixos/modules/config/sysctl.nix | 2 +- nixos/modules/installer/cd-dvd/iso-image.nix | 4 ++-- nixos/modules/programs/bash/bash.nix | 2 +- nixos/modules/programs/fish.nix | 2 +- nixos/modules/programs/ssmtp.nix | 2 +- nixos/modules/programs/zsh/zsh.nix | 2 +- nixos/modules/services/backup/znapzend.nix | 4 ++-- .../services/cluster/kubernetes/kubelet.nix | 6 ++--- .../services/cluster/kubernetes/pki.nix | 2 +- .../buildkite-agent.nix | 2 +- .../jenkins/default.nix | 2 +- .../modules/services/databases/cassandra.nix | 22 +++++++------------ .../services/databases/cockroachdb.nix | 4 ++-- nixos/modules/services/databases/pgmanage.nix | 4 ++-- .../services/games/minecraft-server.nix | 4 ++-- nixos/modules/services/logging/logcheck.nix | 2 +- nixos/modules/services/mail/dovecot.nix | 12 +++++----- nixos/modules/services/misc/bepasty.nix | 2 +- nixos/modules/services/misc/errbot.nix | 2 +- .../services/misc/taskserver/default.nix | 4 ++-- nixos/modules/services/misc/zoneminder.nix | 2 +- .../modules/services/monitoring/graphite.nix | 4 ++-- nixos/modules/services/networking/flannel.nix | 2 +- nixos/modules/services/networking/i2pd.nix | 8 +++---- .../strongswan-swanctl/param-constructors.nix | 2 +- .../strongswan-swanctl/param-lib.nix | 4 ++-- nixos/modules/services/search/kibana.nix | 2 +- .../services/security/oauth2_proxy.nix | 8 +++---- nixos/modules/services/web-apps/miniflux.nix | 2 +- .../services/web-apps/restya-board.nix | 12 +++++----- .../web-servers/apache-httpd/default.nix | 2 +- .../virtualisation/docker-containers.nix | 6 ++--- .../virtualisation/google-compute-image.nix | 2 +- pkgs/applications/audio/renoise/default.nix | 4 ++-- .../networking/mailreaders/lumail/default.nix | 2 +- .../science/math/cplex/default.nix | 2 +- .../science/math/sage/sage-with-env.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/build-support/emacs/melpa.nix | 2 +- .../haskell-modules/make-package-set.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/stdenv/adapters.nix | 2 +- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 2 +- pkgs/tools/security/b2sum/default.nix | 2 +- pkgs/tools/system/osquery/default.nix | 2 +- 52 files changed, 89 insertions(+), 95 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 863ba847423..a71654bec6c 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -178,7 +178,7 @@ rec { toPlist = {}: v: let isFloat = builtins.isFloat or (x: false); expr = ind: x: with builtins; - if isNull x then "" else + if x == null then "" else if isBool x then bool ind x else if isInt x then int ind x else if isString x then str ind x else diff --git a/lib/sources.nix b/lib/sources.nix index f02ddad17c6..0ffadea8f1b 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -83,7 +83,7 @@ rec { # Sometimes git stores the commitId directly in the file but # sometimes it stores something like: «ref: refs/heads/branch-name» matchRef = match "^ref: (.*)$" fileContent; - in if isNull matchRef + in if matchRef == null then fileContent else readCommitFromFile (lib.head matchRef) path # Sometimes, the file isn't there at all and has been packed away in the @@ -92,7 +92,7 @@ rec { then let fileContent = readFile packedRefsName; matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent; - in if isNull matchRef + in if matchRef == null then throw ("Could not find " + file + " in " + packedRefsName) else lib.head matchRef else throw ("Not a .git directory: " + path); diff --git a/lib/trivial.nix b/lib/trivial.nix index 2d682961035..f2710a6f033 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -112,7 +112,7 @@ rec { # Function to call f: # Argument to check for null before passing it to `f` - a: if isNull a then a else f a; + a: if a == null then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 242c2a4dd44..a67a0ab960e 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -145,7 +145,7 @@ let displayOptionsGraph = let checkList = - if !(isNull testOption) then [ testOption ] + if testOption != null then [ testOption ] else testOptions; checkAll = checkList == []; in diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 2c18244621a..04fa8b9559a 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -31,7 +31,7 @@ let # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index d79c43c0b5b..724158f7382 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -46,7 +46,7 @@ let cfg = config.fonts.fontconfig; # use latest when no version is passed makeCacheConf = { version ? null }: let - fcPackage = if builtins.isNull version + fcPackage = if version == null then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 74bff602a47..0c6a7e2431a 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -8,7 +8,7 @@ let name = "sysctl option value"; check = val: let - checkType = x: isBool x || isString x || isInt x || isNull x; + checkType = x: isBool x || isString x || isInt x || x == null; in checkType val || (val._type or "" == "override" && checkType val.content); merge = loc: defs: mergeOneOption loc (filterOverrides defs); diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index fd780be2082..d5c92cfc1d9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -198,7 +198,7 @@ let fi ${ # When there is a theme configured, use it, otherwise use the background image. - if (!isNull config.isoImage.grubTheme) then '' + if config.isoImage.grubTheme != null then '' # Sets theme. set theme=(hd0)/EFI/boot/grub-theme/theme.txt # Load theme fonts @@ -622,7 +622,7 @@ in { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (!isNull config.isoImage.grubTheme) [ + ] ++ optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 27b5f9e4b64..a7e57b8608d 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -34,7 +34,7 @@ let bashAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 622d2f96fe4..87f6816e4ac 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -10,7 +10,7 @@ let fishAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 44756171b74..0e060e3f522 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -148,7 +148,7 @@ in UseSTARTTLS=${yesNo cfg.useSTARTTLS} #Debug=YES ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} - ${optionalString (!isNull cfg.authPassFile) "AuthPassFile=${cfg.authPassFile}"} + ${optionalString (cfg.authPassFile != null) "AuthPassFile=${cfg.authPassFile}"} ''; environment.systemPackages = [pkgs.ssmtp]; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b7117e5f90d..bdb37eae23e 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -12,7 +12,7 @@ let zshAliases = concatStringsSep "\n" ( mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") - (filterAttrs (k: v: !isNull v) cfg.shellAliases) + (filterAttrs (k: v: v != null) cfg.shellAliases) ); in diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index fc8a424190f..f3aa5074e42 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -255,7 +255,7 @@ let cfg = config.services.znapzend; onOff = b: if b then "on" else "off"; - nullOff = b: if isNull b then "off" else toString b; + nullOff = b: if b == null then "off" else toString b; stripSlashes = replaceStrings [ "/" ] [ "." ]; attrsToFile = config: concatStringsSep "\n" (builtins.attrValues ( @@ -263,7 +263,7 @@ let mkDestAttrs = dst: with dst; mapAttrs' (n: v: nameValuePair "dst_${label}${n}" v) ({ - "" = optionalString (! isNull host) "${host}:" + dataset; + "" = optionalString (host != null) "${host}:" + dataset; _plan = plan; } // optionalAttrs (presend != null) { _precmd = presend; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 2a4a0624555..ccc8a16e788 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -7,9 +7,9 @@ let cfg = top.kubelet; cniConfig = - if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + if cfg.cni.config != [] && cfg.cni.configDir != null then throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.cni.configDir) then + else if cfg.cni.configDir != null then cfg.cni.configDir else (pkgs.buildEnv { @@ -373,7 +373,7 @@ in boot.kernelModules = ["br_netfilter"]; services.kubernetes.kubelet.hostname = with config.networking; - mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + mkDefault (hostName + optionalString (domain != null) ".${domain}"); services.kubernetes.pki.certs = with top.lib; { kubelet = mkCert { diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 32eacad9025..e68660e8bdd 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -285,7 +285,7 @@ in }; }; - environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null) (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig); environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 2136778aff4..12cc3d2b1cc 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -236,7 +236,7 @@ in }; assertions = [ - { assertion = cfg.hooksPath == hooksDir || all isNull (attrValues cfg.hooks); + { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks); message = '' Options `services.buildkite-agent.hooksPath' and `services.buildkite-agent.hooks.' are mutually exclusive. diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1eca45fbd57..ec6a36413fe 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -189,7 +189,7 @@ in { preStart = let replacePlugins = - if isNull cfg.plugins + if cfg.plugins == null then "" else let pluginCmds = lib.attrsets.mapAttrsToList diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index d741ee48c48..68893886802 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -22,11 +22,11 @@ let else {}) ); cassandraConfigWithAddresses = cassandraConfig // - ( if isNull cfg.listenAddress + ( if cfg.listenAddress == null then { listen_interface = cfg.listenInterface; } else { listen_address = cfg.listenAddress; } ) // ( - if isNull cfg.rpcAddress + if cfg.rpcAddress == null then { rpc_interface = cfg.rpcInterface; } else { rpc_address = cfg.rpcAddress; } ); @@ -219,19 +219,13 @@ in { config = mkIf cfg.enable { assertions = [ { assertion = - ((isNull cfg.listenAddress) - || (isNull cfg.listenInterface) - ) && !((isNull cfg.listenAddress) - && (isNull cfg.listenInterface) - ); + (cfg.listenAddress == null || cfg.listenInterface == null) + && !(cfg.listenAddress == null && cfg.listenInterface == null); message = "You have to set either listenAddress or listenInterface"; } { assertion = - ((isNull cfg.rpcAddress) - || (isNull cfg.rpcInterface) - ) && !((isNull cfg.rpcAddress) - && (isNull cfg.rpcInterface) - ); + (cfg.rpcAddress == null || cfg.rpcInterface == null) + && !(cfg.rpcAddress == null && cfg.rpcInterface == null); message = "You have to set either rpcAddress or rpcInterface"; } ]; @@ -276,7 +270,7 @@ in { }; }; systemd.timers.cassandra-full-repair = - mkIf (!isNull cfg.fullRepairInterval) { + mkIf (cfg.fullRepairInterval != null) { description = "Schedule full repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = @@ -300,7 +294,7 @@ in { }; }; systemd.timers.cassandra-incremental-repair = - mkIf (!isNull cfg.incrementalRepairInterval) { + mkIf (cfg.incrementalRepairInterval != null) { description = "Schedule incremental repairs on Cassandra"; wantedBy = [ "timers.target" ]; timerConfig = diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index e977751b21e..268fdcc819f 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -7,7 +7,7 @@ let crdb = cfg.package; escape = builtins.replaceStrings ["%"] ["%%"]; - ifNotNull = v: s: optionalString (!isNull v) s; + ifNotNull = v: s: optionalString (v != null) s; startupCommand = lib.concatStringsSep " " [ # Basic startup @@ -164,7 +164,7 @@ in config = mkIf config.services.cockroachdb.enable { assertions = [ - { assertion = !cfg.insecure -> !(isNull cfg.certsDir); + { assertion = !cfg.insecure -> cfg.certsDir != null; message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)"; } ]; diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 1a34c7f5ece..1050c2dd481 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -16,7 +16,7 @@ let super_only = ${builtins.toJSON cfg.superOnly} - ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"} + ${optionalString (cfg.loginGroup != null) "login_group = ${cfg.loginGroup}"} login_timeout = ${toString cfg.loginTimeout} @@ -24,7 +24,7 @@ let sql_root = ${cfg.sqlRoot} - ${optionalString (!isNull cfg.tls) '' + ${optionalString (cfg.tls != null) '' tls_cert = ${cfg.tls.cert} tls_key = ${cfg.tls.key} ''} diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 7d26d150165..39a68f4b553 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -215,8 +215,8 @@ in { networking.firewall = mkIf cfg.openFirewall (if cfg.declarative then { allowedUDPPorts = [ serverPort ]; allowedTCPPorts = [ serverPort ] - ++ optional (! isNull queryPort) queryPort - ++ optional (! isNull rconPort) rconPort; + ++ optional (queryPort != null) queryPort + ++ optional (rconPort != null) rconPort; } else { allowedUDPPorts = [ defaultServerPort ]; allowedTCPPorts = [ defaultServerPort ]; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 9c64160e92b..f139190a170 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -227,7 +227,7 @@ in ''; services.cron.systemCronJobs = - let withTime = name: {timeArgs, ...}: ! (builtins.isNull timeArgs); + let withTime = name: {timeArgs, ...}: timeArgs != null; mkCron = name: {user, cmdline, timeArgs, ...}: '' ${timeArgs} ${user} ${cmdline} ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 30ad7d82fb8..139011dca23 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -16,13 +16,13 @@ let sendmail_path = /run/wrappers/bin/sendmail '' - (if isNull cfg.sslServerCert then '' + (if cfg.sslServerCert == null then '' ssl = no disable_plaintext_auth = no '' else '' ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} - ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} ssl_dh = <${config.security.dhparams.params.dovecot2.path} disable_plaintext_auth = yes '') @@ -298,7 +298,7 @@ in config = mkIf cfg.enable { security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - security.dhparams = mkIf (! isNull cfg.sslServerCert) { + security.dhparams = mkIf (cfg.sslServerCert != null) { enable = true; params.dovecot2 = {}; }; @@ -384,14 +384,14 @@ in { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; } - { assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey - && (!(isNull cfg.sslCACert) -> !(isNull cfg.sslServerCert || isNull cfg.sslServerKey)); + { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) + && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto"; } { assertion = cfg.showPAMFailure -> cfg.enablePAM; message = "dovecot is configured with showPAMFailure while enablePAM is disabled"; } - { assertion = (cfg.sieveScripts != {}) -> ((cfg.mailUser != null) && (cfg.mailGroup != null)); + { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null); message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set"; } ]; diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index 006feca42b3..87d36068144 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -143,7 +143,7 @@ in serviceConfig = { Type = "simple"; PrivateTmp = true; - ExecStartPre = assert !isNull server.secretKeyFile; pkgs.writeScript "bepasty-server.${name}-init" '' + ExecStartPre = assert server.secretKeyFile != null; pkgs.writeScript "bepasty-server.${name}-init" '' #!/bin/sh mkdir -p "${server.workDir}" mkdir -p "${server.dataDir}" diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index ac6ba2181de..256adce2f02 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -81,7 +81,7 @@ in { systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let - dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else + dataDir = if instanceCfg.dataDir != null then instanceCfg.dataDir else "/var/lib/errbot/${name}"; in { after = [ "network-online.target" ]; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 483bc99ad94..07dbee69db0 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -48,7 +48,7 @@ let type = types.nullOr types.int; default = null; example = 365; - apply = val: if isNull val then -1 else val; + apply = val: if val == null then -1 else val; description = mkAutoDesc '' The expiration time of ${desc} in days or null for no expiration time. @@ -82,7 +82,7 @@ let then attrByPath newPath (notFound newPath) cfg.pki.manual else findPkiDefinitions newPath val; in flatten (mapAttrsToList mkSublist attrs); - in all isNull (findPkiDefinitions [] manualPkiOptions); + in all (x: x == null) (findPkiDefinitions [] manualPkiOptions); orgOptions = { ... }: { options.users = mkOption { diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 2bd2f3c7cc0..01720ba432e 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -17,7 +17,7 @@ let defaultDir = "/var/lib/${user}"; home = if useCustomDir then cfg.storageDir else defaultDir; - useCustomDir = !(builtins.isNull cfg.storageDir); + useCustomDir = cfg.storageDir != null; socket = "/run/phpfpm/${dirName}.sock"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 2365142af40..d6473220c14 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -19,13 +19,13 @@ let graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( "STATIC_ROOT = '${staticDir}'\n" + - optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n" + optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + cfg.web.extraConfig ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' search_index: ${dataDir}/index - ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} + ${optionalString (config.time.timeZone != null) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index c1f778ac139..dd2f6454e95 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -92,7 +92,7 @@ in { Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; type = types.nullOr types.str; - default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}"); + default = with config.networking; (hostName + optionalString (domain != null) ".${domain}"); example = "node1.example.com"; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 40478b85b75..f2be417738e 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -12,9 +12,9 @@ let boolOpt = k: v: k + " = " + boolToString v; intOpt = k: v: k + " = " + toString v; lstOpt = k: xs: k + " = " + concatStringsSep "," xs; - optionalNullString = o: s: optional (! isNull s) (strOpt o s); - optionalNullBool = o: b: optional (! isNull b) (boolOpt o b); - optionalNullInt = o: i: optional (! isNull i) (intOpt o i); + optionalNullString = o: s: optional (s != null) (strOpt o s); + optionalNullBool = o: b: optional (b != null) (boolOpt o b); + optionalNullInt = o: i: optional (i != null) (intOpt o i); optionalEmptyList = o: l: optional ([] != l) (lstOpt o l); mkEnableTrueOption = name: mkEnableOption name // { default = true; }; @@ -225,7 +225,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh exec ${pkgs.i2pd}/bin/i2pd \ - ${if isNull cfg.address then "" else "--host="+cfg.address} \ + ${if cfg.address == null then "" else "--host="+cfg.address} \ --service \ --conf=${i2pdConf} \ --tunconf=${tunnelConf} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 5e74a96664f..95a174122d0 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -56,7 +56,7 @@ rec { }; documentDefault = description : strongswanDefault : - if isNull strongswanDefault + if strongswanDefault == null then description else description + '' diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix index fb87e81f321..193ad27f035 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -45,10 +45,10 @@ rec { filterEmptySets ( (mapParamsRecursive (path: name: param: let value = attrByPath path null cfg; - in optionalAttrs (!isNull value) (param.render name value) + in optionalAttrs (value != null) (param.render name value) ) ps)); - filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + filterEmptySets = set : filterAttrs (n: v: (v != null)) (mapAttrs (name: value: if isAttrs value then let value' = filterEmptySets value; in if value' == {} diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 2a6e8250850..c096af731ad 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -129,7 +129,7 @@ in { This defaults to the singleton list [ca] when the option is defined. ''; - default = if isNull cfg.elasticsearch.ca then [] else [ca]; + default = if cfg.elasticsearch.ca == null then [] else [ca]; type = types.listOf types.path; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 0c5fe8c0ef5..61f203ef9e7 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -58,11 +58,11 @@ let httponly = cookie.httpOnly; }; set-xauthrequest = setXauthrequest; - } // lib.optionalAttrs (!isNull cfg.email.addresses) { + } // lib.optionalAttrs (cfg.email.addresses != null) { authenticated-emails-file = authenticatedEmailsFile; } // lib.optionalAttrs (cfg.passBasicAuth) { basic-auth-password = cfg.basicAuthPassword; - } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + } // lib.optionalAttrs (cfg.htpasswd.file != null) { display-htpasswd-file = cfg.htpasswd.displayForm; } // lib.optionalAttrs tls.enable { tls-cert = tls.certificate; @@ -71,7 +71,7 @@ let } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; mapConfig = key: attr: - if (!isNull attr && attr != []) then ( + if attr != null && attr != [] then ( if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else @@ -538,7 +538,7 @@ in config = mkIf cfg.enable { - services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + services.oauth2_proxy = mkIf (cfg.keyFile != null) { clientID = mkDefault null; clientSecret = mkDefault null; cookie.secret = mkDefault null; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 1d60004e574..304712d0efc 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -85,7 +85,7 @@ in DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if isNull cfg.adminCredentialsFile + EnvironmentFile = if cfg.adminCredentialsFile == null then defaultCredentials else cfg.adminCredentialsFile; }; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 15fd943a082..2e5e0ea6622 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -184,7 +184,7 @@ in phpOptions = '' date.timezone = "CET" - ${optionalString (!isNull cfg.email.server) '' + ${optionalString (cfg.email.server != null) '' SMTP = ${cfg.email.server} smtp_port = ${toString cfg.email.port} auth_username = ${cfg.email.login} @@ -282,7 +282,7 @@ in sed -i "s@^php@${config.services.phpfpm.phpPackage}/bin/php@" "${runDir}/server/php/shell/"*.sh - ${if (isNull cfg.database.host) then '' + ${if (cfg.database.host == null) then '' sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', 'localhost');/g" "${runDir}/server/php/config.inc.php" sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php" '' else '' @@ -311,7 +311,7 @@ in chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" - ${optionalString (isNull cfg.database.host) '' + ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ ${config.services.postgresql.package}/bin/psql -U ${config.services.postgresql.superUser} \ @@ -367,14 +367,14 @@ in }; users.groups.restya-board = {}; - services.postgresql.enable = mkIf (isNull cfg.database.host) true; + services.postgresql.enable = mkIf (cfg.database.host == null) true; - services.postgresql.identMap = optionalString (isNull cfg.database.host) + services.postgresql.identMap = optionalString (cfg.database.host == null) '' restya-board-users restya-board restya_board ''; - services.postgresql.authentication = optionalString (isNull cfg.database.host) + services.postgresql.authentication = optionalString (cfg.database.host == null) '' local restya_board all ident map=restya-board-users ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 8f00f81b078..a8fb11f114e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -690,7 +690,7 @@ in ; Don't advertise PHP expose_php = off - '' + optionalString (!isNull config.time.timeZone) '' + '' + optionalString (config.time.timeZone != null) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix index c4e47bfa477..9e3d06ef07e 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -177,13 +177,13 @@ let "--rm" "--name=%n" "--log-driver=${container.log-driver}" - ] ++ optional (! isNull container.entrypoint) + ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}" + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}" + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" ++ map escapeShellArg container.extraDockerOptions ++ [container.image] ++ map escapeShellArg container.cmd diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 0d2d25d3075..d172ae38fdc 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -51,7 +51,7 @@ in popd ''; format = "raw"; - configFile = if isNull cfg.configFile then defaultConfigFile else cfg.configFile; + configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; inherit (cfg) diskSize; inherit config lib pkgs; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 081c4ab41ac..ddbefd129ff 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { else releasePath else if stdenv.hostPlatform.system == "i686-linux" then - if builtins.isNull releasePath then + if releasePath == null then fetchurl { url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2"; sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769"; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 79deab46912..bc0918737dd 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -10,7 +10,7 @@ let alternativeConfig = builtins.toFile "lumail2.lua" (builtins.readFile alternativeGlobalConfigFilePath); - globalConfig = if isNull alternativeGlobalConfigFilePath then '' + globalConfig = if alternativeGlobalConfigFilePath == null then '' mkdir -p $out/etc/lumail2 cp global.config.lua $out/etc/lumail2.lua for n in ./lib/*.lua; do diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index dae5e1b76d3..dc0e9ea1aa5 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "128"; src = - if builtins.isNull releasePath then + if releasePath == null then throw '' This nix expression requires that the cplex installer is already downloaded to your machine. Get it from IBM: diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 18060f342a9..5bb7eda47d5 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -59,7 +59,7 @@ let # return the names of all dependencies in the transitive closure transitiveClosure = dep: - if isNull dep then + if dep == null then # propagatedBuildInputs might contain null # (although that might be considered a programming error in the derivation) [] diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 91fd7eab126..b9976e54019 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -59,7 +59,7 @@ let self = rec { extraRuntimeDependencies = [ ]; installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + ${if sourceDir == null then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 96e61bbf90e..e2ec84c75e6 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ ename = - if isNull(ename) + if ename == null then pname else ename; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6b5ecc1df8a..0d579b1681b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -120,7 +120,7 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let - sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; + sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 2b9d048f77e..4c3a2b2d588 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -7,7 +7,7 @@ with import ./util.nix { inherit lib; }; -stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { +stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { inherit name src configureFlags; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7823d641344..a384e5470e4 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -128,7 +128,7 @@ rec { with the following function: isFree = license: with builtins; - if isNull license then true + if license == null then true else if isList license then lib.all isFree license else license != "non-free" && license != "unfree"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b7d8e3ba523..5930a8203cb 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -81,7 +81,7 @@ in rec { bintools = { name = "${name}-binutils"; outPath = bootstrapTools; }; }; - cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { + cc = if last == null then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenvNoCC; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2bccd620436..390c7f1123e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -96,7 +96,7 @@ let inherit system; }; - cc = if isNull prevStage.gcc-unwrapped + cc = if prevStage.gcc-unwrapped == null then null else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index f9d2855e739..16811d8f889 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openmp ]; - buildFlags = [ (optional (isNull openmp) "NO_OPENMP=1") ]; + buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ]; installFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 1e2882e1f1f..1c1da724676 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = let gflags' = google-gflags.overrideAttrs (old: { - cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; + cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); # use older `lvm2` source for osquery, the 2.03 sourcetree From c29b17eecbeb0798ff3148c3a23978261f3348df Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 00:55:11 -0500 Subject: [PATCH 028/637] qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently --- .../libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff | 4 ++-- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff index 14199d40503..d2ebbf3b45a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -20,7 +20,7 @@ index 2fe69d1..b658e4a 100644 // The code below has the same effect as this one: // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; @@ -46,7 +46,7 @@ index b8c8f2a..e7f4dc5 100644 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); if (!library.load()) return 0; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6b43f6ed25c..2a474ab0ffe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -58,7 +58,8 @@ qtModule { ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' + # this file used to exist in gdk_pixbuf? + ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; From 41e9920fcbe592310b2949ff28ebf689a0c74286 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 29 Apr 2019 12:07:03 -0500 Subject: [PATCH 029/637] remove unused substitution variable Thanks @worldofpeace! --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8715aaaa44d..ef01e5b5386 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { ++ lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; From 44a554792d58f8bf1239ab3cd8892ac9f1e693ff Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 30 Apr 2019 18:55:17 +0200 Subject: [PATCH 030/637] timetrap: use bundlerApp --- pkgs/applications/office/timetrap/Gemfile.lock | 2 +- pkgs/applications/office/timetrap/default.nix | 18 ++++++++---------- pkgs/applications/office/timetrap/gemset.nix | 8 ++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index f71f4eaa408..9f2ea82cee0 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 20dd27fa287..ad0d5c636f3 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,17 +1,15 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp }: -bundlerEnv rec { - name = "timetrap-${version}"; - - version = (import gemset).timetrap.version; - inherit ruby; +bundlerApp { + pname = "timetrap"; gemdir = ./.; - gemset = ./gemset.nix; + exes = [ "timetrap" ]; meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; - license = licenses.mit; - maintainers = [ maintainers.jerith666 ]; + homepage = https://github.com/samg/timetrap; + license = licenses.mit; + maintainers = with maintainers; [ jerith666 manveru ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 5764016573f..1ea489b92c3 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -8,6 +10,8 @@ version = "0.10.2"; }; sequel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; @@ -16,6 +20,8 @@ version = "4.43.0"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; @@ -25,6 +31,8 @@ }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; From 1478feb7aa4bb3a963dba7afd73af61d24fa4234 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 30 Apr 2019 22:10:11 -0600 Subject: [PATCH 031/637] doc: Explain the nginx ETag patch https://github.com/NixOS/nixpkgs/issues/25485 --- doc/package-notes.xml | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 12d81ae29bf..54f3079d554 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -918,4 +918,52 @@ citrix_receiver.override { +

+ Nginx + + + Nginx is a + reverse proxy and lightweight webserver. + + +
+ ETags on static files served from the Nix store + + + HTTP has a couple different mechanisms for caching to prevent + clients from having to download the same content repeatedly + if a resource has not changed since the last time it was requested. + When nginx is used as a server for static files, it implements + the caching mechanism based on the + Last-Modified + response header automatically; unfortunately, it works by using + filesystem timestamps to determine the value of the + Last-Modified header. This doesn't give the + desired behavior when the file is in the Nix store, because all + file timestamps are set to 0 (for reasons related to build + reproducibility). + + + + Fortunately, HTTP supports an alternative (and more effective) + caching mechanism: the + ETag + response header. The value of the ETag header + specifies some identifier for the particular content that the + server is sending (e.g. a hash). When a client makes a second + request for the same resource, it sends that value back in an + If-None-Match header. If the ETag value is + unchanged, then the server does not need to resend the content. + + + + As of NixOS 19.09, the nginx package in Nixpkgs is patched such + that when nginx serves a file out of /nix/store, + the hash in the store path is used as the ETag + header in the HTTP response, thus providing proper caching functionality. + This happens automatically; you do not need to do modify any + configuration to get this behavior. + +
+
From 688f61b018faf7daa508db63cb166404512a4c28 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Wed, 1 May 2019 23:29:34 +0200 Subject: [PATCH 032/637] pythonPackages.tld: init at 0.9.3 --- .../python-modules/tld/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/tld/default.nix diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix new file mode 100644 index 00000000000..85991af4ba1 --- /dev/null +++ b/pkgs/development/python-modules/tld/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "tld"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp"; + }; + + doCheck = false; + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/barseghyanartur/tld; + description = "Extracts the top level domain (TLD) from the URL given"; + license = licenses.lgpl21; + maintainers = with maintainers; [ genesis ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85c961a40e9..049d1c85335 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5396,6 +5396,8 @@ in { textacy = callPackage ../development/python-modules/textacy { }; + tld = callPackage ../development/python-modules/tld { }; + tldextract = callPackage ../development/python-modules/tldextract { }; pyemd = callPackage ../development/python-modules/pyemd { }; From 3a1792e7a14a1a74615c19c7fcf262e39b715a26 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Wed, 1 May 2019 23:31:04 +0200 Subject: [PATCH 033/637] photon: 1.0.7 -> 1.3.0 --- pkgs/tools/networking/photon/default.nix | 28 ++++++++++-------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index aa5a3e9f6f1..5b923748c67 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -1,32 +1,26 @@ -{ stdenv, pythonPackages, fetchurl, makeWrapper }: +{ stdenv, python3Packages, fetchFromGitHub, makeWrapper }: -with pythonPackages; -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "photon"; - version = "1.0.7"; + version = "1.3.0"; - src = fetchurl { - url = "https://github.com/s0md3v/Photon/archive/v${version}.tar.gz"; - sha256 = "0c5l1sbkkagfxmh8v7yvi6z58mhqbwjyr7fczb5qwxm7la42ah9y"; + src = fetchFromGitHub { + owner = "s0md3v"; + repo = "Photon"; + rev = "v${version}"; + sha256 = "02z1xj72bq35dilr4b6njry4kixz6j2a3ag02nla98q0fvgmgnvy"; }; - patches = [ ./destdir.patch ]; - postPatch = '' - substituteInPlace photon.py --replace DESTDIR $out/share/photon - ''; - dontBuild = true; doCheck = false; - propagatedBuildInputs = [ - requests - urllib3 - ]; + + propagatedBuildInputs = with python3Packages; [ requests urllib3 tld ]; installPhase = '' mkdir -p "$out"/{bin,share/photon} cp -R photon.py core plugins $out/share/photon - makeWrapper ${python.interpreter} $out/bin/photon \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --add-flags "-O $out/share/photon/photon.py" ''; From 7a22dc48156a8db600240cdfd617f1ca1667a1b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 May 2019 23:56:49 +0200 Subject: [PATCH 034/637] pythonPackages.tld: enable tests --- .../python-modules/tld/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 85991af4ba1..3a21ce57fe7 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, six }: +{ stdenv, fetchPypi, python }: -buildPythonPackage rec { +python.pkgs.buildPythonPackage rec { pname = "tld"; version = "0.9.3"; @@ -9,8 +9,20 @@ buildPythonPackage rec { sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp"; }; - doCheck = false; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = with python.pkgs; [ six ]; + checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ]; + + # https://github.com/barseghyanartur/tld/issues/54 + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + "test_1_update_tld_names" + "test_1_update_tld_names_command" + "test_2_update_tld_names_module" + ]); + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -k '${disabledTests}' + ''; meta = with stdenv.lib; { homepage = https://github.com/barseghyanartur/tld; From 46194142ddfc8d6ee39179ce9eba4d0cf310e16c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:13:23 -0700 Subject: [PATCH 035/637] python37Packages.gphoto2: 1.9.0 -> 2.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-gphoto2/versions --- pkgs/development/python-modules/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 199f568322a..9d760b37d37 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "1.9.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7"; + sha256 = "01vcbjsy5zpfd9rzshk2d6150vhb66m5n420j0wd0k0i0p74ya98"; }; nativeBuildInputs = [ pkgconfig ]; From 39e686fe30aa222c8cc8bb6f8cbf8bf836879ace Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 23:01:35 -0700 Subject: [PATCH 036/637] python37Packages.jupyterlab: 0.35.4 -> 0.35.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-jupyterlab/versions --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6d9d2a6b309..db8c5b774e4 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "0.35.4"; + version = "0.35.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "deba0b2803640fcad72c61366bff11d5945173015961586d5e3b2f629ffeb455"; + sha256 = "2ec845845d51221e39d0d753884a19342c953f39febf3148a68631bf57ecb774"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; From c2708f9e9639e6edac1d34dc62bf17f52305c4cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 16:48:13 -0700 Subject: [PATCH 037/637] linuxPackages.vhba: 20190302 -> 20190410 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vhba/versions --- pkgs/misc/emulators/cdemu/vhba.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 2ce3f606d73..33c5d3cebf1 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20190302"; + version = "20190410"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "0wvxxc064i8czza91gh0dhmh55x2nbs7szzyh4g30w0c98hmc1n5"; + sha256 = "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; From eaeb587429d0fefeb39ee52fbe070dc4dd44984f Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 3 May 2019 13:38:25 +0300 Subject: [PATCH 038/637] moc: refactor options, add patches Add support for conditional compile options, add pulseaudio and ffmpeg4 support patches. --- pkgs/applications/audio/moc/default.nix | 93 +- pkgs/applications/audio/moc/moc-ffmpeg4.patch | 33 + pkgs/applications/audio/moc/pulseaudio.patch | 800 ++++++++++++++++++ 3 files changed, 917 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/audio/moc/moc-ffmpeg4.patch create mode 100644 pkgs/applications/audio/moc/pulseaudio.patch diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index ea83a1012eb..3ed330cc743 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,9 +1,35 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg -, libvorbis, libmpc, libsndfile, libjack2, db, libmodplug, timidity, libid3tag -, libtool +{ stdenv, fetchurl, pkgconfig +, ncurses, db , popt, libtool +# Sound sub-systems +, alsaSupport ? true, alsaLib +, pulseSupport ? true, libpulseaudio, autoreconfHook +, jackSupport ? true, libjack2 +, ossSupport ? true +# Audio formats +, aacSupport ? true, faad2, libid3tag +, flacSupport ? true, flac +, midiSupport ? true, timidity +, modplugSupport ? true, libmodplug +, mp3Support ? true, libmad +, musepackSupport ? true, libmpc, libmpcdec, taglib +, vorbisSupport ? true, libvorbis +, speexSupport ? true, speex +, ffmpegSupport ? true, ffmpeg +, sndfileSupport ? true, libsndfile +, wavpackSupport ? true, wavpack +# Misc +, withffmpeg4 ? false, ffmpeg_4 +, curlSupport ? true, curl +, samplerateSupport ? true, libsamplerate +, withDebug ? false }: -stdenv.mkDerivation rec { +let + opt = stdenv.lib.optional; + mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; + +in stdenv.mkDerivation rec { + name = "moc-${version}"; version = "2.5.2"; @@ -12,18 +38,67 @@ stdenv.mkDerivation rec { sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [] + ++ opt withffmpeg4 ./moc-ffmpeg4.patch + ++ opt pulseSupport ./pulseaudio.patch; - buildInputs = [ - ncurses alsaLib flac libmad speex ffmpeg libvorbis libmpc libsndfile libjack2 - db libmodplug timidity libid3tag libtool + nativeBuildInputs = [ pkgconfig ] + ++ opt pulseSupport autoreconfHook; + + buildInputs = [ ncurses db popt libtool ] + # Sound sub-systems + ++ opt alsaSupport alsaLib + ++ opt pulseSupport libpulseaudio + ++ opt jackSupport libjack2 + # Audio formats + ++ opt (aacSupport || mp3Support) libid3tag + ++ opt aacSupport faad2 + ++ opt flacSupport flac + ++ opt midiSupport timidity + ++ opt modplugSupport libmodplug + ++ opt mp3Support libmad + ++ opt musepackSupport [ libmpc libmpcdec taglib ] + ++ opt vorbisSupport libvorbis + ++ opt speexSupport speex + ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg + ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 + ++ opt sndfileSupport libsndfile + ++ opt wavpackSupport wavpack + # Misc + ++ opt curlSupport curl + ++ opt samplerateSupport libsamplerate; + + configureFlags = [ + # Sound sub-systems + (mkFlag alsaSupport "alsa") + (mkFlag pulseSupport "pulse") + (mkFlag jackSupport "jack") + (mkFlag ossSupport "oss") + # Audio formats + (mkFlag aacSupport "aac") + (mkFlag flacSupport "flac") + (mkFlag midiSupport "timidity") + (mkFlag modplugSupport "modplug") + (mkFlag mp3Support "mp3") + (mkFlag musepackSupport "musepack") + (mkFlag vorbisSupport "vorbis") + (mkFlag speexSupport "speex") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag sndfileSupport "sndfile") + (mkFlag wavpackSupport "wavpack") + # Misc + (mkFlag curlSupport "curl") + (mkFlag samplerateSupport "samplerate") + ("--enable-debug=" + (if withDebug then "yes" else "no")) + "--disable-cache" + "--without-rcc" ]; meta = with stdenv.lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = licenses.gpl2; - maintainers = with maintainers; [ pSub jagajaga ]; + maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/moc/moc-ffmpeg4.patch b/pkgs/applications/audio/moc/moc-ffmpeg4.patch new file mode 100644 index 00000000000..7499f9c539b --- /dev/null +++ b/pkgs/applications/audio/moc/moc-ffmpeg4.patch @@ -0,0 +1,33 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963) ++++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo) +@@ -697,7 +697,7 @@ + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -705,8 +705,8 @@ + } + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) + { +@@ -725,7 +725,7 @@ + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); diff --git a/pkgs/applications/audio/moc/pulseaudio.patch b/pkgs/applications/audio/moc/pulseaudio.patch new file mode 100644 index 00000000000..37d81dddf2b --- /dev/null +++ b/pkgs/applications/audio/moc/pulseaudio.patch @@ -0,0 +1,800 @@ +diff --git a/audio.c b/audio.c +--- a/audio.c ++++ b/audio.c +@@ -32,6 +32,9 @@ + #include "log.h" + #include "lists.h" + ++#ifdef HAVE_PULSE ++# include "pulse.h" ++#endif + #ifdef HAVE_OSS + # include "oss.h" + #endif +@@ -893,6 +896,15 @@ + } + #endif + ++#ifdef HAVE_PULSE ++ if (!strcasecmp(name, "pulseaudio")) { ++ pulse_funcs (funcs); ++ printf ("Trying PulseAudio...\n"); ++ if (funcs->init(&hw_caps)) ++ return; ++ } ++#endif ++ + #ifdef HAVE_OSS + if (!strcasecmp(name, "oss")) { + oss_funcs (funcs); +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -162,6 +162,21 @@ + AC_MSG_ERROR([BerkeleyDB (libdb) not found.])) + fi + ++AC_ARG_WITH(pulse, AS_HELP_STRING(--without-pulse, ++ Compile without PulseAudio support.)) ++ ++if test "x$with_pulse" != "xno" ++then ++ PKG_CHECK_MODULES(PULSE, [libpulse], ++ [SOUND_DRIVERS="$SOUND_DRIVERS PULSE" ++ EXTRA_OBJS="$EXTRA_OBJS pulse.o" ++ AC_DEFINE([HAVE_PULSE], 1, [Define if you have PulseAudio.]) ++ EXTRA_LIBS="$EXTRA_LIBS $PULSE_LIBS" ++ CFLAGS="$CFLAGS $PULSE_CFLAGS"], ++ [true]) ++fi ++ ++ + AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss], + [Compile without OSS support])) + +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -572,10 +572,11 @@ + + #ifdef OPENBSD + add_list ("SoundDriver", "SNDIO:JACK:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); ++ + #else + add_list ("SoundDriver", "Jack:ALSA:OSS", +- CHECK_DISCRETE(5), "SNDIO", "Jack", "ALSA", "OSS", "null"); ++ CHECK_DISCRETE(5), "SNDIO", "PulseAudio", "Jack", "ALSA", "OSS", "null"); + #endif + + add_str ("JackClientName", "moc", CHECK_NONE); +diff --git a/pulse.c b/pulse.c +new file mode 100644 +--- /dev/null ++++ b/pulse.c +@@ -0,0 +1,705 @@ ++/* ++ * MOC - music on console ++ * Copyright (C) 2011 Marien Zwart ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ */ ++ ++/* PulseAudio backend. ++ * ++ * FEATURES: ++ * ++ * Does not autostart a PulseAudio server, but uses an already-started ++ * one, which should be better than alsa-through-pulse. ++ * ++ * Supports control of either our stream's or our entire sink's volume ++ * while we are actually playing. Volume control while paused is ++ * intentionally unsupported: the PulseAudio documentation strongly ++ * suggests not passing in an initial volume when creating a stream ++ * (allowing the server to track this instead), and we do not know ++ * which sink to control if we do not have a stream open. ++ * ++ * IMPLEMENTATION: ++ * ++ * Most client-side (resource allocation) errors are fatal. Failure to ++ * create a server context or stream is not fatal (and MOC should cope ++ * with these failures too), but server communication failures later ++ * on are currently not handled (MOC has no great way for us to tell ++ * it we no longer work, and I am not sure if attempting to reconnect ++ * is worth it or even a good idea). ++ * ++ * The pulse "simple" API is too simple: it combines connecting to the ++ * server and opening a stream into one operation, while I want to ++ * connect to the server when MOC starts (and fall back to a different ++ * backend if there is no server), and I cannot open a stream at that ++ * time since I do not know the audio format yet. ++ * ++ * PulseAudio strongly recommends we use a high-latency connection, ++ * which the MOC frontend code might not expect from its audio ++ * backend. We'll see. ++ * ++ * We map MOC's percentage volumes linearly to pulse's PA_VOLUME_MUTED ++ * (0) .. PA_VOLUME_NORM range. This is what the PulseAudio docs recommend ++ * ( http://pulseaudio.org/wiki/WritingVolumeControlUIs ). It does mean ++ * PulseAudio volumes above PA_VOLUME_NORM do not work well with MOC. ++ * ++ * Comments in audio.h claim "All functions are executed only by one ++ * thread" (referring to the function in the hw_funcs struct). This is ++ * a blatant lie. Most of them are invoked off the "output buffer" ++ * thread (out_buf.c) but at least the "playing" thread (audio.c) ++ * calls audio_close which calls our close function. We can mostly ++ * ignore this problem because we serialize on the pulseaudio threaded ++ * mainloop lock. But it does mean that functions that are normally ++ * only called between open and close (like reset) are sometimes ++ * called without us having a stream. Bulletproof, therefore: ++ * serialize setting/unsetting our global stream using the threaded ++ * mainloop lock, and check for that stream being non-null before ++ * using it. ++ * ++ * I am not convinced there are no further dragons lurking here: can ++ * the "playing" thread(s) close and reopen our output stream while ++ * the "output buffer" thread is sending output there? We can bail if ++ * our stream is simply closed, but we do not currently detect it ++ * being reopened and no longer using the same sample format, which ++ * might have interesting results... ++ * ++ * Also, read_mixer is called from the main server thread (handling ++ * commands). This crashed me once when it got at a stream that was in ++ * the "creating" state and therefore did not have a valid stream ++ * index yet. Fixed by only assigning to the stream global when the ++ * stream is valid. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#define DEBUG ++ ++#include ++#include "common.h" ++#include "log.h" ++#include "audio.h" ++ ++ ++/* The pulse mainloop and context are initialized in pulse_init and ++ * destroyed in pulse_shutdown. ++ */ ++static pa_threaded_mainloop *mainloop = NULL; ++static pa_context *context = NULL; ++ ++/* The stream is initialized in pulse_open and destroyed in pulse_close. */ ++static pa_stream *stream = NULL; ++ ++static int showing_sink_volume = 0; ++ ++/* Callbacks that do nothing but wake up the mainloop. */ ++ ++static void context_state_callback (pa_context *context ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_state_callback (pa_stream *stream ATTR_UNUSED, ++ void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++static void stream_write_callback (pa_stream *stream ATTR_UNUSED, ++ size_t nbytes ATTR_UNUSED, void *userdata) ++{ ++ pa_threaded_mainloop *m = userdata; ++ ++ pa_threaded_mainloop_signal (m, 0); ++} ++ ++/* Initialize pulse mainloop and context. Failure to connect to the ++ * pulse daemon is nonfatal, everything else is fatal (as it ++ * presumably means we ran out of resources). ++ */ ++static int pulse_init (struct output_driver_caps *caps) ++{ ++ pa_context *c; ++ pa_proplist *proplist; ++ ++ assert (!mainloop); ++ assert (!context); ++ ++ mainloop = pa_threaded_mainloop_new (); ++ if (!mainloop) ++ fatal ("Cannot create PulseAudio mainloop"); ++ ++ if (pa_threaded_mainloop_start (mainloop) < 0) ++ fatal ("Cannot start PulseAudio mainloop"); ++ ++ /* TODO: possibly add more props. ++ * ++ * There are a few we could set in proplist.h but nothing I ++ * expect to be very useful. ++ * ++ * http://pulseaudio.org/wiki/ApplicationProperties recommends ++ * setting at least application.name, icon.name and media.role. ++ * ++ * No need to set application.name here, the name passed to ++ * pa_context_new_with_proplist overrides it. ++ */ ++ proplist = pa_proplist_new (); ++ if (!proplist) ++ fatal ("Cannot allocate PulseAudio proplist"); ++ ++ pa_proplist_sets (proplist, ++ PA_PROP_APPLICATION_VERSION, PACKAGE_VERSION); ++ pa_proplist_sets (proplist, PA_PROP_MEDIA_ROLE, "music"); ++ pa_proplist_sets (proplist, PA_PROP_APPLICATION_ID, "net.daper.moc"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ c = pa_context_new_with_proplist ( ++ pa_threaded_mainloop_get_api (mainloop), ++ PACKAGE_NAME, proplist); ++ pa_proplist_free (proplist); ++ ++ if (!c) ++ fatal ("Cannot allocate PulseAudio context"); ++ ++ pa_context_set_state_callback (c, context_state_callback, mainloop); ++ ++ /* Ignore return value, rely on state being set properly */ ++ pa_context_connect (c, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL); ++ ++ while (1) { ++ pa_context_state_t state = pa_context_get_state (c); ++ ++ if (state == PA_CONTEXT_READY) ++ break; ++ ++ if (!PA_CONTEXT_IS_GOOD (state)) { ++ error ("PulseAudio connection failed: %s", ++ pa_strerror (pa_context_errno (c))); ++ ++ goto unlock_and_fail; ++ } ++ ++ debug ("waiting for context to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global now that the context is actually ready */ ++ context = c; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ /* We just make up the hardware capabilities, since pulse is ++ * supposed to be abstracting these out. Assume pulse will ++ * deal with anything we want to throw at it, and that we will ++ * only want mono or stereo audio. ++ */ ++ caps->min_channels = 1; ++ caps->max_channels = 2; ++ caps->formats = (SFMT_S8 | SFMT_S16 | SFMT_S32 | ++ SFMT_FLOAT | SFMT_BE | SFMT_LE); ++ ++ return 1; ++ ++unlock_and_fail: ++ ++ pa_context_unref (c); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++ ++ return 0; ++} ++ ++static void pulse_shutdown (void) ++{ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_context_disconnect (context); ++ pa_context_unref (context); ++ context = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ pa_threaded_mainloop_stop (mainloop); ++ pa_threaded_mainloop_free (mainloop); ++ mainloop = NULL; ++} ++ ++static int pulse_open (struct sound_params *sound_params) ++{ ++ pa_sample_spec ss; ++ pa_buffer_attr ba; ++ pa_stream *s; ++ ++ assert (!stream); ++ /* Initialize everything to -1, which in practice gets us ++ * about 2 seconds of latency (which is fine). This is not the ++ * same as passing NULL for this struct, which gets us an ++ * unnecessarily short alsa-like latency. ++ */ ++ ba.fragsize = (uint32_t) -1; ++ ba.tlength = (uint32_t) -1; ++ ba.prebuf = (uint32_t) -1; ++ ba.minreq = (uint32_t) -1; ++ ba.maxlength = (uint32_t) -1; ++ ++ ss.channels = sound_params->channels; ++ ss.rate = sound_params->rate; ++ switch (sound_params->fmt) { ++ case SFMT_U8: ++ ss.format = PA_SAMPLE_U8; ++ break; ++ case SFMT_S16 | SFMT_LE: ++ ss.format = PA_SAMPLE_S16LE; ++ break; ++ case SFMT_S16 | SFMT_BE: ++ ss.format = PA_SAMPLE_S16BE; ++ break; ++ case SFMT_FLOAT | SFMT_LE: ++ ss.format = PA_SAMPLE_FLOAT32LE; ++ break; ++ case SFMT_FLOAT | SFMT_BE: ++ ss.format = PA_SAMPLE_FLOAT32BE; ++ break; ++ case SFMT_S32 | SFMT_LE: ++ ss.format = PA_SAMPLE_S32LE; ++ break; ++ case SFMT_S32 | SFMT_BE: ++ ss.format = PA_SAMPLE_S32BE; ++ break; ++ ++ default: ++ fatal ("pulse: got unrequested format"); ++ } ++ ++ debug ("opening stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* TODO: figure out if there are useful stream properties to set. ++ * ++ * I do not really see any in proplist.h that we can set from ++ * here (there are media title/artist/etc props but we do not ++ * have that data available here). ++ */ ++ s = pa_stream_new (context, "music", &ss, NULL); ++ if (!s) ++ fatal ("pulse: stream allocation failed"); ++ ++ pa_stream_set_state_callback (s, stream_state_callback, mainloop); ++ pa_stream_set_write_callback (s, stream_write_callback, mainloop); ++ ++ /* Ignore return value, rely on failed stream state instead. */ ++ pa_stream_connect_playback ( ++ s, NULL, &ba, ++ PA_STREAM_INTERPOLATE_TIMING | ++ PA_STREAM_AUTO_TIMING_UPDATE | ++ PA_STREAM_ADJUST_LATENCY, ++ NULL, NULL); ++ ++ while (1) { ++ pa_stream_state_t state = pa_stream_get_state (s); ++ ++ if (state == PA_STREAM_READY) ++ break; ++ ++ if (!PA_STREAM_IS_GOOD (state)) { ++ error ("PulseAudio stream connection failed"); ++ ++ goto fail; ++ } ++ ++ debug ("waiting for stream to become ready..."); ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ /* Only set the global stream now that it is actually ready */ ++ stream = s; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return 1; ++ ++fail: ++ pa_stream_unref (s); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ return 0; ++} ++ ++static void pulse_close (void) ++{ ++ debug ("closing stream"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ pa_stream_disconnect (stream); ++ pa_stream_unref (stream); ++ stream = NULL; ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_play (const char *buff, const size_t size) ++{ ++ size_t offset = 0; ++ ++ debug ("Got %d bytes to play", (int)size); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* The buffer is usually writable when we get here, and there ++ * are usually few (if any) writes after the first one. So ++ * there is no point in doing further writes directly from the ++ * callback: we can just do all writes from this thread. ++ */ ++ ++ /* Break out of the loop if some other thread manages to close ++ * our stream underneath us. ++ */ ++ while (stream) { ++ size_t towrite = MIN(pa_stream_writable_size (stream), ++ size - offset); ++ debug ("writing %d bytes", (int)towrite); ++ ++ /* We have no working way of dealing with errors ++ * (see below). */ ++ if (pa_stream_write(stream, buff + offset, towrite, ++ NULL, 0, PA_SEEK_RELATIVE)) ++ error ("pa_stream_write failed"); ++ ++ offset += towrite; ++ ++ if (offset >= size) ++ break; ++ ++ pa_threaded_mainloop_wait (mainloop); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("Done playing!"); ++ ++ /* We should always return size, calling code does not deal ++ * well with anything else. Only read the rest if you want to ++ * know why. ++ * ++ * The output buffer reader thread (out_buf.c:read_thread) ++ * repeatedly loads some 64k/0.1s of audio into a buffer on ++ * the stack, then calls audio_send_pcm repeatedly until this ++ * entire buffer has been processed (similar to the loop in ++ * this function). audio_send_pcm applies the softmixer and ++ * equalizer, then feeds the result to this function, passing ++ * through our return value. ++ * ++ * So if we return less than size the equalizer/softmixer is ++ * re-applied to the remaining data, which is silly. Also, ++ * audio_send_pcm checks for our return value being zero and ++ * calls fatal() if it is, so try to always process *some* ++ * data. Also, out_buf.c uses the return value of this ++ * function from the last run through its inner loop to update ++ * its time attribute, which means it will be interestingly ++ * off if that loop ran more than once. ++ * ++ * Oh, and alsa.c seems to think it can return -1 to indicate ++ * failure, which will cause out_buf.c to rewind its buffer ++ * (to before its start, usually). ++ */ ++ return size; ++} ++ ++static void volume_cb (const pa_cvolume *v, void *userdata) ++{ ++ int *result = userdata; ++ ++ if (v) ++ *result = 100 * pa_cvolume_avg (v) / PA_VOLUME_NORM; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static void sink_input_volume_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata ATTR_UNUSED) ++{ ++ volume_cb (i ? &i->volume : NULL, userdata); ++} ++ ++static int pulse_read_mixer (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("read mixer"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_volume_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_volume_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_set_mixer (int vol) ++{ ++ pa_cvolume v; ++ pa_operation *op; ++ ++ /* Setting volume for one channel does the right thing. */ ++ pa_cvolume_set(&v, 1, vol * PA_VOLUME_NORM / 100); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_set_sink_volume_by_index ( ++ context, pa_stream_get_device_index (stream), ++ &v, NULL, NULL); ++ else ++ op = pa_context_set_sink_input_volume ( ++ context, pa_stream_get_index (stream), ++ &v, NULL, NULL); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++} ++ ++static int pulse_get_buff_fill (void) ++{ ++ /* This function is problematic. MOC uses it to for the "time ++ * remaining" in the UI, but calls it more than once per ++ * second (after each chunk of audio played, not for each ++ * playback time update). We have to be fairly accurate here ++ * for that time remaining to not jump weirdly. But PulseAudio ++ * cannot give us a 100% accurate value here, as it involves a ++ * server roundtrip. And if we call this a lot it suggests ++ * switching to a mode where the value is interpolated, making ++ * it presumably more inaccurate (see the flags we pass to ++ * pa_stream_connect_playback). ++ * ++ * MOC also contains what I believe to be a race: it calls ++ * audio_get_buff_fill "soon" (after playing the first chunk) ++ * after starting playback of the next song, at which point we ++ * still have part of the previous song buffered. This means ++ * our position into the new song is negative, which fails an ++ * assert (in out_buf.c:out_buf_time_get). There is no sane ++ * way for us to detect this condition. I believe no other ++ * backend triggers this because the assert sits after an ++ * implicit float -> int seconds conversion, which means we ++ * have to be off by at least an entire second to get a ++ * negative value, and none of the other backends have buffers ++ * that large (alsa buffers are supposedly a few 100 ms). ++ */ ++ pa_usec_t buffered_usecs = 0; ++ int buffered_bytes = 0; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* Using pa_stream_get_timing_info and returning the distance ++ * between write_index and read_index would be more obvious, ++ * but because of how the result is actually used I believe ++ * using the latency value is slightly more correct, and it ++ * makes the following crash-avoidance hack more obvious. ++ */ ++ ++ /* This function will frequently fail the first time we call ++ * it (pulse does not have the requested data yet). We ignore ++ * that and just return 0. ++ * ++ * Deal with stream being NULL too, just in case this is ++ * called in a racy fashion similar to how reset() is. ++ */ ++ if (stream && ++ pa_stream_get_latency (stream, &buffered_usecs, NULL) >= 0) { ++ /* Crash-avoidance HACK: floor our latency to at most ++ * 1 second. It is usually more, but reporting that at ++ * the start of playback crashes MOC, and we cannot ++ * sanely detect when reporting it is safe. ++ */ ++ if (buffered_usecs > 1000000) ++ buffered_usecs = 1000000; ++ ++ buffered_bytes = pa_usec_to_bytes ( ++ buffered_usecs, ++ pa_stream_get_sample_spec (stream)); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ debug ("buffer fill: %d usec / %d bytes", ++ (int) buffered_usecs, (int) buffered_bytes); ++ ++ return buffered_bytes; ++} ++ ++static void flush_callback (pa_stream *s ATTR_UNUSED, int success, ++ void *userdata) ++{ ++ int *result = userdata; ++ ++ *result = success; ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static int pulse_reset (void) ++{ ++ pa_operation *op; ++ int result = 0; ++ ++ debug ("reset requested"); ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ /* We *should* have a stream here, but MOC is racy, so bulletproof */ ++ if (stream) { ++ op = pa_stream_flush (stream, flush_callback, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } else ++ logit ("pulse_reset() called without a stream"); ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static int pulse_get_rate (void) ++{ ++ /* This is called once right after open. Do not bother making ++ * this fast. */ ++ ++ int result; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) ++ result = pa_stream_get_sample_spec (stream)->rate; ++ else { ++ error ("get_rate called without a stream"); ++ result = 0; ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ return result; ++} ++ ++static void pulse_toggle_mixer_channel (void) ++{ ++ showing_sink_volume = !showing_sink_volume; ++} ++ ++static void sink_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_info *i, int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static void sink_input_name_cb (pa_context *c ATTR_UNUSED, ++ const pa_sink_input_info *i, ++ int eol ATTR_UNUSED, ++ void *userdata) ++{ ++ char **result = userdata; ++ ++ if (i && !*result) ++ *result = xstrdup (i->name); ++ ++ pa_threaded_mainloop_signal (mainloop, 0); ++} ++ ++static char *pulse_get_mixer_channel_name (void) ++{ ++ char *result = NULL; ++ pa_operation *op; ++ ++ pa_threaded_mainloop_lock (mainloop); ++ ++ if (stream) { ++ if (showing_sink_volume) ++ op = pa_context_get_sink_info_by_index ( ++ context, pa_stream_get_device_index (stream), ++ sink_name_cb, &result); ++ else ++ op = pa_context_get_sink_input_info ( ++ context, pa_stream_get_index (stream), ++ sink_input_name_cb, &result); ++ ++ while (pa_operation_get_state (op) == PA_OPERATION_RUNNING) ++ pa_threaded_mainloop_wait (mainloop); ++ ++ pa_operation_unref (op); ++ } ++ ++ pa_threaded_mainloop_unlock (mainloop); ++ ++ if (!result) ++ result = xstrdup ("disconnected"); ++ ++ return result; ++} ++ ++void pulse_funcs (struct hw_funcs *funcs) ++{ ++ funcs->init = pulse_init; ++ funcs->shutdown = pulse_shutdown; ++ funcs->open = pulse_open; ++ funcs->close = pulse_close; ++ funcs->play = pulse_play; ++ funcs->read_mixer = pulse_read_mixer; ++ funcs->set_mixer = pulse_set_mixer; ++ funcs->get_buff_fill = pulse_get_buff_fill; ++ funcs->reset = pulse_reset; ++ funcs->get_rate = pulse_get_rate; ++ funcs->toggle_mixer_channel = pulse_toggle_mixer_channel; ++ funcs->get_mixer_channel_name = pulse_get_mixer_channel_name; ++} +diff --git a/pulse.h b/pulse.h +new file mode 100644 +--- /dev/null ++++ b/pulse.h +@@ -0,0 +1,14 @@ ++#ifndef PULSE_H ++#define PULSE_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void pulse_funcs (struct hw_funcs *funcs); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif From e0a2bc49fdbdaedd7e0e30c0720374fa4195fa64 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 4 May 2019 23:41:26 +0200 Subject: [PATCH 039/637] patchelfUnstable: 0.10-pre-20180509 -> 0.10-pre-20190328 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 0c5ec640426..29d713a9af4 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "0.10-pre-20180509"; + version = "0.10-pre-20190328"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69"; - sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr"; + rev = "e1e39f3639e39360ceebb2f7ed533cede4623070"; + sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k"; }; # Drop test that fails on musl (?) From ff4db30b7dd68daae70b4393aa275d80233f805b Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 7 Mar 2019 15:11:54 +0000 Subject: [PATCH 040/637] ipxe: enable UEFI support --- pkgs/tools/misc/ipxe/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index b06a1c47786..99b7ea10bd3 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,16 +1,24 @@ -{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl +{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl, gnu-efi , embedScript ? null }: let date = "20190318"; rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; + targets = [ + "bin-x86_64-efi/ipxe.efi" + "bin/ipxe.dsk" + "bin/ipxe.usb" + "bin/ipxe.iso" + "bin/ipxe.lkrn" + "bin/undionly.kpxe" + ]; in stdenv.mkDerivation { name = "ipxe-${date}-${builtins.substring 0 7 rev}"; - buildInputs = [ perl cdrkit syslinux xz openssl ]; + buildInputs = [ perl cdrkit syslinux xz openssl gnu-efi ]; src = fetchgit { url = https://git.ipxe.org/ipxe.git; @@ -36,14 +44,17 @@ stdenv.mkDerivation { runHook preConfigure for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso + substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo runHook postConfigure ''; preBuild = "cd src"; + buildFlags = targets; + installPhase = '' mkdir -p $out - cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out + cp ${lib.concatStringsSep " " targets} $out # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. From b12ea62ec98bc00b5283c5eecc5aba6e5f965444 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 5 May 2019 20:16:19 +0900 Subject: [PATCH 041/637] nixos/systemd-boot: add support for memtest86 EFI app This commit adds support for installing the memtest86 EFI app and adding a boot entry for it with systemd-boot. --- .../systemd-boot/systemd-boot-builder.py | 27 +++++++++++++++++++ .../boot/loader/systemd-boot/systemd-boot.nix | 15 +++++++++++ 2 files changed, 42 insertions(+) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 6016a85ea06..940d4c0eb97 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -33,6 +33,15 @@ initrd {initrd} options {kernel_params} """ +# The boot loader entry for memtest86. +# +# TODO: This is hard-coded to use the 64-bit EFI app, but it could probably +# be updated to use the 32-bit EFI app on 32-bit systems. The 32-bit EFI +# app filename is BOOTIA32.efi. +MEMTEST_BOOT_ENTRY = """title MemTest86 +efi /efi/memtest86/BOOTX64.efi +""" + def write_loader_conf(profile, generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": @@ -199,6 +208,24 @@ def main(): if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + if os.path.exists(memtest_entry_file): + os.unlink(memtest_entry_file) + shutil.rmtree("@efiSysMountPoint@/efi/memtest86", ignore_errors=True) + if "@memtest86@" != "": + mkdir_p("@efiSysMountPoint@/efi/memtest86") + for path in glob.iglob("@memtest86@/*"): + if os.path.isdir(path): + shutil.copytree(path, os.path.join("@efiSysMountPoint@/efi/memtest86", os.path.basename(path))) + else: + shutil.copy(path, "@efiSysMountPoint@/efi/memtest86/") + + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + memtest_entry_file_tmp_path = "%s.tmp" % memtest_entry_file + with open(memtest_entry_file_tmp_path, 'w') as f: + f.write(MEMTEST_BOOT_ENTRY) + os.rename(memtest_entry_file_tmp_path, memtest_entry_file) + # Since fat32 provides little recovery facilities after a crash, # it can leave the system in an unbootable state, when a crash/outage # happens shortly after an update. To decrease the likelihood of this diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 9ad2a2779e1..9b0a24a3b8f 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -25,6 +25,8 @@ let inherit (cfg) consoleMode; inherit (efi) efiSysMountPoint canTouchEfiVariables; + + memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; }; in { @@ -86,6 +88,19 @@ in { ''; }; + + memtest86 = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Make MemTest86 available from the systemd-boot menu. MemTest86 is a + program for testing memory. MemTest86 is a non-open-source program, so + this requires allowUnfree to be set to + true. + ''; + }; + }; }; config = mkIf cfg.enable { From 4806c8c38dcd2f7b83a75c684ad798ef184da942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 6 May 2019 10:49:42 +0200 Subject: [PATCH 042/637] nixos/all-firmware: Enable facetimehd only for i686/x86_64 --- nixos/modules/hardware/all-firmware.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index c79be810eef..534fcc34276 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -63,8 +63,7 @@ in { b43Firmware_5_1_138 b43Firmware_6_30_163_46 b43FirmwareCutter - facetimehd-firmware - ]; + ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; }) ]; } From f965fb26a9eae8069e3ffe2ad6779000bf06b5b5 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Mon, 6 May 2019 02:23:15 +0200 Subject: [PATCH 043/637] nixos/kubernetes: upgrade CoreDNS 1.3.1 -> 1.5.0 --- nixos/modules/services/cluster/kubernetes/addons/dns.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 4368159ea6e..ee0ac632ecf 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.3.1"; + version = "1.5.0"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -55,9 +55,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4"; + imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c"; finalImageTag = version; - sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5"; + sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q"; }; }; }; @@ -160,7 +160,7 @@ in { fallthrough in-addr.arpa ip6.arpa } prometheus :${toString ports.metrics} - proxy . /etc/resolv.conf + forward . /etc/resolv.conf cache 30 loop reload From 1c87fac0b981b1cf6daf1866cc4266b6b1e352bc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:10:47 -0400 Subject: [PATCH 044/637] symengine: init at 0.3.0 --- .../python-modules/symengine/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/symengine/default.nix diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix new file mode 100644 index 00000000000..7e10c02460e --- /dev/null +++ b/pkgs/development/python-modules/symengine/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, cmake +, symengine +, nose +}: + +buildPythonPackage rec { + pname = "symengine"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e86d13aadc9f765f2c5462da32950edd36d1a0a52dbfc96e766be3689957c04d"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" + + substituteInPlace cmake/FindCython.cmake \ + --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython" + ''; + + buildInputs = [ cython cmake ]; + + setupPyBuildFlags = [ "--symengine-dir=${symengine}/" ]; + + # tests fail due to trying to import local "symengine" directory + doCheck = false; + checkPhase = '' + nosetests symengine/tests -v + ''; + + meta = with lib; { + description = "Python library providing wrappers to SymEngine"; + homepage = https://github.com/symengine/symengine.py; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7e223e160c..c01b86d4f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5937,6 +5937,8 @@ in svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; + symengine = callPackage ../development/libraries/symengine { }; + sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { From b78f68944482245ff954bb7f0d951c0422781ba7 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:11:07 -0400 Subject: [PATCH 045/637] pythonPackages.cgen init at 2017.1 --- .../python-modules/cgen/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/cgen/default.nix diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix new file mode 100644 index 00000000000..e0317249fe9 --- /dev/null +++ b/pkgs/development/python-modules/cgen/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "cgen"; + version = "2017.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a04525d51ee975d37d590d6d82bf80a46e77f75187cccfd2248a89616a778795"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + pytools + numpy + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "C/C++ source generation from an AST"; + homepage = https://github.com/inducer/cgen; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9af4ca1d01c..43b305652cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1196,6 +1196,8 @@ in { cement = callPackage ../development/python-modules/cement {}; + cgen = callPackage ../development/python-modules/cgen { }; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; chainer = callPackage ../development/python-modules/chainer { From 9f2bea930492d7886c64b66f275aa9fa94bade96 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:11:29 -0400 Subject: [PATCH 046/637] pythonPackages.genpy: init at 2016.1.3 --- .../python-modules/genpy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/genpy/default.nix diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix new file mode 100644 index 00000000000..0a8344f8b92 --- /dev/null +++ b/pkgs/development/python-modules/genpy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "genpy"; + version = "2016.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c11726f1e8ace8bbdfc87816403c9a59f53a8c3d45c99187ae17c9725d87a91"; + }; + + propagatedBuildInputs = [ + pytools + numpy + ]; + + meta = with lib; { + description = "C/C++ source generation from an AST"; + homepage = https://github.com/inducer/genpy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43b305652cd..96a6839231a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5380,6 +5380,8 @@ in { gensim = callPackage ../development/python-modules/gensim { }; + genpy = callPackage ../development/python-modules/genpy { }; + cymem = callPackage ../development/python-modules/cymem { }; ftfy = callPackage ../development/python-modules/ftfy { }; From 9833f556f7246f3ac38ecc95190228035319bee4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:12:04 -0400 Subject: [PATCH 047/637] pythonPackages.symengine: init at 0.3.0 --- .../libraries/symengine/default.nix | 38 +++++++++++++++++++ .../python-modules/symengine/default.nix | 29 +++++++++----- pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/symengine/default.nix diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix new file mode 100644 index 00000000000..7bdbeea1452 --- /dev/null +++ b/pkgs/development/libraries/symengine/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gmp +, flint +}: + +stdenv.mkDerivation rec { + name = "symengine-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "symengine"; + repo = "symengine"; + rev = "v${version}"; + sha256 = "1p7hk163rgn1zzvjlq4vskblry3s2rg5bc7xlr08wfqckfr47bqc"; + }; + + buildInputs = [ cmake gmp flint ]; + + cmakeFlags = [ + "-DWITH_FLINT=ON" + ]; + + doCheck = true; + checkPhase = '' + ctest + ''; + + meta = with stdenv.lib; { + description = "SymEngine is a fast symbolic manipulation library"; + homepage = https://github.com/symengine/symengine; + platforms = platforms.unix ++ platforms.windows; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 7e10c02460e..a2c0578f0c7 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , cython , cmake , symengine -, nose +, pytest +, sympy +, python }: buildPythonPackage rec { pname = "symengine"; - version = "0.3.0"; + version = "0.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "e86d13aadc9f765f2c5462da32950edd36d1a0a52dbfc96e766be3689957c04d"; + src = fetchFromGitHub { + owner = "symengine"; + repo = "symengine.py"; + rev = "v${version}"; + sha256 = "07i9rwxphi4zgwc7y6f6qvq73iym2cx4k1bpd7rmd3wkpgrrfxqx"; }; postConfigure = '' @@ -26,12 +30,17 @@ buildPythonPackage rec { buildInputs = [ cython cmake ]; - setupPyBuildFlags = [ "--symengine-dir=${symengine}/" ]; + checkInputs = [ pytest sympy ]; + + setupPyBuildFlags = [ + "--symengine-dir=${symengine}/" + "--define=\"CYTHON_BIN=${cython}/bin/cython\"" + ]; - # tests fail due to trying to import local "symengine" directory - doCheck = false; checkPhase = '' - nosetests symengine/tests -v + mkdir empty + cd empty + ${python.interpreter} ../bin/test_python.py ''; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96a6839231a..d926975fa8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4607,6 +4607,10 @@ in { python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + symengine = callPackage ../development/python-modules/symengine { + symengine = pkgs.symengine; + }; + sympy = callPackage ../development/python-modules/sympy { }; pilkit = callPackage ../development/python-modules/pilkit { }; From 2e3242191fd9f2c8e7d6ad452bc9304bf971035e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:13:01 -0400 Subject: [PATCH 048/637] pythonPackages.loo-py: init at 2017.2 --- .../python-modules/loo-py/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/loo-py/default.nix diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix new file mode 100644 index 00000000000..fe765f5ff0a --- /dev/null +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, pymbolic +, genpy +, cgen +, islpy +, six +, colorama +, mako +, pyopencl +, pytest +}: + +buildPythonPackage rec { + pname = "loo-py"; + version = "2017.2"; + + src = fetchPypi { + pname = "loo.py"; + inherit version; + sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + pytools + pymbolic + genpy + cgen + islpy + six + colorama + mako + pyopencl + ]; + + # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR + doCheck = false; + checkPhase = '' + HOME=$(mktemp -d) pytest test + ''; + + meta = with lib; { + description = "A code generator for array-based code on CPUs and GPUs"; + homepage = https://mathema.tician.de/software/loopy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d926975fa8d..9c8217a38bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1740,6 +1740,8 @@ in { locket = callPackage ../development/python-modules/locket { }; + loo-py = callPackage ../development/python-modules/loo-py { }; + tblib = callPackage ../development/python-modules/tblib { }; s3fs = callPackage ../development/python-modules/s3fs { }; From b536b12b7bd7fa3886cc1f9d52c088ad54c9e99e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:13:24 -0400 Subject: [PATCH 049/637] pythonPackages.pymbolic: init at 2018.1 --- .../python-modules/pymbolic/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pymbolic/default.nix diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix new file mode 100644 index 00000000000..0d13b377b13 --- /dev/null +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytools +, pytest +, six +, sympy +, pexpect +, symengine +}: + +buildPythonPackage rec { + pname = "pymbolic"; + version = "2018.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "a47d5524d6a3cdc8a028079ce632eeb45ceea7243272d234f250622087688207"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"pytest>=2.3\"," "" + ''; + + checkInputs = [ sympy pexpect symengine pytest ]; + propagatedBuildInputs = [ + pytools + six + ]; + + # too many tests fail + doCheck = false; + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "A package for symbolic computation"; + homepage = https://mathema.tician.de/software/pymbolic; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c8217a38bb..a125a556b7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2244,6 +2244,8 @@ in { pylama = callPackage ../development/python-modules/pylama { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; pyphen = callPackage ../development/python-modules/pyphen {}; From 150980c092d1c38a24754177c27d1dcb4c073567 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 15 Apr 2019 17:27:00 -0400 Subject: [PATCH 050/637] pythonPackages.islpy: init at 2018.2 --- .../python-modules/islpy/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/islpy/default.nix diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix new file mode 100644 index 00000000000..6274da95b32 --- /dev/null +++ b/pkgs/development/python-modules/islpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isl +, pytest +, cffi +, six +}: + +buildPythonPackage rec { + pname = "islpy"; + version = "2018.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "be422a53b576210a0bb9775866abb6580b1e568222fc3e4e39d9e82f6d1d7253"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "\"pytest>=2\"," "" + ''; + + buildInputs = [ isl ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + cffi + six + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "Python wrapper around isl, an integer set library"; + homepage = https://github.com/inducer/islpy; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a125a556b7d..4b1124ea254 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2042,6 +2042,8 @@ in { isbnlib = callPackage ../development/python-modules/isbnlib { }; + islpy = callPackage ../development/python-modules/islpy { }; + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; iniparse = callPackage ../development/python-modules/iniparse { }; From 09c0b89a81a0c1ff60aea9d090ab4d6ac2581b76 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 8 May 2019 09:14:18 +0200 Subject: [PATCH 051/637] taskell: 1.4.2 -> 1.4.3 Signed-off-by: Matthias Beyer --- pkgs/applications/misc/taskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 6d31b49743a..373839c1dd5 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { haskell, lib, haskellPackages, fetchFromGitHub }: let - version = "1.4.2"; - sha256 = "1kpzjsbx2xbp43hd62nq03jcknp0dqvdlxjc9gc3fagaqfbfzny2"; + version = "1.4.3"; + sha256 = "0i12x7qzfmmdvi09k96x53zzzrva2w3zbl2f6dkxb8kk5scqqa4v"; in (haskellPackages.mkDerivation { pname = "taskell"; From 4c5dc1fa30f382b3a3ac78dcc83341e5cf895e19 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 8 May 2019 17:01:05 +0200 Subject: [PATCH 052/637] memtest86+: 5.01+coreboot-20180113 -> 5.01-coreboot-002 Latest stable stag of the coreboot fork --- pkgs/tools/misc/memtest86+/default.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 7bebc26d7ec..b1d1971c75c 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,23 +1,15 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "memtest86+-5.01+coreboot-20180113"; + pname = "memtest86+"; + version = "5.01-coreboot-002"; src = fetchgit { - url = "https://review.coreboot.org/memtest86plus"; - rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3"; - sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk"; + url = "https://review.coreboot.org/memtest86plus.git"; + rev = "v002"; + sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk"; }; - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; hardeningDisable = [ "all" ]; @@ -27,13 +19,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails installPhase = '' - mkdir -p $out - chmod -x memtest.bin - cp memtest.bin $out/ + install -Dm0444 -t $out/ memtest.bin ''; meta = { - homepage = http://www.memtest.org/; + homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; From e6b2fbeb70142d696858432d0b7b6337813a1353 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 8 May 2019 17:10:17 +0200 Subject: [PATCH 053/637] memtest86: remove and alias to memtest86plus Legacy memtest86 was broken since NixOS 16.09 + we've already been using memtest86+ fork through 'boot.loader.grub.memtest86.enable' --- pkgs/tools/misc/memtest86/default.nix | 32 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/tools/misc/memtest86/default.nix diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix deleted file mode 100644 index 2e364e33fc6..00000000000 --- a/pkgs/tools/misc/memtest86/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "memtest86-4.3.6"; - - src = fetchurl { - url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; - sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; - }; - - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - - NIX_CFLAGS_COMPILE = "-I."; - - installPhase = '' - mkdir -p $out - cp memtest.bin $out/ - ''; - - meta = { - homepage = http://memtest86.com/; - description = "A tool to detect memory errors, to be run from a bootloader"; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4bea8b8033..52464121ee5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -181,6 +181,7 @@ mapAliases ({ m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 + memtest86 = memtest86plus; # added 2019-05-08 midoriWrapper = midori; # added 2015-01 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 409e6f10731..d57eef25f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4390,8 +4390,6 @@ in memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; - memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; From fe2d30e1c801f15892bf63ec4d81807627802b84 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 7 May 2019 11:27:07 -0400 Subject: [PATCH 054/637] symengine: init at 0.3.0 symengine: init at 0.3.0 --- pkgs/development/libraries/symengine/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 7bdbeea1452..40e1a280aa2 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -3,26 +3,35 @@ , cmake , gmp , flint +, mpfr +, libmpc }: stdenv.mkDerivation rec { name = "symengine-${version}"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "1p7hk163rgn1zzvjlq4vskblry3s2rg5bc7xlr08wfqckfr47bqc"; + sha256 = "1kz893p3pmsw3gfwickk2nliw8p63yp89xriad7kpw4kmhvgr8gb"; }; - buildInputs = [ cmake gmp flint ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gmp flint mpfr libmpc ]; cmakeFlags = [ "-DWITH_FLINT=ON" + "-DINTEGER_CLASS=flint" + "-DWITH_SYMENGINE_THREAD_SAFE=yes" + "-DWITH_MPC=yes" + "-DBUILD_FOR_DISTRIBUTION=yes" ]; doCheck = true; + checkPhase = '' ctest ''; From ac6337058a14a6a4bb9f356a757d310415b0e40c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2019 19:40:39 +0200 Subject: [PATCH 055/637] kernel/common-config: move criu to its own set It was previously in the "test" set, which seemed an inappropriate placement. --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5711e019f95..75bd0109300 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -542,7 +542,9 @@ let TEST_ASYNC_DRIVER_PROBE = option no; WW_MUTEX_SELFTEST = option no; XZ_DEC_TEST = option no; - } // optionalAttrs (features.criu or false) ({ + }; + + criu = optionalAttrs (features.criu or false) ({ EXPERT = yes; CHECKPOINT_RESTORE = yes; } // optionalAttrs (features.criu_revert_expert or true) { From e4c269813c7a41b7b6e3b615a9cb68b2972b4fb5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2019 19:42:24 +0200 Subject: [PATCH 056/637] kernel/common-config: PREEMPT -> PREEMPT_VOLUNTARY --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 75bd0109300..1d2d84ad6c6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -686,6 +686,9 @@ let # Enable AMD's ROCm GPU compute stack HSA_AMD = whenAtLeast "4.20" yes; + PREEMPT = no; + PREEMPT_VOLUNTARY = yes; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable memory hotplug support # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot From 5c921ba498ad3fbf565ba80b40275b7ae8cb476c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 8 May 2019 22:05:41 -0400 Subject: [PATCH 057/637] linux_testing_bcachefs: 5.0.2019.04.04 -> 5.0.2019.05.08 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 144ac0e07cb..45e55e03c81 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.0.2019.04.04"; + version = "5.0.2019.05.08"; modDirVersion = "5.0.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "d83b992f653d9f742f3f8567dbcfd1f4f72e858f"; - sha256 = "17xipjhkl4arshyj3riwq4pgl2qqcnlfhaga77a430wy22s7plh2"; + rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7"; + sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls"; }; extraConfig = "BCACHEFS_FS m"; From 09c7ba418338752dc75a8fafbe50338a7e6e6fe1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 8 May 2019 22:05:54 -0400 Subject: [PATCH 058/637] bcachefs-tools: 2019-04-04 -> 2019-05-08 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c33ae4e8304..72e514fff6b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-04-04"; + version = "2019-05-08"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "d13bbb2955f899f10be4ab315ad229d2951fdcda"; - sha256 = "0cjy12qjd572sbg8h4i18fn001p6a6ahc4ljwids58nv83q99ll3"; + rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1"; + sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj"; }; enableParallelBuilding = true; From bbc0128e7d4a43b8b01977e5f02d36ee6b84e324 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 29 Mar 2019 09:58:12 -0500 Subject: [PATCH 059/637] libcbor: init at 2019-02-23 --- .../development/libraries/libcbor/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libcbor/default.nix diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix new file mode 100644 index 00000000000..fe2f0eadeeb --- /dev/null +++ b/pkgs/development/libraries/libcbor/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, cmocka }: + +stdenv.mkDerivation rec { + pname = "libcbor"; + version = "2019-02-23"; + + src = fetchFromGitHub { + owner = "PJK"; + repo = pname; + rev = "87f977e732ca216682a8583a0e43803eb6b9c028"; + sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm"; + }; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ cmocka ]; + + doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + + NIX_CFLAGS_COMPILE = [ "-fno-lto" ]; + + meta = with stdenv.lib; { + description = "CBOR protocol implementation for C and others"; + homepage = https://github.com/PJK/libcbor; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 396cd0386b9..5d4caf5b9f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11077,6 +11077,8 @@ in then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcbor = callPackage ../development/libraries/libcbor { }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; From 7cbd6d3cb8673669302dcbcb8f5db6ff3689761f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 29 Mar 2019 10:13:20 -0500 Subject: [PATCH 060/637] libfido2: init at 1.0.0 --- .../libraries/libfido2/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libfido2/default.nix diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix new file mode 100644 index 00000000000..d287304e628 --- /dev/null +++ b/pkgs/development/libraries/libfido2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, libudev }: + +stdenv.mkDerivation rec { + pname = "libfido2"; + version = "1.0.0"; + src = fetchurl { + url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; + sha256 = "1l0f67fpza0lhq08brpgi4xyfw60w1q790a83x8vqm889l4mph8w"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libcbor libressl libudev ]; + + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; + + meta = with stdenv.lib; { + description = '' + Provides library functionality for FIDO 2.0, including communication with a device over USB. + ''; + homepage = https://github.com/Yubico/libfido2; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d4caf5b9f7..c3dfdea9e00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11243,6 +11243,8 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; + libfido2 = callPackage ../development/libraries/libfido2 { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { }; From f74f518b80fe90fd9748fe648cf13fd414971c07 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 29 Mar 2019 11:16:50 -0500 Subject: [PATCH 061/637] libfido2: use udev instead of alias libudev --- pkgs/development/libraries/libfido2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index d287304e628..d153e475bbe 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, libudev }: +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: stdenv.mkDerivation rec { pname = "libfido2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor libressl libudev ]; + buildInputs = [ libcbor libressl udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; From b6e91ba23ea62a78b9beaec5fc6ac9f80d151615 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 9 May 2019 07:42:46 -0500 Subject: [PATCH 062/637] libfido2: 1.0.0 -> 1.1.0 https://github.com/Yubico/libfido2/blob/1.1.0/NEWS --- pkgs/development/libraries/libfido2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index d153e475bbe..b670172ce1e 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; - sha256 = "1l0f67fpza0lhq08brpgi4xyfw60w1q790a83x8vqm889l4mph8w"; + sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1"; }; nativeBuildInputs = [ cmake pkgconfig ]; From b17830949c9574a0356b199462d948467df6bd96 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 9 May 2019 16:11:31 -0500 Subject: [PATCH 063/637] lxd: 3.12 -> 3.13 https://discuss.linuxcontainers.org/t/lxd-3-13-has-been-released/4738 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 424d97a4729..852bb337778 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -8,13 +8,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.12"; + version = "3.13"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0m2cq41mz5209csr07gsnmslqvqdxk2p1l2saa23ddnaybqnjy16"; + sha256 = "1kasnzd8hw9biyx8avbjmpfax1pdbp9g543g8hs6xpksmk93hl82"; }; preBuild = '' From 5a07dafc4ad33875ecabc9f28b311ad3146a9689 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 9 May 2019 20:13:25 -0500 Subject: [PATCH 064/637] maintainer-list: add my gpg key info (@dtzWill), fix email Apparently I have zero commits under nix@wdtz.org, so change my address to match my commits and key. --- maintainers/maintainer-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bc92ff08d8..835c1ef76b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1354,9 +1354,13 @@ name = "David Sferruzza"; }; dtzWill = { - email = "nix@wdtz.org"; + email = "w@wdtz.org"; github = "dtzWill"; name = "Will Dietz"; + keys = [{ + longkeyid = "rsa4096/0xFD42C7D0D41494C8"; + fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; + }]; }; dxf = { email = "dingxiangfei2009@gmail.com"; From f8043fc41a4b3880621d3c8a1c4c2526da3134ac Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Fri, 10 May 2019 10:09:20 +0200 Subject: [PATCH 065/637] Add sgraf as a maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bc92ff08d8..40720d92f49 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4454,6 +4454,11 @@ github = "sfrijters"; name = "Stefan Frijters"; }; + sgraf = { + email = "sgraf1337@gmail.com"; + github = "sgraf812"; + name = "Sebastian Graf"; + }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; From c63db92967c71ebce8da6269087ed955714a86e3 Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Fri, 10 May 2019 09:57:37 +0200 Subject: [PATCH 066/637] alttab: init at 1.4.0 [`alttab`](https://github.com/sagb/alttab) is a window switcher for X11, designed for minimalistic window managers or a standalone X11 session. --- pkgs/tools/X11/alttab/default.nix | 45 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/X11/alttab/default.nix diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix new file mode 100644 index 00000000000..4efd86ca63f --- /dev/null +++ b/pkgs/tools/X11/alttab/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +, xorg }: + +stdenv.mkDerivation rec { + version = "1.4.0"; + + pname = "alttab"; + + src = fetchFromGitHub { + owner = "sagb"; + repo = pname; + rev = "v${version}"; + sha256 = "028ifp54yl3xq5mj2ww9baga8p56nmrx4ypvj8k35akcaxdpyga9"; + }; + + nativeBuildInputs = [ + autoconf + automake + pkgconfig + ronn + ]; + + preConfigure = "./bootstrap.sh"; + + buildInputs = [ + libpng + uthash + xorg.libX11 + xorg.libXft + xorg.libXmu + xorg.libXpm + xorg.libXrandr + xorg.libXrender + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sagb/alttab; + description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.sgraf ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4feeebeb0fd..665e7d8d5d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,6 +645,8 @@ in altermime = callPackage ../tools/networking/altermime {}; + alttab = callPackage ../tools/X11/alttab { }; + amule = callPackage ../tools/networking/p2p/amule { }; amuleDaemon = appendToName "daemon" (amule.override { From 9655dcba3dcfb7cf82fb5c30dfa3038c5ab1ed29 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Wed, 1 May 2019 20:21:30 +0200 Subject: [PATCH 067/637] z88dk: 20180217 -> unstable-2019-05-09 --- pkgs/development/compilers/z88dk/default.nix | 43 ++++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 1590075dc2a..19056ec2b6f 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -1,37 +1,46 @@ -{ fetchFromGitHub, fetchpatch, stdenv, makeWrapper, unzip, libxml2, m4, uthash }: +{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }: stdenv.mkDerivation rec { - name = "z88dk-${version}"; - version = "20180217"; - rev = "49a7c6032b2675af742f5b0b3aa5bd5260bdd814"; - short_rev = "${builtins.substring 0 7 rev}"; + pname = "z88dk"; + version = "unstable-2019-05-09"; src = fetchFromGitHub { owner = "z88dk"; repo = "z88dk"; - inherit rev; - sha256 = "00vbklh6lkq1gyd08ig2vcg6c1mghvlwfx3vq3wldf34hcs3k4pp"; + rev = "826d68632c3a7c17df88dd2ec54571a6041da69c"; + sha256 = "104qgb01sdb97mkcxnq1cdlqi5qvjm4rd9bg5r42pdfz81ss49xj"; + fetchSubmodules = true; }; - # https://github.com/z88dk/z88dk/pull/612 - patches = [(fetchpatch { - url = "https://github.com/Mic92/z88dk/commit/5b4ca132fa1f31c9ac48cf2220358715739ca0b2.patch"; - sha256 = "1p2l31j68p7jzykhkhd9iagn2lr08hdclk3cl9l32p1q6ghdipfv"; - })]; - postPatch = '' # we dont rely on build.sh : export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite export ZCCCFG=$PWD/lib/config/ + # we don't want to build zsdcc since it required network (svn) + # we test in checkPhase + substituteInPlace Makefile \ + --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ + --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' ''; + checkPhase = '' + make testsuite + ''; + #failed on Issue_1105_function_pointer_calls + doCheck = stdenv.hostPlatform.system != "aarch64-linux"; + + #_FORTIFY_SOURCE requires compiling with optimization (-O) + NIX_CFLAGS_COMPILE = "-O"; + + short_rev = "${builtins.substring 0 7 src.rev}"; makeFlags = [ - "prefix=$(out)" "git_rev=${short_rev}" "version=${version}" + "prefix=$(out)" "git_count=0" ]; - nativeBuildInputs = [ makeWrapper unzip ]; + + nativeBuildInputs = [ which makeWrapper unzip ]; buildInputs = [ libxml2 m4 uthash ]; preInstall = '' @@ -41,10 +50,10 @@ stdenv.mkDerivation rec { installTargets = "libs install"; meta = with stdenv.lib; { - homepage = https://www.z88dk.org; + homepage = "https://www.z88dk.org"; description = "z80 Development Kit"; license = licenses.clArtistic; maintainers = [ maintainers.genesis ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From 9b685c7997a9a091c153915d53bd92d02a4c5518 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 May 2019 21:01:17 -0700 Subject: [PATCH 068/637] alsaPlugins: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-plugins/versions --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 90319efd7c7..8e3b61ea13a 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; + sha256 = "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"; }; # ToDo: a52, etc.? From 74aee999dd4105d79874cb6e0b5d5393c9713d1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 10 May 2019 21:10:23 -0700 Subject: [PATCH 069/637] alsaUtils: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-utils/versions --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 2ced9c6094e..09c430bcd53 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"; + sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; patchPhase = '' From 6845f0ed9d4f332a3e174cf1e1e535552b7eaec8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 11 May 2019 09:12:19 +0200 Subject: [PATCH 070/637] pythonPackages.block-io: 1.1.9 -> 1.1.10 --- .../python-modules/block-io/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 03a1181a014..f90f3f9af75 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: +{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: buildPythonPackage rec { pname = "block-io"; - version = "1.1.9"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; + sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BlockIo/block_io-python/commit/8ec0a0cd1afcfcb439d6dc306d8497dd9e4a0993.patch"; - sha256 = "1i6c153wvkr5ncm3cpn34faxvavz534x5kndwn4adlaxlzq30snn"; - }) - ]; - propagatedBuildInputs = [ base58 ecdsa @@ -24,6 +17,11 @@ buildPythonPackage rec { six ]; + preConfigure = '' + substituteInPlace setup.py \ + --replace "ecdsa==0.13" "ecdsa>=0.13" + ''; + # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; From b02120fb9e14bceea0620c0f07a6491fe3ca4a4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 May 2019 06:35:34 -0700 Subject: [PATCH 071/637] gdcm: 2.8.9 -> 3.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdcm/versions --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a1d623c7b98..fca567d683d 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.9"; + version = "3.0.0"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1za252d1chv40d78bkjngrg1p2yx0vya8y9q3vqmz66ip2zilvx7"; + sha256 = "1rhblnl0q4bl3hmanz4ckv5kzdrzdiqp9xlcqh8df3rfrgk4d81x"; }; dontUseCmakeBuildDir = true; From f0b267331214bbab602ff2b04339fb2d09c94cb9 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sat, 11 May 2019 15:37:44 +0200 Subject: [PATCH 072/637] buildah: 1.7.3 -> 1.8.1 Signed-off-by: Vincent Demeester --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 47db8c9fea6..002d90e3f1f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8"; + sha256 = "1w8w10pw5mpr3lc78z2dx3vck40cl7s3zsizsxhs0a9kxnfp01j9"; }; goPackagePath = "github.com/containers/buildah"; From 10aa9a6b05e363555a8226974ddebc7d488548bf Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sat, 11 May 2019 15:56:37 +0200 Subject: [PATCH 073/637] skaffold: 0.28.0 -> 0.29.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 417f0a749c9..cf31d0ad934 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.28.0"; - # rev is the 0.28.0 commit, mainly for skaffold version command output - rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339"; + version = "0.29.0"; + # rev is the 0.29.0 commit, mainly for skaffold version command output + rev = "1bbf9a3f13094e58c90399a4bd7e07250e0d2da5"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw"; + sha256 = "1rf23f7cwmmsycwdyk09wsrsq20vbzg2pi44r3516qsaz7x98mf1"; }; meta = { From 212e4e19330eef14633aadf0d373f949d663bbfd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 May 2019 18:04:41 +0200 Subject: [PATCH 074/637] nexus: 3.15.0-01 -> 3.16.1-02 New upstream release with some minor improvements: https://help.sonatype.com/repomanager3/release-notes/2019-release-notes#id-2019ReleaseNotes-RepositoryManager3.16.1 --- .../repository-managers/nexus/default.nix | 4 +-- .../repository-managers/nexus/nexus-bin.patch | 28 ++++++++----------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 1ade2b35386..ffd9774ee44 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nexus-${version}"; - version = "3.15.0-01"; + version = "3.16.1-02"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0akizdljcjl1nh25k01wxvp5wp4i2jphsj0hh5rqbd0fk1pjivkv"; + sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln"; }; sourceRoot = name; diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch index ce6ecc4a4c9..14bcc973aae 100644 --- a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch +++ b/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch @@ -1,15 +1,17 @@ ---- nexus-3.5.1-02/bin/nexus 2017-08-18 17:51:08.000000000 +0200 -+++ nexus 2017-08-31 12:41:01.271475645 +0200 -@@ -72,7 +72,7 @@ +diff --git a/bin/nexus b/bin/nexus +index d06cb44..37c606e 100755 +--- a/bin/nexus ++++ b/bin/nexus +@@ -88,7 +88,7 @@ create_db_entry() { fi db_new_file=${db_file}_new if [ -f "$db_file" ]; then -- awk '$1 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file -+ awk '$1 != "'"$test_dir"'" {print $scriptname}' $db_file > $db_new_file +- awk '$2 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file ++ awk '$2 != "'"$test_dir"'" {print $scriptname}' $db_file > $db_new_file rm "$db_file" mv "$db_new_file" "$db_file" fi -@@ -236,7 +236,7 @@ +@@ -246,7 +246,7 @@ read_vmoptions() { unpack_file() { if [ -f "$1" ]; then @@ -18,32 +20,24 @@ bin/unpack200 -r "$1" "$jar_file" if [ $? -ne 0 ]; then -@@ -360,8 +360,14 @@ +@@ -377,9 +377,14 @@ fi old_pwd=`pwd` -progname=`basename "$0"` -linkdir=`dirname "$0"` +scriptname=$0 -+ + +if [ ! -z "$ALTERNATIVE_NAME" ]; then + scriptname=`dirname "$0"`"/"$ALTERNATIVE_NAME +fi + +progname=`basename "$scriptname"` +linkdir=`dirname "$scriptname"` - cd "$linkdir" prg="$progname" -@@ -522,7 +528,6 @@ - $INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-XX:+UnlockDiagnosticVMOptions" "-Dinstall4j.launcherId=245" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.UnixLauncher start 9d17dc87 "" "" org.sonatype.nexus.karaf.NexusMain > /dev/null 2>&1 & - -- - ;; - start-launchd) - echo "Starting nexus" -@@ -569,7 +574,7 @@ +@@ -590,7 +595,7 @@ return_code=$? ;; *) From 5866296ee53535ca755c08f1e4a4aa2c04bed32a Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Fri, 10 May 2019 15:48:54 +0200 Subject: [PATCH 075/637] idsk: unstable-2018-02-11 -> 0.19 --- pkgs/tools/filesystems/idsk/default.nix | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 617457f55b6..72ed4f0ee1b 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -2,23 +2,14 @@ stdenv.mkDerivation rec { - repo = "idsk"; - version = "unstable-2018-02-11"; - rev = "1846729ac3432aa8c2c0525be45cfff8a513e007"; - name = "${repo}-${version}"; - - meta = with stdenv.lib; { - description = "Manipulating CPC dsk images and files"; - homepage = https://github.com/cpcsdk/idsk ; - license = "unknown"; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - }; + pname = "idsk"; + version = "0.19"; src = fetchFromGitHub { - inherit rev repo; + repo = "idsk"; owner = "cpcsdk"; - sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv"; + rev = "v${version}"; + sha256 = "0b4my5cz5kbzh4n65jr721piha6zixaxmfiss2zidip978k9rb6f"; }; nativeBuildInputs = [ cmake ]; @@ -27,4 +18,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp iDSK $out/bin ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/cpcsdk/idsk" ; + license = licenses.mit; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; } From 3561ede7f6628385f2c66ef0be815d76ed92f7cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 May 2019 20:55:46 -0700 Subject: [PATCH 076/637] mergerfs: 2.25.1 -> 2.26.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/mergerfs/versions --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 3a8d1d646be..a0981de42b0 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.25.1"; + version = "2.26.0"; src = fetchFromGitHub { owner = "trapexit"; repo = "mergerfs"; rev = version; - sha256 = "1xrd18spp3wj25dd8513bah856w44gw8hilk190v13g6yafx64n6"; + sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9"; }; nativeBuildInputs = [ From 8d24a891da8fd47d899822790516ac8ddc6e5e41 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:52:22 -0400 Subject: [PATCH 077/637] miniupnpc_2: 2.1 -> 2.1.20190408 --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 88b4b7fab88..82b961b6a12 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -28,8 +28,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.1"; - sha256 = "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1"; + version = "2.1.20190408"; + sha256 = "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50"; }; miniupnpc_1 = generic { version = "1.9.20160209"; From dff50d19591f229d08e108b36409d8f3278b3bdf Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:52:59 -0400 Subject: [PATCH 078/637] miniupnpd: 2.1 -> 2.1.20190502 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index f3cd9ea6a81..f65c0c63370 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -6,11 +6,11 @@ let scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { - name = "miniupnpd-2.1"; + name = "miniupnpd-2.1.20190502"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; + sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b"; name = "${name}.tar.gz"; }; From 496d9f97e687d11cff32e83e462f70c0b91dcad3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:53:30 -0400 Subject: [PATCH 079/637] nixos/miniupnpd: update test to use pkgs.miniupnpc_2 --- nixos/tests/upnp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 3f2dd13fb56..98344aee3ef 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -47,7 +47,7 @@ in client1 = { pkgs, nodes, ... }: - { environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ]; + { environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = internalRouterAddress; networking.interfaces.eth1.ipv4.addresses = [ @@ -63,7 +63,7 @@ in client2 = { pkgs, ... }: - { environment.systemPackages = [ pkgs.miniupnpc ]; + { environment.systemPackages = [ pkgs.miniupnpc_2 ]; virtualisation.vlans = [ 1 ]; networking.interfaces.eth1.ipv4.addresses = [ { address = externalClient2Address; prefixLength = 24; } From e74e2e838d9fb331fb8e93daebb5b520e4d7a4f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:31:19 +0200 Subject: [PATCH 080/637] gimpPlugins.resynthesizer: drop It breaks resynthesiser2 and there is actually no reason to keep the ancient version. https://github.com/bootchk/resynthesizer/issues/63#issuecomment-491591082 --- .../graphics/gimp/plugins/default.nix | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 714a1f921d6..16b6a0ccd8c 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -90,26 +90,6 @@ rec { meta.broken = true; }; - resynthesizer = pluginDerivation { - /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection - */ - name = "resynthesizer-0.16"; - buildInputs = with pkgs; [ fftw ]; - src = fetchurl { - url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; - sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; - }; - - installPhase = " - installPlugins resynth - installScripts smart-{enlarge,remove}.scm - "; - }; - resynthesizer2 = pluginDerivation rec { /* menu: Filters/Map/Resynthesize From d5dfc1cd8b3158548f8ffcc050d37f22d85fe39d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:40:30 +0200 Subject: [PATCH 081/637] gimpPlugins: use makeScope --- pkgs/applications/graphics/gimp/plugins/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 16b6a0ccd8c..ac68e377696 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,7 +35,8 @@ let }; in -rec { + +stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -223,4 +224,4 @@ rec { }; */ -} +}) From 2d68295beac21fd974948a7ce1c1f6bd20f39ff7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:41:35 +0200 Subject: [PATCH 082/637] gimpPlugins.resynthesizer: rename from resynthesizer2 --- pkgs/applications/graphics/gimp/plugins/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ac68e377696..f090ad30ae4 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -3,7 +3,7 @@ # preferences -> Folders -> Plug-ins # same applies for the scripts -{ pkgs, gimp }: +{ config, pkgs, gimp }: let inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; inherit (gimp) targetPluginDir targetScriptDir; @@ -91,7 +91,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { meta.broken = true; }; - resynthesizer2 = pluginDerivation rec { + resynthesizer = pluginDerivation rec { /* menu: Filters/Map/Resynthesize Filters/Enhance/Smart enlarge @@ -224,4 +224,8 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { }; */ +} // stdenv.lib.optionalAttrs (config.allowAliases or true) { + + resynthesizer2 = resynthesizer; + }) From 0fe311844e1c9975e2349098ebf68a973daeb107 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:58:16 +0200 Subject: [PATCH 083/637] gimpPlugins.resynthesizer: update menu comment --- pkgs/applications/graphics/gimp/plugins/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f090ad30ae4..1787b1d9e7f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -93,10 +93,13 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { resynthesizer = pluginDerivation rec { /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection + Edit/Fill with pattern seamless... + Filters/Enhance/Heal selection... + Filters/Enhance/Heal transparency... + Filters/Enhance/Sharpen by synthesis... + Filters/Enhance/Uncrop... + Filters/Map/Style... + Filters/Render/Texture... */ pname = "resynthesizer"; version = "2.0.3"; From 5cb32ada4381113ffcdbadc80d88d96aae2f5220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 09:20:56 -0700 Subject: [PATCH 084/637] python37Packages.pamqp: 2.1.0 -> 2.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pamqp/versions --- pkgs/development/python-modules/pamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 844a66392c6..07eab3b7bc9 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.3.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c"; + sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; From 58c998d633154a7ffe9cc4d8a4c49fe4f4647421 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 12 May 2019 14:31:45 -0400 Subject: [PATCH 085/637] pythonPackages.celery: unpin moto --- pkgs/development/python-modules/celery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 404ead243a9..41c9493922a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements/test.txt \ + --replace "moto==1.3.7" moto \ --replace "pytest>=4.3.1,<4.4.0" pytest ''; From 2fddcae0c82d57a6600d596b2cb9e2dd88c91bc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 11:38:29 -0700 Subject: [PATCH 086/637] python37Packages.pympler: 0.6 -> 0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pympler/versions --- pkgs/development/python-modules/pympler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index a331f5e1175..a9350f20eb3 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7"; + sha256 = "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs"; }; postPatch = '' From abbb7374130bdae5716c5f87acae3dbac715316c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 12:41:57 -0700 Subject: [PATCH 087/637] python37Packages.python-axolotl: 0.1.42 -> 0.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-python-axolotl/versions --- pkgs/development/python-modules/python-axolotl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 299a1887199..8c493653299 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-axolotl"; - version = "0.1.42"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0"; + sha256 = "1had4dq4n26c3hp62rbmhvs1dj3j3z2jhcbddnbsmqmiky8dqs39"; }; propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; From 73d64d4a04cede3953f4c26e32c14d6314abb13a Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Sun, 12 May 2019 21:10:11 +0200 Subject: [PATCH 088/637] openra: 20181215 -> 20190314 + updated other engine releases and mods --- pkgs/games/openra/common.nix | 7 ++-- pkgs/games/openra/engines.nix | 14 ++++---- pkgs/games/openra/mod-launch-game.sh | 6 ++-- pkgs/games/openra/mod-update.sh | 27 ++++++++++------ pkgs/games/openra/mods.nix | 48 ++++++++++++++-------------- 5 files changed, 54 insertions(+), 48 deletions(-) diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 200b9da4a7e..b0d1f2a5455 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -3,7 +3,7 @@ */ { stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper , lua, mono, dotnetPackages, python -, libGL, openal, SDL2 +, libGL, freetype, openal, SDL2 , zenity }: @@ -11,7 +11,7 @@ with stdenv.lib; let path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); - rpath = makeLibraryPath [ lua openal SDL2 ]; + rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { } ./mkdirp.sh; in { @@ -54,10 +54,7 @@ in { StyleCopMSBuild StyleCopPlusMSBuild ] ++ [ - lua libGL - openal - SDL2 ]; # TODO: Test if this is correct. diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 7454d32c113..a6eb363dcb7 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -22,20 +22,20 @@ let in { release = name: (buildUpstreamOpenRAEngine rec { - version = "20181215"; + version = "20190314"; rev = "${name}-${version}"; - sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; } name); playtest = name: (buildUpstreamOpenRAEngine rec { - version = "20190106"; + version = "20190302"; rev = "${name}-${version}"; - sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; + sha256 = "1vqvfk2p2lpk3m0d3rpvj34i8cmk3mfc7w4cn4llqd9zp4kk9pya"; } name); bleed = buildUpstreamOpenRAEngine { - version = "9c9cad1"; - rev = "9c9cad1a15c3a34dc2a61b305e4a9a735381a5f8"; - sha256 = "0100p7wrnnlvkmy581m0gbyg3cvi4i1w3lzx2gq91ndz1sbm8nd2"; + version = "8ee1102"; + rev = "8ee11028d72cde7556b31d45f556b40be65b4b70"; + sha256 = "19fjzwgmfdf832c6b1x885kaiyck03kpiba0qpsxvps04i7b3vj4"; }; } diff --git a/pkgs/games/openra/mod-launch-game.sh b/pkgs/games/openra/mod-launch-game.sh index c0b6feb69c8..88b53e71e1b 100644 --- a/pkgs/games/openra/mod-launch-game.sh +++ b/pkgs/games/openra/mod-launch-game.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash show_error() { if command -v zenity > /dev/null; then zenity --no-wrap --no-markup --error --title "OpenRA - @title@" --text "$1" 2>/dev/null @@ -12,7 +12,7 @@ cd "@out@/lib/openra-@name@" # Check for missing assets assetsError='@assetsError@' -if [ -n "$assetsError" -a ! -d "$HOME/.openra/Content/@name@" ]; then +if [[ -n "$assetsError" && ! -d "$HOME/.openra/Content/@name@" ]]; then show_error "$assetsError" fi @@ -20,6 +20,6 @@ fi mono --debug OpenRA.Game.exe Game.Mod=@name@ Engine.LaunchPath="@out@/bin/openra-@name@" Engine.ModSearchPaths="@out@/lib/openra-@name@/mods" "$@" # Show a crash dialog if something went wrong -if [ $? -ne 0 -a $? -ne 1 ]; then +if (( $? != 0 && $? != 1 )); then show_error $'OpenRA - @title@ has encountered a fatal error.\nPlease refer to the crash logs for more information.\n\nLog files are located in ~/.openra/Logs' fi diff --git a/pkgs/games/openra/mod-update.sh b/pkgs/games/openra/mod-update.sh index 52bcada8f9a..8489d5a97a7 100755 --- a/pkgs/games/openra/mod-update.sh +++ b/pkgs/games/openra/mod-update.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC2034 # for mod in $(nix eval --raw '( # with import { }; @@ -9,9 +10,7 @@ # ./mod-update.sh "$mod" # done -# Uses: -# https://github.com/msteen/nix-prefetch -# https://github.com/msteen/nix-update-fetch +# Uses: https://github.com/msteen/nix-upfetch mod=$1 commit_count=$2 @@ -19,7 +18,7 @@ token= nixpkgs='' die() { - ret=$? + local ret=$? echo "$*" >&2 exit $ret } @@ -34,13 +33,16 @@ get_sha1() { curl -H "Authorization: token $token" -H 'Accept: application/vnd.github.VERSION.sha' "https://api.github.com/repos/$owner/$repo/commits/$ref" } +[[ -n $mod ]] || die "The first argument of this script has to be a mod identifier." + [[ -n $token ]] || die "Please edit this script to include a GitHub API access token, which is required for API v4: https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/" # Get current mod_owner and mod_repo. -vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --skip-hash > >( +vars=$(nix-prefetch --file "$nixpkgs" "openraPackages.mods.$mod" --index 0 --quiet --output json --no-compute-hash > >( jq --raw-output 'with_entries(select(.value | contains("\n") | not)) | to_entries | .[] | .key + "=" + .value')) || exit +mod_owner=; mod_repo=; mod_rev= while IFS='=' read -r key val; do declare "mod_${key}=${val}" done <<< "$vars" @@ -65,11 +67,12 @@ else }' fi -query='query { - repository(owner: \"'"$mod_owner"'\", name: \"'"$mod_repo"'\") { +# shellcheck disable=SC2089 +query='{ + repository(owner: "'$mod_owner'", name: "'$mod_repo'") { defaultBranchRef { target { - ... on Commit '"$query_on_commit"' + ... on Commit '$query_on_commit' } } licenseInfo { @@ -80,7 +83,9 @@ query='query { # Newlines are not allowed in a query. # https://developer.github.com/v4/guides/forming-calls/#communicating-with-graphql +# shellcheck disable=SC2086 disable=SC2090 disable=SC2116 query=$(echo $query) +query=${query//\"/\\\"} # https://developer.github.com/v4/guides/using-the-explorer/#configuring-graphiql json=$(curl -H "Authorization: bearer $token" -X POST -d '{ "query": "'"$query"'" }' https://api.github.com/graphql) || exit @@ -99,12 +104,14 @@ vars=$(jq --raw-output '.data.repository | { rev: .oid, }) | to_entries | .[] | .key + "=" + (.value | tostring)' <<< "$json") || exit +mod_license_key=; mod_version=; mod_rev= while IFS='=' read -r key val; do declare "mod_${key}=${val}" done <<< "$vars" mod_config=$(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/mod.config") || exit +mod_id=; engine_version=; automatic_engine_management=; automatic_engine_source= while IFS='=' read -r key val; do declare "${key,,}=$(jq --raw-output . <<< "$val")" done < <(grep '^\(MOD_ID\|ENGINE_VERSION\|AUTOMATIC_ENGINE_MANAGEMENT\|AUTOMATIC_ENGINE_SOURCE\)=' <<< "$mod_config") @@ -116,6 +123,7 @@ echo >&2 [[ $mod_id == "$mod" ]] || die "The mod '$mod' reports being mod '$mod_id' instead." +# shellcheck disable=SC2005 disable=SC2046 [[ $mod_license_key == gpl-3.0 ]] || [[ $(echo $(head -2 <(curl "https://raw.githubusercontent.com/$mod_owner/$mod_repo/$mod_rev/COPYING"))) == 'GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007' ]] || die "The mod '$mod' is licensed under '$mod_license_key' while expecting 'gpl-3.0'." @@ -126,6 +134,7 @@ echo >&2 engine_owner=${BASH_REMATCH[1]} engine_repo=${BASH_REMATCH[2]} +# shellcheck disable=SC2016 [[ ${BASH_REMATCH[3]} == '${ENGINE_VERSION}' ]] || engine_version=${BASH_REMATCH[3]} engine_rev=$(get_sha1 "$engine_owner" "$engine_repo" "$engine_version") @@ -146,6 +155,6 @@ for type in mod engine; do done var="${type}_version" version=${!var} - nix-update-fetch --yes --version "$version" "$(nix-prefetch --quiet --file "$nixpkgs" "openraPackages.mods.$mod" --index $i --output json --with-position --diff -- "${fetcher_args[@]}")" + nix-upfetch --yes --version "$version" "$(nix-preupfetch --file "$nixpkgs" "openraPackages.mods.$mod" --index $i -- "${fetcher_args[@]}")" (( i++ )) done diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index ddc34dbda8f..1e81e02e59f 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -60,23 +60,23 @@ in { }; dr = buildOpenRAMod rec { - version = "266.git.920b476"; + version = "324.git.ffcd6ba"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/drogoganor/DarkReign; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; - rev = "920b476be1b7751db087f1f7acd504b8a048d1e2"; - sha256 = "11ir4pnichrnv4z9532fp9g166jl8fvy5kk03a2fgxssp3g40zz2"; + rev = "ffcd6ba72979e5f77508136ed7b0efc13e4b100e"; + sha256 = "07g4qw909649s3i1yhw75613mpwfka05jana5mpp5smhnf0pkack"; }; engine = { version = "DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "OpenRA" ; - rev = "e08b75c2add30439228ea3dd61d6be60d1800329"; - sha256 = "125vf962p69ajrh5pxgfwsi0ksczqwvlw5kn2fvffiwvh8d5in23"; + rev = "f91d3f2603bbf51afaa89357e4defcdc36138102"; + sha256 = "05g900ri6q0zrkrk8rmjaz576vjggmi2y6jm0xz3cwli54prn11w"; name = "engine"; inherit extraPostFetch; }; @@ -161,15 +161,15 @@ in { }; ra2 = buildOpenRAMod rec { - version = "881.git.b37f4f9"; + version = "903.git.2f7c700"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; homepage = https://github.com/OpenRA/ra2; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; - rev = "b37f4f9f07404127062d9061966e9cc89dd86445"; - sha256 = "1jiww66ma3qdk9hzyvhbcaa5h4p2mxxk22kvrw92ckpxy0bqba3h"; + rev = "2f7c700d6d63c0625e7158ef3098221fa6741569"; + sha256 = "11vnzwczn47wjfrq6y7z9q234p27ihdrcl5p87i6h2xnrpwi8b6m"; }; engine = rec { version = "release-20180923"; @@ -189,23 +189,23 @@ in { }; raclassic = buildOpenRAMod { - version = "181.git.8240890"; + version = "183.git.c76c13e"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; homepage = https://github.com/OpenRA/raclassic; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; - rev = "8240890b32191ce34241c22158b8a79e8c380879"; - sha256 = "0dznyb6qa4n3ab87g1c4bihfc2nx53k6z0kajc7ynjdnwzvx69ww"; + rev = "c76c13e9f0912a66ddebae8d05573632b19736b2"; + sha256 = "1cnr3ccvrkjlv8kkdcglcfh133yy0fkva9agwgvc7wlj9n5ydl4g"; }; engine = rec { - version = "playtest-20190106"; + version = "release-20190314"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; rev = version; - sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; inherit extraPostFetch; }; @@ -242,24 +242,24 @@ in { }; sp = unsafeBuildOpenRAMod { - version = "176.git.fc89ae8"; + version = "221.git.ac000cc"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; homepage = https://github.com/ABrandau/OpenRAModSDK; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; - rev = "fc89ae8a10e0f765ac735f923e01aa24dd20e8d2"; - sha256 = "0xyxhipmjlld0kp23fwsdwnspr7fci0mdnjd60gcsh34c7m0341p"; + rev = "ac000cc15377cdf6d3c2b72c737d692aa0ed8bcd"; + sha256 = "16mzs5wcxj9nlpcyx2c87idsqpbm40lx0rznsccclnlb3hiwqas9"; }; engine = { - version = "SP-Bleed-Branch"; + version = "SP-22-04-19"; mods = [ "as" "ts" ]; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRA" ; - rev = "d3545c0b751aea2105748eddaab5919313e35314"; - sha256 = "1jsldl6vnf3r9dzppdm4z7kqbrzkidda5k74wc809i8c4jjnq9rq"; + rev = "bb0930008a57c07f3002421023f6b446e3e3af69"; + sha256 = "1jvgpbf56hd02ikhklv49br4d1jiv5hphc5kl79qnjlaacnj222x"; name = "engine"; inherit extraPostFetch; }; @@ -315,23 +315,23 @@ in { }; yr = unsafeBuildOpenRAMod rec { - version = "118.git.c26bf14"; + version = "199.git.5b8b952"; homepage = https://github.com/cookgreen/yr; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { owner = "cookgreen"; repo = "yr"; - rev = "c26bf14155d040edf33c6c5eb3677517d07b39f8"; - sha256 = "15k6gv4rx3490n0cs9q7ah7q31z89v0pddsw6nqv0fhcahhvq1bc"; + rev = "5b8b952dbe21f194a6d00485f20e215ce8362712"; + sha256 = "0hxzrqnz5d7qj1jjr20imiyih62x1cnmndf75nnil4c4sj82f9a6"; }; engine = rec { - version = "release-20180923"; + version = "release-20190314"; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA" ; rev = version; - sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; + sha256 = "15pvn5cx3g0nzbrgpsfz8dngad5wkzp5dz25ydzn8bmxafiijvcr"; name = "engine"; inherit extraPostFetch; }; From ce729d33a205221e4946a847822463d42a8bbb59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 15:53:33 -0700 Subject: [PATCH 089/637] python37Packages.sphinxcontrib_plantuml: 0.14 -> 0.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-sphinxcontrib-plantuml/versions --- .../python-modules/sphinxcontrib_plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index f20a3435a00..f66265ba5e0 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.14"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82"; + sha256 = "06yl6aiw8gpq3wmi6wxy5lahfgbbmlw6nchq9h1ssi5lipwaxn7a"; }; # No tests included. From 6f88e9a59b15cb813a7ca5dc94024692df60b60e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 17:04:49 -0700 Subject: [PATCH 090/637] python37Packages.xdis: 3.8.10 -> 4.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-xdis/versions --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index c5837e5da53..e5d06a3c694 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "xdis"; - version = "3.8.10"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b00f37296edf2a4fe7b67b5d861c342426d442666d241674fdfc333936bd59bf"; + sha256 = "1ifakxxawyxw4w4p58m4xdc0c955miqyaq3dfbl386ipw0f50kyz"; }; checkInputs = [ pytest ]; From ca123bf7bab08829c80e774514539d90859e5f67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 17:07:49 -0700 Subject: [PATCH 091/637] python37Packages.xcffib: 0.7.0 -> 0.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-xcffib/versions --- pkgs/development/python-modules/xcffib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 0b4f9578b55..1fe80fdf746 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "12yc2r8967hknk829q1lbsw6b9z7qa25y8dx8kz6c9qnlc215vb8"; + sha256 = "1lf5plgfi92ir6bsjyjb9yvqjbxzh2cag33c8jl435iaxmnh76f3"; }; patchPhase = '' From a7928fc731778ef676b85102a4847d90d28dfce3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 21:32:52 -0700 Subject: [PATCH 092/637] signify: 24 -> 25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/signify/versions --- pkgs/tools/security/signify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 68db242f40a..a642a12b0bd 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "signify-${version}"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "aperezdc"; repo = "signify"; rev = "v${version}"; - sha256 = "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"; + sha256 = "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq"; }; doCheck = true; From 8ffec65d3f70e95e8f8ac208287d2168ec1e7669 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 22:16:35 -0700 Subject: [PATCH 093/637] spdk: 18.04 -> 19.04 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spdk/versions --- pkgs/development/libraries/spdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 14672c78d21..cab0e69ad1a 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spdk-${version}"; - version = "18.04"; + version = "19.04"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n"; + sha256 = "10mzal1hspnh26ws5d7sc54gyjfzkf6amr0gkd7b368ng2a9z8s6"; }; nativeBuildInputs = [ python ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of libraries for fast user-mode storage"; - homepage = http://www.spdk.io; + homepage = "https://spdk.io/"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ orivej ]; From fa3f68edab6842273fdaec72acacfd5587fbf155 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 13 May 2019 12:26:58 +0300 Subject: [PATCH 094/637] nginxModules.http_proxy_connect_module: 16.04.2019 -> 06.05.2019 --- pkgs/servers/http/nginx/modules.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 347ac290378..7da825b11fe 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -6,8 +6,8 @@ let src = fetchFromGitHub { owner = "chobits"; repo = "ngx_http_proxy_connect_module"; - rev = "18e2520b361ffebde6c08c8119ecfba113a3b53c"; - sha256 = "1nyil5n2a97nqsqarvnp4bazw4vnxifqizzw5aank4vi9xlq90b2"; + rev = "002f8f9ef15562dc3691b977134518ad216d7a90"; + sha256 = "163wg0xb7w5mwh6wrfarzcgaf6c7gb5qydgpi2wk35k551f7286s"; }; patches = [ @@ -96,12 +96,8 @@ in }; }; - http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // { - supports = with lib.versions; version: major version == "1" && minor version == "15"; - }; - - http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // { - supports = with lib.versions; version: major version == "1" && minor version == "14"; + http_proxy_connect_module_v16 = http_proxy_connect_module_generic "proxy_connect_rewrite_101504" // { + supports = with lib.versions; version: major version == "1" && minor version == "16"; }; ipscrub = { From 872f056bb40155f49a964255b80a235f7c241223 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 13 May 2019 12:33:20 +0300 Subject: [PATCH 095/637] nginxModules.lua: 0.10.14 -> 0.10.15 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 7da825b11fe..5e21e8734bf 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -132,8 +132,8 @@ in src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.10.14"; - sha256 = "1vg6pp9n8z42p6f3jqk15gvdyy7mfvs5ssfbiy83bydjx42fq7g0"; + rev = "v0.10.15"; + sha256 = "1j216isp0546hycklbr5wi8mlga5hq170hk7f2sm16sfavlkh5gz"; }; inputs = [ pkgs.luajit ]; preConfigure = '' From b324116100aa8d8c406f2c423ea0e0d9569d1d94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 May 2019 05:41:00 -0700 Subject: [PATCH 096/637] xonsh: 0.8.12 -> 0.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xonsh/versions --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 3d55dcc2f9b..c7609a5f124 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.8.12"; + version = "0.9.0"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1p8slx8nk15vyyzwc9ic50py0amk9p9nggp1973wfas0fxsg1r4f"; + sha256 = "1833xqw5y65cv3c71skqix1xh3qqgv1kps1500cczpyrc8daka23"; }; LC_ALL = "en_US.UTF-8"; From 3a5fdff8305e8aa4a570dacbbcf1d660bd07dc1c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 13 May 2019 22:29:19 +0800 Subject: [PATCH 097/637] cargo-bloat: 0.6.3 -> 0.6.4 --- .../tools/rust/cargo-bloat/cargo-lock.patch | 19 ------------------- .../tools/rust/cargo-bloat/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch diff --git a/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch b/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch deleted file mode 100644 index 006f996f43c..00000000000 --- a/pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 01d38a8..e74e735 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,3 +1,5 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. - [[package]] - name = "adler32" - version = "1.0.3" -@@ -41,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "cargo-bloat" --version = "0.6.2" -+version = "0.6.3" - dependencies = [ - "goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)", - "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 541c87a3ca8..56cc17bef17 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0jpwaw8ryfvfw5ypjvli18wwv6l1r6dyz1msipdpy7nvw1qdw54h"; + sha256 = "041n4kj8kym9hcjc32m4b7nxfqnmzlyy5gfzjblx4nbg151hy945"; }; - cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1275jfzkpkzbwv927hdkv4zplmynwrm7sbirq18dwfss55cm7r7z"; meta = with stdenv.lib; { From 4d5ebf6fc8e9c4dee1d7d1d3ffef9ff2fc3311d5 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 13 May 2019 19:02:41 +0300 Subject: [PATCH 098/637] wf-recorder: unstable-2019-04-21 -> 0.1 --- pkgs/applications/video/wf-recorder/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 6a15132fd24..d52a4a6ab9b 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols +, ffmpeg, x264, libpulseaudio +}: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "unstable-2019-04-21"; + version = "0.1"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; - rev = "ddb96690556371007e316577ed1b14f0cb62e13c"; - sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3"; + rev = "v${version}"; + sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; From c7ab2b94994a05cb9a2abd768b5ffda6710ecc73 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 18:58:27 +0200 Subject: [PATCH 099/637] simgrid: 3.21 -> 3.22.2 - GitHub -> Framagit (SimGrid main repo has moved) - Test binaries must now be explicitly compiled (`make tests`) - Fix broken documentation link --- .../science/misc/simgrid/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 0b663b2fb63..e04b8da980b 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind +{ stdenv, fetchgit, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -18,13 +18,12 @@ in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.21"; + version = "3.22.2"; - src = fetchFromGitHub { - owner = "simgrid"; - repo = "simgrid"; - rev = "v${replaceChars ["."] ["_"] version}"; - sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs"; + src = fetchgit { + url = "https://framagit.org/simgrid/simgrid.git"; + rev = "v${version}"; + sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { # - lua53: for enable_lua # # For more information see: - # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list + # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) cmakeFlags= '' -Denable_documentation=${optionOnOff buildDocumentation} -Denable_java=${optionOnOff buildJavaBindings} @@ -87,6 +86,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + make tests -j $NIX_BUILD_CORES ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple runHook postCheck From 18765a70baf7f508304412b4339f9c708afa01d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:28:01 +0200 Subject: [PATCH 100/637] pythonPackages.wasabi: init at 0.2.2 --- .../python-modules/wasabi/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/wasabi/default.nix diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix new file mode 100644 index 00000000000..01a9a4034d5 --- /dev/null +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "wasabi"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest wasabi/tests + ''; + + meta = with stdenv.lib; { + description = "A lightweight console printing and formatting toolkit"; + homepage = https://github.com/ines/wasabi; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c8026ced43..251c0e91c60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5431,6 +5431,8 @@ in { thinc = callPackage ../development/python-modules/thinc { }; + wasabi = callPackage ../development/python-modules/wasabi { }; + yahooweather = callPackage ../development/python-modules/yahooweather { }; spacy = callPackage ../development/python-modules/spacy { }; From b631c266ee2fba9fefdf1a634a729b0639772102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:29:14 +0200 Subject: [PATCH 101/637] pythonPackages.srsly: init at 0.0.5 --- .../python-modules/srsly/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/srsly/default.nix diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix new file mode 100644 index 00000000000..ca5909f02f6 --- /dev/null +++ b/pkgs/development/python-modules/srsly/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, mock +, numpy +, pathlib +, pytest +, pytz +}: + +buildPythonPackage rec { + pname = "srsly"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0apgm8znc3k79ifja16fvxsxwgpy3n2fvbp7iwf9szizzpjscylp"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; + + checkInputs = [ + mock + numpy + pytest + pytz + ]; + + # TypeError: cannot serialize '_io.BufferedRandom' object + # Possibly because of sandbox restrictions. + doCheck = false; + + meta = with stdenv.lib; { + description = "Modern high-performance serialization utilities for Python"; + homepage = https://github.com/explosion/srsly; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 251c0e91c60..63a1f7f0d69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + srsly = callPackage ../development/python-modules/srsly { }; + thinc = callPackage ../development/python-modules/thinc { }; wasabi = callPackage ../development/python-modules/wasabi { }; From 54f9e90e4f9da32e0b00590de710e7f344a32ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:30:13 +0200 Subject: [PATCH 102/637] pythonPackages.blis: init at 0.2.4 --- .../python-modules/blis/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/blis/default.nix diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix new file mode 100644 index 00000000000..5fee40a941f --- /dev/null +++ b/pkgs/development/python-modules/blis/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, cython +, hypothesis +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "blis"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d"; + }; + + nativeBuildInputs = [ + cython + ]; + + + checkInputs = [ + cython + hypothesis + numpy + pytest + ]; + + meta = with stdenv.lib; { + description = "BLAS-like linear algebra library"; + homepage = https://github.com/explosion/cython-blis; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63a1f7f0d69..0414d81a775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5429,6 +5429,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + blis = callPackage ../development/python-modules/blis { }; + srsly = callPackage ../development/python-modules/srsly { }; thinc = callPackage ../development/python-modules/thinc { }; From 613e802f01a939e7d3b4ac6ac62ac53364658170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:08 +0200 Subject: [PATCH 103/637] pythonPackages.thinc: 6.12.1 -> 7.0.4 --- .../python-modules/thinc/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79ae18d33ea..9cb25af7a92 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,15 +21,18 @@ , mock , wrapt , dill +, blis +, srsly +, wasabi }: buildPythonPackage rec { pname = "thinc"; - version = "6.12.1"; + version = "7.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich"; + sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ]); propagatedBuildInputs = [ + blis cython cymem msgpack-numpy @@ -48,8 +52,10 @@ buildPythonPackage rec { cytoolz plac six + srsly wrapt dill + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -61,12 +67,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ - --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel" \ - --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ - --replace "msgpack>=0.5.6,<0.6.0" "msgpack" + --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" ''; # Cannot find cython modules. From 52731eb4f64f10c02ca2536e8ccbd32a751e7a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 15:31:31 +0200 Subject: [PATCH 104/637] python3Packages.spacy: 2.0.18 -> 2.1.3 Changes: https://github.com/explosion/spaCy/releases The largest change since 2.0.x is support for ELMo/BERT-like pretraining. --- .../development/python-modules/spacy/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a39593bb9e7..a59cd78d6a2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -17,22 +17,24 @@ , pathlib , msgpack-python , msgpack-numpy +, jsonschema +, blis +, wasabi +, srsly }: buildPythonPackage rec { pname = "spacy"; - version = "2.0.18"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj"; + sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; }; prePatch = '' substituteInPlace setup.py \ - --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ @@ -49,6 +51,10 @@ buildPythonPackage rec { ftfy msgpack-python msgpack-numpy + jsonschema + blis + wasabi + srsly ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ From 21ec7004f69c7d67fc16c7c33de238bc777373e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 11 May 2019 17:54:40 +0200 Subject: [PATCH 105/637] python3Packages.spacy_models: 2.0.0 -> 2.1.0 - Update models for spaCy 2.1. - Add medium/small-sized models for Greek. - Add medium-sized model for German. --- .../python-modules/spacy/models.json | 70 ++++++++++++------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 34b8082872b..d8078c116c2 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,78 +1,96 @@ [{ + "pname": "de_core_news_md", + "version": "2.1.0", + "sha256": "0q1flyrp2n8ja11kdlw6x1k0gll0r096pxy8ba4xv15hjng2zay1", + "license": "cc-by-sa-40" +}, +{ "pname": "de_core_news_sm", - "version": "2.0.0", - "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", + "version": "2.1.0", + "sha256": "0fj4dqa915i6niyskxmw2318fxzjhgdjhjx79h9cpp4mxw719w95", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_md", + "version": "2.1.0", + "sha256": "1rgy9hlb92amhlbwkd91yh87xssqj2a1ign0wm59aai69rb79q3s", + "license": "cc-by-sa-40" +}, +{ + "pname": "el_core_news_sm", + "version": "2.1.0", + "sha256": "07n7qg0nnzg5gjq7vs72j9qc6z4zjx65qsrrj0hjhiihk3ps378z", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.0.0", - "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "version": "2.1.0", + "sha256": "0ywcczd9nsxmpfwknxa7z54h566bwi7chq0jzx3sqk2a6lva4q52", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.0.0", - "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", + "version": "2.1.0", + "sha256": "10vgq1xd6dpdl7xdssgf0kywbq7xpxp79yqc2vcnl3c4axfpwk5q", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.0.0", - "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", + "version": "2.1.0", + "sha256": "1wg5a7nxq82sfmnc3j5xfr8il65rprmcx2h36va5dvydm1h6icad", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.0.0", - "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", + "version": "2.1.0", + "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.0.0", - "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "version": "2.1.0", + "sha256": "02v7hm711r9ma8p5yk057z7hm2pcvpfjgnjszc697d0ymfn4avby", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.0.0", - "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "version": "2.1.0", + "sha256": "1smyyb1gqp090sailqdqp5v5ww4kf99a3hcd9d9rdhn1wgsv28dh", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.0.0", - "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "version": "2.1.0", + "sha256": "0n94ja7y4jbvz0k0x5bij2dypy11ikvgpd9dav0m0hw1wpqgls1i", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.0.0", - "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "version": "2.1.0", + "sha256": "1czr40y5sqs0n2dd4s37kc2xawkh2nsj41wvmsx48bw0aksb1n75", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.0.0", - "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "version": "2.1.0", + "sha256": "1i8dm703mf1l39jwis3mn5mb9azpx6bsimh66iriax94612x64mb", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "2.0.0", - "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "version": "2.1.0", + "sha256": "0ywyn7jprsfr10bvwnm3qk270raxm9s9rvzyp1cp7ca037ab633y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.0.0", - "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "version": "2.1.0", + "sha256": "0vigc9x7158sdqxjgcxgvp6458k5936jlmlp2qdmlmzxr5wmfrbc", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.0.0", - "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", + "version": "2.1.0", + "sha256": "19sfsxwjqdzlfm43gb4hbyj0hgqcfhcfxwdib4g5i1pcfx1v3pf4", "license": "cc-by-sa-40" }] From 635385388fdd7600a58a66adf3a4dc39d7769b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 13 May 2019 20:03:21 +0200 Subject: [PATCH 106/637] python3Packages.spacy: 2.1.3 -> 2.1.4 This release has some improvements for training models: https://github.com/explosion/spaCy/releases/tag/v2.1.4 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a59cd78d6a2..80524154f67 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "01mmgfn7r288jklz6902xfb5dbih0h29s9p0na12gyj2c7gnvf5i"; + sha256 = "03m4c59aaqpqr2x5yhv7y37z0vxhmmkfi6dv4cbp9nxsq9wv100d"; }; prePatch = '' From aa29b79e8a2c8ff7b51fb3ae801f4f19ff159d48 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 21:26:09 +0200 Subject: [PATCH 107/637] simgrid: fetchgit -> fetchFromGitLab --- pkgs/applications/science/misc/simgrid/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index e04b8da980b..43b6f294cdc 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, perl, python3, boost, valgrind +{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -17,13 +17,16 @@ let in stdenv.mkDerivation rec { - name = "simgrid-${version}"; + pname = "simgrid"; version = "3.22.2"; + name = "${pname}-${version}"; - src = fetchgit { - url = "https://framagit.org/simgrid/simgrid.git"; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; + sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] From 1bcfffdb1e83cd5c5645a25d9c47cf4851965dcd Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 11 May 2019 00:00:09 +0200 Subject: [PATCH 108/637] python3Packages.pyftdi: init at 0.29.4 --- .../python-modules/pyftdi/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pyftdi/default.nix diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix new file mode 100644 index 00000000000..8f80447b85d --- /dev/null +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pyusb +, pyserial +}: + +buildPythonPackage rec { + pname = "pyftdi"; + version = "0.29.4"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jy0xbqvmhy0nq9v86759d96raa8p52yq8ik3ji5kjlx7cizq67v"; + }; + + propagatedBuildInputs = [ pyusb pyserial ]; + + meta = { + description = "User-space driver for modern FTDI devices"; + homepage = "http://github.com/eblot/pyftdi"; + license = lib.licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c8026ced43..9ec657d7b1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -677,6 +677,8 @@ in { pyfttt = callPackage ../development/python-modules/pyfttt { }; + pyftdi = callPackage ../development/python-modules/pyftdi { }; + pygame = callPackage ../development/python-modules/pygame { }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; From a025f8535e88d21124998ae79cf4de636a77771d Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 10 May 2019 19:16:06 +0200 Subject: [PATCH 109/637] openexr: fix cross-compilation --- pkgs/development/libraries/openexr/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b575fa0ef08..5815db81352 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { ./bootstrap ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; From 12a1533f69a0c1f0f25e80a1ff57c6f57e5ad2c7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 13 May 2019 16:27:14 -0500 Subject: [PATCH 110/637] ell: 0.19 -> 0.20 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 26c39fdbe6c..887c09691eb 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.19"; + version = "0.20"; src = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; rev = version; - sha256 = "0qvgn5yxffgmlggixf6kh57gxricf57iyc8mqwn46j615bijvjs8"; + sha256 = "1g143dbc7cfks63k9yi2m8hpgfp9jj5b56s3hyxjzxm9dac3yn6c"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 7bff53a8bc55cc9fb88f05488a25d3c8ab421f94 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 13 May 2019 16:28:05 -0500 Subject: [PATCH 111/637] iwd: 0.17 -> 0.18 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 1f8f8c90272..1ba463d1e9a 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "0.17"; + version = "0.18"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1bqkzl03qvzfq5hqd9nsfc98k0iyz864nzcrnbf3fr0n9wnzqffz"; + sha256 = "19scrkdyfj92cycirm22in1jf6rb77sy419gki4m9j8zdyapcqm9"; }; nativeBuildInputs = [ From c2f715370050fb5c73ea4cf3f2f7fe7bbbede0a9 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 13 May 2019 23:38:43 +0200 Subject: [PATCH 112/637] doc/stdenv.xml: fix typo --- doc/stdenv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 63e6450860a..003cd5d25af 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1579,7 +1579,7 @@ installTargets = "install-bin install-doc"; - Like dontStripHost, but only affects the + Like dontStrip, but only affects the strip command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. @@ -1592,7 +1592,7 @@ installTargets = "install-bin install-doc"; - Like dontStripHost, but only affects the + Like dontStrip, but only affects the strip command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. From 80a10b1a5f2d8d0773ce1e2c91344fb8e737989c Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Tue, 14 May 2019 01:58:10 +0200 Subject: [PATCH 113/637] anbox: unstable-2019-03-07 -> unstable-2019-05-03 This fixes a build issue with protobuf that was seemingly resolved upstream. --- pkgs/os-specific/linux/anbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index a21a0bb58bd..9d3f7c34b0f 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2019-03-07"; + version = "unstable-2019-05-03"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d521e282965462e82465045ab95d4ae1c4619685"; - sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz"; + rev = "ea2b7a3dea34a6803134f4adc16c276f4c2479eb"; + sha256 = "00x772nbrbx7ma0scr24m65g50pmi4v6d6q3cwbbi55r8qiy2yz7"; }; nativeBuildInputs = [ From 758050e411086d9ae0654cbc52f58122034768b8 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 13 May 2019 19:34:15 -0500 Subject: [PATCH 114/637] maintainers: add brianhicks --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73858c179b7..7a1d61a85cf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -762,6 +762,11 @@ github = "brian-dawn"; name = "Brian Dawn"; }; + brianhicks = { + email = "brian@brianthicks.com"; + github = "BrianHicks"; + name = "Brian Hicks"; + }; bricewge = { email = "bricewge@gmail.com"; github = "bricewge"; From 9bf8f183682a708f9f283898abddf1a28619cb45 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 13 May 2019 15:43:05 -0500 Subject: [PATCH 115/637] devd: init at 0.9 devd is a local development server designed to be used with modd (already in nixpkgs.) --- pkgs/development/tools/devd/default.nix | 22 +++ pkgs/development/tools/devd/deps.nix | 201 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 225 insertions(+) create mode 100644 pkgs/development/tools/devd/default.nix create mode 100644 pkgs/development/tools/devd/deps.nix diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix new file mode 100644 index 00000000000..f3e63c53789 --- /dev/null +++ b/pkgs/development/tools/devd/default.nix @@ -0,0 +1,22 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: + +buildGoPackage rec { + pname = "devd"; + version = "0.9"; + src = fetchFromGitHub { + owner = "cortesi"; + repo = "devd"; + rev = "v${version}"; + sha256 = "1b02fj821k68q7xl48wc194iinqw9jiavzfl136hlzvg4m07p1wf"; + }; + goPackagePath = "github.com/cortesi/devd"; + subPackages = [ "cmd/devd" ]; + goDeps = ./deps.nix; + meta = with stdenv.lib; { + description = "A local webserver for developers"; + homepage = https://github.com/cortesi/devd; + license = licenses.mit; + maintainers = with maintainers; [ brianhicks ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/devd/deps.nix b/pkgs/development/tools/devd/deps.nix new file mode 100644 index 00000000000..2cf6dd7eb23 --- /dev/null +++ b/pkgs/development/tools/devd/deps.nix @@ -0,0 +1,201 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/GeertJohan/go.rice"; + fetch = { + type = "git"; + url = "https://github.com/GeertJohan/go.rice"; + rev = "c02ca9a983da5807ddf7d796784928f5be4afd09"; + sha256 = "1wzi3fprizg29dd4b4bmwz49x154k8cry9d7c08441y1i8w895yw"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; + sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; + }; + } + { + goPackagePath = "github.com/cortesi/moddwatch"; + fetch = { + type = "git"; + url = "https://github.com/cortesi/moddwatch"; + rev = "0a1e0881aa8823d4dbec04c5b65a32a33f467e46"; + sha256 = "0f9gi2vvrhsbbvfqzlx2dcgn389qj1h77rvh2iffqhnsn3cxf5fr"; + }; + } + { + goPackagePath = "github.com/cortesi/termlog"; + fetch = { + type = "git"; + url = "https://github.com/cortesi/termlog"; + rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; + sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; + }; + } + { + goPackagePath = "github.com/daaku/go.zipexe"; + fetch = { + type = "git"; + url = "https://github.com/daaku/go.zipexe"; + rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; + sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + }; + } + { + goPackagePath = "github.com/goji/httpauth"; + fetch = { + type = "git"; + url = "https://github.com/goji/httpauth"; + rev = "2da839ab0f4df05a6db5eb277995589dadbd4fb9"; + sha256 = "0rcz1qxdbc2gw0gaj81kag94k98izs9vmhcp5mzs7979s7q4kym1"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "59fac5042749a5afb9af70e813da1dd5474f0167"; + sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/rjeczalik/notify"; + fetch = { + type = "git"; + url = "https://github.com/rjeczalik/notify"; + rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; + sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; + }; + } + { + goPackagePath = "github.com/toqueteos/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/toqueteos/webbrowser"; + rev = "43eedf9c266f511c55ef7eace9ee549e269b54b4"; + sha256 = "0wa8xv0gh9iq3dlwb48dx8w2awrsarqa900hszan8gaxgag7x7ih"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "927f97764cc334a6575f4b7a1584a147864d5723"; + sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; + sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3262e0e0d78..bcd5864a0c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9002,6 +9002,8 @@ in dejagnu = callPackage ../development/tools/misc/dejagnu { }; + devd = callPackage ../development/tools/devd { }; + devtodo = callPackage ../development/tools/devtodo { }; dfeet = callPackage ../development/tools/misc/d-feet { }; From 6a74ba96fdb4c22146ca4672834d3b6df9c46c86 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 14 May 2019 08:18:02 +0300 Subject: [PATCH 116/637] Add minimal docs for callHackage and friends Specifically haskellSrc2nix, callHackage, and callHackageDirect. Other functions should probably also be documented, but it's at least a start. --- pkgs/development/haskell-modules/make-package-set.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6b5ecc1df8a..fbe1f991d92 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -118,6 +118,7 @@ let inherit packages; }; + # Use cabal2nix to create a default.nix for the package sources found at 'src'. haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; @@ -174,8 +175,14 @@ in package-set { inherit pkgs stdenv callPackage; } self // { inherit (haskellLib) packageSourceOverrides; + # callHackage :: Text -> Text -> AttrSet -> HaskellPackage + # + # e.g., while overriding a package set: + # '... foo = self.callHackage "foo" "1.5.3" {}; ...' callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); + # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage + # # This function does not depend on all-cabal-hashes and therefore will work # for any version that has been released on hackage as opposed to only # versions released before whatever version of all-cabal-hashes you happen From 5f253add01594de59c672ccc200f7f57bb29985d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 13 May 2019 20:22:29 +0200 Subject: [PATCH 117/637] sfxr: init at 1.2.1 --- pkgs/applications/audio/sfxr/default.nix | 56 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/audio/sfxr/default.nix diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix new file mode 100644 index 00000000000..fbd0f3c5def --- /dev/null +++ b/pkgs/applications/audio/sfxr/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetchurl +, pkgconfig +, desktop-file-utils +, SDL +, gtk3 +, gsettings-desktop-schemas +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "sfxr"; + version = "1.2.1"; + + src = fetchurl { + url = "http://www.drpetter.se/files/sfxr-sdl-${version}.tar.gz"; + sha256 = "0dfqgid6wzzyyhc0ha94prxax59wx79hqr25r6if6by9cj4vx4ya"; + }; + + postPatch = '' + substituteInPlace Makefile --replace "usr/" "" + substituteInPlace sdlkit.h --replace \ + "/usr/share/sfxr/sfxr.bmp" \ + "$out/share/sfxr/sfxr.bmp" + substituteInPlace main.cpp \ + --replace \ + "/usr/share/sfxr/font.tga" \ + "$out/share/sfxr/font.tga" \ + --replace \ + "/usr/share/sfxr/ld48.tga" \ + "$out/share/sfxr/ld48.tga" + ''; + + nativeBuildInputs = [ + pkgconfig + desktop-file-utils + ]; + + buildInputs = [ + SDL + gtk3 + gsettings-desktop-schemas + wrapGAppsHook + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://www.drpetter.se/project_sfxr.html"; + description = "A videogame sound effect generator"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3262e0e0d78..4ec68d185d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19859,6 +19859,8 @@ in setbfree = callPackage ../applications/audio/setbfree { }; + sfxr = callPackage ../applications/audio/sfxr { }; + sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; shadowfox = callPackage ../tools/networking/shadowfox { }; From 006d4b0c5446b3a7ab38b0dee8bc6505fffea8aa Mon Sep 17 00:00:00 2001 From: marius851000 Date: Tue, 14 May 2019 11:02:35 +0200 Subject: [PATCH 118/637] ctrtool: init at 0.15 --- pkgs/tools/archivers/ctrtool/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/archivers/ctrtool/default.nix diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix new file mode 100644 index 00000000000..288a2a31ed0 --- /dev/null +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ctrtool"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "profi200"; + repo = "Project_CTR"; + rev = version; + sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va"; + }; + + sourceRoot = "source/ctrtool"; + + enableParallelBuilding = true; + + installPhase = " + mkdir $out/bin -p + cp ctrtool $out/bin/ctrtool + "; + + meta = with stdenv.lib; { + license = licenses.mit; + description = "A tool to extract data from a 3ds rom"; + platforms = platforms.linux; + maintainers = [ maintainers.marius851000 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4feeebeb0fd..91096076b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -712,6 +712,8 @@ in cozy = callPackage ../applications/audio/cozy-audiobooks { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; + crumbs = callPackage ../applications/misc/crumbs { }; deskew = callPackage ../applications/graphics/deskew { }; From a347ec5a35db056ada40f289d12297033d943e98 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 14 May 2019 00:30:40 +0200 Subject: [PATCH 119/637] openexr: explictly use emulator to avoid having to set boot.binfmt.emulatedSystems --- .../development/libraries/openexr/default.nix | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 5815db81352..54b617fdc01 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase, }: + +let + # Doesn't really do anything when not crosscompiling + emulator = stdenv.hostPlatform.emulator buildPackages; +in stdenv.mkDerivation rec { name = "openexr-${version}"; @@ -15,6 +20,22 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" ]; + # Needed because there are some generated sources. Solution: just run them under QEMU. + postPatch = '' + for file in b44ExpLogTable dwaLookups + do + # Ecape for both sh and Automake + emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)} + before="./$file > $file.h" + after="$emu $before" + substituteInPlace IlmImf/Makefile.am \ + --replace "$before" "$after" + done + + # Make sure the patch succeeded + [[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]] + ''; + preConfigure = '' patchShebangs ./bootstrap ./bootstrap From a8616cb1c8e7a3ee980c53438b83a30c76c1f5c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 May 2019 11:35:53 +0100 Subject: [PATCH 120/637] firefox-devedition-bin: 67.0b17 -> 67.0b19 --- .../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 f180af5381e..55581605368 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0b17"; + version = "67.0b19"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ach/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "37535c20233e4baf2b523480807df462e4a0b2f7c45e2444651c779b4f00a6b6a392bc39f672a946e3468cc5663146f7bd6780c8a56f797bf95e9e43b0ef3ecc"; + sha512 = "a609f4175c1279630e51b4f68b6d3d490fb8b60a42a2f734e9b8213b1a9603d471539c5caf97b9c3c0c4aaea56b27d02530ba140a5b659a1de483b2892dd0a4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/af/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "436ed27c418d93fa1daa91a8a79076ee25011b03f28ad8682bd2290e71705b525614d7e8c3bc21d6a9dbd465ac4d772892e6ede86f03ff6108e4eb4ac1177320"; + sha512 = "a8d09c13295771455ff0dbf8eacc2558cd52e91e8cf6c48957a68dcace4c37ee3acf66aadbc1ed0d5e3dd262fb00b1fd8f401354895db4f492e0ec160e7af086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/an/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "bdac9643a0f11b46b49fea9e1b22d9a74ca0e6d90a7a29f3ff4b2ec31ad141ba48ebb57f28b6c976622fb9e88fab8a5081e9488b66b3d87520cf57a7a531bb31"; + sha512 = "9e45d59ccf97444013ce5eb44e1e96b7bb683277e98b100c88be90c249d16e91f0cfcfb8f53e4b49eef3bcef0892967accf4e5263d0753cc9790d8d793f95b61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ar/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "f660159977bb9490cf4ed0be3e457739cd488c29e32c7e46932c5420a62bdd1292d19aeac32d8591b7da42b1560b1904840e0510dd69f21227076065eeeece0f"; + sha512 = "2f2a0285698a5ab1dae1f7bbe231fc52653bdf1b985e158b90415ba4b22939d40a6524c0d2adb0bf2ebcd64c924c044d9dd7090925ae352cb3d43fd23c74c9c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/as/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "52228be50fdc4cbb535a05d7bdb70d85ca076be9e105f38bfe6e16f8abe9cd3ede53983734022da5545acc6ac991511943804bfe95b5d603b04037a33b627a7d"; + sha512 = "6ea84183731cc9f7937e0bfb1896a4d38dab2ad24fb8442201a9e442fefbe7fb8eaa1cd33724467ce77b6aaa5632c1c6ba0490f4bf5fdaee874a531a55ce6124"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ast/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "75c797aae6b739c3bc258e2e80b43f6b8775816a2a2a130251bc65f11f5a793f4e20de360f2248751b399ae596f7e407bac17c9f97eab8b992b21d338d98ae9d"; + sha512 = "287f2b0a86a82487bf7248a9b2549fee7391f27f761224627d3af5b9ffda44ac506ea92a820bb4ad6382295d171f11fcd92560d17910d772612eedcd00e0f3e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/az/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "046e819f782edd5cd3d840abe4b4264fbb20932d89e67a229c195201f01b14b454f834d7d475caf78b040f08541c39372b420c88384f10f3c917153aa689c9ed"; + sha512 = "1d98fd9e5f12dc0b9bc80dd9ec10b5fc9a30a4a560b3c439fccd12b4f6827a177a9b5aa50e12692dd06d2e0a5b9e72fe6a15f024ba738ad8fa4ec2fa3e8a88e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/be/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "595a6dc79da32d85066dbbcd7e0a876d0f134a969e0f40364b13f0b2d31ae0c9b45eb50f6ee85afaf70c5ee38139da7702c244b3ff01afc9357af2db69633e2b"; + sha512 = "bb88697858813d02c968531fe01087e41652fc41858bfe22692ba2d53ed665ebead0ce2bc6eeac8bf45c5617d1ec8c409108e38f2d4d1d8be2d2930414ce4254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bg/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4a0cdef989e4ba0198aaf6d39f48f7a5e443a798b2ed33f2c30e1b0ff718e2d2642d454a3aac43efc4d07977af5337d4f94cb6089109d685753b2a304e117d4c"; + sha512 = "a91a286d59e6a7bd64dfe11efc8c28708de856e9b949a975664083b47b9a654a5218290c8b4f2584d06767e38a68dfde11b9b1960d83869687ef64529b96be42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bn-BD/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a6103822c74f2bf75be87777805b094cb71b290e7b44bd838df1455b720458511d047eda274944da7f0ad9e8d1b0ea228ada8369220b4fc806d90d676d60c1ff"; + sha512 = "96bc5fb50a372f7437f48caef5da3971caaa3fe2fd890f49466ed8c89cfb8812b39f1f10f9a1b830a3585681e47634abb088d5f25ff60e6c1578a261240e2040"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bn-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "a5628a273240febb6181de25518e72d596476139f5923a23ecfaf53d5b57eb77dff4a4109ac36a5b581508859c112c5eed9006de013e1b57e81a8e5a81a5e832"; + sha512 = "61f4fa374d0a1f485fea78fda33c9076c956827802a91b9d7d5b45b9df40deef19d702ce77fed78eee0b2f266ef4d9997fab03b73d1d9a48d02eef3aa972e1e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/br/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1988c67b819d94cc329989fc7f267b8fccc06026fca32728003ef49c4347d41ce5effaa0d70fbf2fa7ee3adac45b05439de1d3c4a12613976092d30b454af4b0"; + sha512 = "2a400d3754a962d9f4bc1f113a244a2856966f7e0751d60f5a0828188cb3addeea5c81ae2ceacabf7869c4455ee047259f40addd2e09055c4d3912c1bf608fea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/bs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "6e0deaa14faa4d935218425be34c6001b00ff071c0cb7d38574984ce84848d74bbd7c15d4fc4cc56596edf8ab9804f0dfdcc2d6efe5581bd6bdfc0a65d1f52bb"; + sha512 = "9a5be0e919af773d1fafc18968d3b9b513b9e68e9b778aafee6fd4e282148e59cb868144ca24685aafecbf6daf99ccc351509366d4905741dfb53bbbd600bd0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ca/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4d3896a3c00125cc4dccfb1537c5fde33a37d4615ce8ebd961e996256312c70c87c208aa814b06b6a70b65ca20dd4221a4df273b098a7eb5019a7032af12067d"; + sha512 = "f0f413caf5c17cbd885839f1eb20ef854c390e4b40c0683adb03f4361b262950d31358030b5e56d76b8d5ad17496245485a8c7cf36c7b057ea10fa0c4309df21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cak/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "aa483fa653f628f45377ad1b9ee60aa2868dd03c2f4515592bb5f3e2b3d7b899c11e2be4e96086c679693cb39179ff797e634c8f7b01a9bf20cd666b37b75d99"; + sha512 = "81077a7e9680dd78eced31736069c185c216977af46599643f1b59a852bad2ed00403b72cf5542d6758ad943ea43e227104e2b733ee94cc66882798bf568eead"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "71f6777ec1b3db95924ff843eaa2bc25443c4ef282365c3af60eefa6e522611272f4a3630e34524186e6bf43597398ab94f06e2a1a9c57b6036ac487458afb67"; + sha512 = "01866c0f9c4ad7b83252ac84989654e2f9f6932dab6e46a06e39354a667a7742a95c91059ef9f6284860a0f0c683fbd0e9dc0100b72e07942839c2e09e2cdfae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/cy/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "12b0a2a937c495cb74ad57eadb9e2def14bf06348feae8bafe274cae2f2ec653f001d2cdabb8bccc1111ff8f3c9ce37b35090fd5d0ea1bd1bf58b24e6f044812"; + sha512 = "e646b154cdb7c66a6cf5bff3dd0313f8d1c309a625fc3ab20770e83aeaa2be7b4ee9c712c2ab2585f3319b7e6d14ddbff2da6d7c9f81321b09c83b3df6049133"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/da/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d247879bde849d29ce6b158ad4fe393d987815dcc2ec610d2c8357df859cc65839cf438af4c717275ef0aee9faa2188223a006b219942795107898a26d7f4cf8"; + sha512 = "9ba2cc12e19c05340e88cd996dbbc5558aca64dead210f25a2f4e43792b9bb8f2a159dda54af6c760b2c7b4d113f3a8659babb0a1800c56b07f9886113c1764d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/de/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c18d70e45e6a2f23a11f263ddec9f0c4212db1c7b92080d51e41dd325f850bfea7e9eafe1b803e189ca0eea42f55c4109051c7e80be2b62c59cd7d16731fb250"; + sha512 = "52d5950ff06db9c1eb428d27a1bb02db58701546094d4da062af5b03d74e12e400aab6811b4e725229ac992ddab6993f86db36550552148a3f419ee7b56351d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/dsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ad7a24a1fc86ae929f8a0f97a5952b50cdc22b3ae4914b49180909892466dcf59d0d7653b7402960a61be78dda9d91b6d7462d0155dce271eea7c92f6678adc8"; + sha512 = "6d431b638b62a248d45c59369367ff3b04d10b6746fb23e11e1273c157ad6c3593b25936b15eea8d18b8c1b87ce317c4cabbf66bb12d384d29160e3d5032d2e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/el/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5966122c6276ee22971b660932a5ee24ed96d5b141216659b55ddd60f3993586e7777a3e28ed7cc6213216229529978b682e28087e324fee01e75826d95d9948"; + sha512 = "c380af2026d39d4b8ef3d0772f79bae69443fd9bb8a18119aa7bc696ea0e02e42e9b3ca58c1459411bdae9037d5727c4e01adc2d430ecf222631223539c39199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-CA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "b36f0433f1f274d9b3203c4ad8eea194445655c4b5f5e101d8bc2f6bfd5e3359ed157390cc7f6d5be93b11211081eb58abcd1ebf7acda77a6faa0e4e5df3b87d"; + sha512 = "c4ecc4fcc308be734b00d4c0b489e8218e7eda3d09ab5589c9c929afca367091aace69f8a9c7add20c8360005094b6edaca36b3a2f60e0e783d0dce8b9fb5d1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-GB/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "17bc62370df8ebd6e8b4ad8d4d156eb8ba8e53e80c5f2064777d4fbda9f8c9c43a94337d2a925e2bd4a445c8812cd593ad03dbf98d6f8ffbfcaade6aed3dd015"; + sha512 = "0d8fbf31dd1e40d3154929c1ab0c7a224ace84250b092d089b2d044b030eadf3a29dcd09cc46659f4bea105e0718c3624abb5a2cb4779b87b4d3848ba82f5316"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-US/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "37043e559fb8f137b1e650ace259e2721186e7291781ca3ec2162c2f4ae33a20d5bea83b13b2de69033ca2dc935b5acf363d64a93b4707cd097c7f9f12ae96e8"; + sha512 = "c5830d927399bfb5173ebe859f7f4de80b73c036d81f46b1d29d1a262477098e67697804fe4652192e49e7a83223b1b8bdca62e825b9272177b889f6b0ad1f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/en-ZA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "1fd00bce7715e216bfd9aa57e922d20076a811827a8304c0ec3ef45d0b69b3f85f6112125ee09f5104d8bf3d98993e413daf6936f8637a2d2642ab1e33eb0636"; + sha512 = "f3db9c9afc89cf2bb7a102a748b360b3e893c798037d3e95817ffb46a8e3249789fd770fb5afd356b093b1c18a7f2e6518b688a8772a31a7d516b9fc0789445c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/eo/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "856fdf4118dec5e5113b43a9686ec47f94cdf69a82e309ee94615cdd177849f66dbcffe5b7136dbabe61d4b09d29b7a2e28d8ba95dca0381334b0d954c8dc562"; + sha512 = "dd3c9ea0f75a3ef67c0d73e355551e5b34cc47fb9677c91d3d5ebc8765134603c90461b3e8a91fe4ceff9c4605c4f5aac7911c2ece05e8272adaa6e9eb115919"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-AR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ff28d6c8152a61047194c8f8ab2acba94cf5760df0360b30b97c059abe60ea209fc8d1227871d1a49967e124b2aac7e1d6750bc8dbcbc81324b20b0d6f46c42e"; + sha512 = "64186875ba303c8e47b488eb313c468097bd39a49c8caf299985cd241cd470c27726cdab7b154b93907b2f63acc437f5c2449defba274c90d1da34279aaf9b61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-CL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "f78246a655450b09b5d964702945c08931138af6664523342db19a3bf2c0fc85d19162e68b258fe2752bb187325a5ce62da4e4d92ffdc2c16bbca64aa90d7bd2"; + sha512 = "1bf9a909063da17690f632e12d61a1eb2b40473fafec068300648bddbe77ed98ae1d5a1468a261bca7ed75a08521e65d08d61e8d886b9f0e324c3b8169caf714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-ES/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6cbc365246d9a205499698b7de2972202000fca877f7f3a5ac1ded3639b54159be7abb7c58859727b463fc15b4f664d15ffd048c666d586a4051c76e86fdce74"; + sha512 = "fc9cbb4a14ebb20f357c165323eec1ca408708c111e892092fab0f5bd7d660e91cf8d18d894765c635e87e13e53b1140604f7ec60c854dc166fd344e0fa332af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/es-MX/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "22fec109b6ba39194db469e2d2726e3ffc144e00ef7796ea03f4e778b517c5f4259021255e5f24e6a323a7910a0220bd073b471276fd0c2314d71de4a59df391"; + sha512 = "c1ed20051f00e4641717b88cef0262441f6ae03d21d9a9bee466d31ee47738f7d7600d38bd0d94c6d08e3d84ff902d78c1638146d09175d60ecee2683e9b4d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/et/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f9661e5cbe47bfab02054b9d0d1bbe7be732b0842858d41123577bb441ea8b1fffdc37717712123c9e1455c26025eef2ebdc93ae09ed571069de9d834603a5bb"; + sha512 = "f31ace646422cd59c13ac1a0264c059ca6814f8c49121d4063570130ea9e195988885e1feef219870e605a03ac049bd5450353e81df932c5319b1ec6ec50fc71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/eu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "155adeff95fe121f1c085d1c88386a4924bf6596263f7618919eb7e09b281b50574e90160f9b9a081a77da25c91f91a774371af7737512d26a23a8352bf93427"; + sha512 = "691ab74ae362f37dd7b3355e8c5e650a30d1caf89450fc82788b961a35e7f522ad863f5583bd5b39854c89158fcea3f5d68c501ab2312c85cb44f33e790ce26d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fa/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3e2699031998c306f94fabef902a61acc6ecb4b7231f582ad52120d3e9c495cc5095aaff7997415d37c38ca6910d12bbda4e427a4e6fb23c7a4dbcfcf28c392b"; + sha512 = "e05a4c645bcae718ded29134c4b1d18cc84446bffbd961ce830a3958bb209e856f31a2bba1959c75ecbf1114441284df930ac6863ba8c0f067338a7694803b08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ff/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "feb108143d2bd720d5eed5087d602ad818a328937e16d5dc8b8d107b62b444263cf6b3cefcfc6888ed889f025a70880837ae116e5e0496c6a14bd5fbdde00019"; + sha512 = "2beb91eb4be0af2f5cd2bf3f9de19c8e53ff95fe6ef50b470be2ab0d5695975bc07b16c1afdba5fb717f379e6a3a83762cd21442f0930c28e25ce921ad29f6f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "cbc14643de454e46945e27f97082488292321b017a88a079a079e6aa6c38a57a1b396817ff1a6d1e7aadf7f018085d3e7e9b3b8826b4d24fe234593671527f83"; + sha512 = "838ccac00ed0bc556c58ca30b09e4003c87c58e72e4ccef1c5069e35cd62fc8819b0556c6a2a2166aa1d44d6a98c4dc77d8a5d99923923d0cccb39ffb97ed6ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9c54f90ab07d1f2fb8711c448ab5594eb789cfa7804e761877a2123acab4123c81e62de247d788ec8f6fbc66bf73189d3273ae09e964716531ad6d758fcd7678"; + sha512 = "aa606f76a3a60d0ac7789afe7d97f02bf43b9b166abb921cd30e97ab92121fe84b3f310a3b7a53e887b01a2c64ae290da8c9d7f30603dd351e173d4bb64cba9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/fy-NL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0390b0a05912d416aadd8b8f5508b621b3d4c58be6b1d6fb8554f2d4fcb7808e7dca25133bd14877b0f0c919ab30472a5cff69ed49c6ff54f3a3a380af89733a"; + sha512 = "d7fc80ef95dbf7f2876b0be052d3b1ed8dd261164fd43afbe377e39b97be48936e5dce0181730311eef557667f8750236d5fda2491a51ac42dd6c36ae775fb45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ga-IE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "611e982a93eb6736a19bfd5fc1dfbefbe9d18d36a636d6da911c0c0a61dbfb1bd07ea674e62ba2c45e195ed72007000b47b57cd1156b812f04fbb0b2cdbf2a8b"; + sha512 = "27f7e7a320bd4ed241c7382b9c7f173f6bd77db8eda0e4b4d06e007141504f9684aa48e8bd1dc7ef36905ab52d684d5797da325eb6759feed5d90022a767efb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gd/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5d749b534d1469b4f380edaf313169cc21af4550fe372dd2047c01aefb3994122790ae59cc0d97a332aeec6fb5db17dec2f41e3b6391f4e920b4aa1e3657e90e"; + sha512 = "231841fef14350369a8d790cbb117901622853798166f81a726a7a18c2e6246aeebd36636fbbd42bf72b71b913c258410e1f9426aa117ca3b14e146c598547b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "49ebf0aca583b46d3ccbd9b9b8618b9c143435667107cc6a5959db85213016a3f10ec838bac08d7d1d46b2fcc32f0ac2c0416c4d4005f7335cfc3324aba80c0f"; + sha512 = "813e054e1b05c6ce314a1c70e1445bdbcb056fe6a24286d0986d0af482e2d662c5c74064fe36e6b378cb505220fc4bafee27f9e417dbc2b4d22549eea9b5e5dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "3a2f1463f37c7a32fa0fc01e61c869090ae17acb900e1041d23b9d3accf5bbab7dacad97bc6d7bf1eed636d65b3190fc92191ae2c853c9ef4ec703b7c7380f02"; + sha512 = "51073929a5e7a0167e0216b20e8519d5d09492fdeb7c2941bb8695bb74c1ed11c8615acf9d9c7cd50a408c2a0c6b91c6cc6618871740cd8360d83f2d041a40bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/gu-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "25bfe831ee1bb8845815294ee580f5882ba221c4880e43214bc4f8ec3ada7321f2947e41e4cdfd12ce5c642197e5bf14e30a5771334a2d5dcac54d472c1c5110"; + sha512 = "70609c08104c0d2a63986a8e53ef49f926013a660d08e3980b6f39e104d248289c19c36c994b39ee497cbe84e1d670b660c0dbf6091c7c912c57938e4fe8f275"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/he/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b78872c735c2c1ae3ac8cd55577bb26d4002e2d35b77ce5be0ff65b607d0a579771c6ad8c31edfcfa1dd646e4b3548e633720aff883d493aa69d9e5599bc7106"; + sha512 = "e61164757dc6553bf0aeec10274ae8e89207a8940de013aba4fec7ecd3313393e39a683030c41f348b7f329a5ef908b4e7157a1fdd288853593f046f5cd3ed7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hi-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3b29ac677d56cca945ec57c8010ac4fe930f08466b9e5ff78e04efe38ad56b674945dca8041340f395456caf92eb9431dfc3d2bc549c3cf043e8cac22c2df144"; + sha512 = "17179a9c0d1a38426ec7ec9b847d79f2f5da03dcd4510912c631807c1a1261540979b57ac4a63f6514ff27249442ab9a12a6fe3b6dcf9c3395f6fad5e810d389"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1366670fa05db420e03645610e3cf47b687e444219a36e1f3694f643851748a811c2981e786410cd34882ca34232c75f12de3f43b88c2e135da246fa262e30a5"; + sha512 = "c186243fc46573012393e6a3e3516f886c16611b845cd3c07c635962a0df3594b9e6bc801c3af7adba7eec6ceb2664d1a55a50d12395108dba6e7823a7c8434c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e7beeea34ebf71c62356a2baa97aeb6f9b4dcd7b750d1a2ea23e5fc7d3b8670579ad55521920cc347b3b3fcd230403cc850ed47e0e952bc7a248d1e0d735a35c"; + sha512 = "706deda9243ee5c7aafaef56811976078b0902f3d00b39b83d71dd7a4246b06b6c650104dab19d13028677604631a6bf39c1f0639b3b97876aeef91090f689db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cd8e18297882fc66667b4d38bc94b4cf92742a969ae150ca75087daa219d3c92d938f4890aef709d76e01acb59ad960ea8e1b3df65d8c660b26e9ebbc29c0166"; + sha512 = "564c0bbe754b994d1ce7dade9444b1716a4485cb440a8001f7e5941aa41cfd3987866f06b08e323dc7c9594c2c5755c96e20a7c885857c0412f010b8f4f966ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/hy-AM/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "13b49bab2f740ebb54312e890ec4aad5fb8038806db909cb4b60972b8769a6512410746029ae6a8835a02fc9dc16bca487bcae99fc3b69e7520e4a943c017f5b"; + sha512 = "1e3d47778eef082260a7d669f46ce56c530219b266f1b01e2389cc3c83640276fd47d0aacb213299ca7b5c2f6d7cd34b13661cd50314e0c84d8c41df51977327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ia/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "ce1d7a192a4c85aaffe16e24e90daf26b00b67c8182fa4b2dff61d32208d858e6109dc8638c99b63a2efb4958961893cd60b35e99b6adea742f8a50bf667f454"; + sha512 = "22a0e2ce6df17895a4905e4a45309147959fa9e993890e8996e9715f660c083d95b72d41d113c5f5f12d3028cd635488810aecb13245525f950f1c6844ffe2aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/id/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "56475ac4625de8f53d4078ecbae6e29c9c339e850ee1105a1629c23fce185f804deba64a5f048b4ace205f308b019bc877bfb14ac03ceca229624950cf1082ab"; + sha512 = "aa34823e7052f81d7981c57ca4127b509a287d50b440aa57543373c2a4e9117f4cd85198781740467c46b685fa916e132f70ac5cd104cdb8c4da9557f3577445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/is/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "8ae3bd4f498e4d723c989b38be3362cbeea59c50d1a5b0693995382e088ed5ecfb8089eb408308ca266baac905cad404f34a04f1da81567f31c890452f52d8d6"; + sha512 = "72a93af50a098b873ee32069c9f80cd21b15b5d6934976ae50ef69e46e844f7cce64c7495fd808b71189edaa0178c81a3f5d197b1867351b3ab5d0958192db6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/it/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "37888aed248baed73dc7fb7c2830009d232b94399a339ef243676eea69d94333f754b82092a88e5aff6bf5059320f08a795b911f99be0d339c42360f19c4f5f2"; + sha512 = "e3c34606ca17432ea2c812bb7c20e8b39b7a40990312a49465b13f96a5fe289a50153f7a80bf84e611388076f78c785fd3e9759956b1938b6e425f23277285c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ja/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d5666e93433a43df5a7f0e257672dc6f62fe79ca038243d51a5c99fee04162539a59c9fabaeb96f7b026294d69dfafd7ee601d9183188b58d33922f7294f7600"; + sha512 = "ad737a6f45c0f99d8cdcc4863c4c052fdf2fd097eb9c35181ea84fd80015cc3496316da9e2a23fafd9b25e962d1d3c644d5d05b57b9efa399d935df08d0ad5e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ka/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0449a323b2ea7237571dcb5cac6b42a71b8fe0b0f56c6ca0ab48fde793976d00549f76149632efb2157d332fa1c5234244bf6ef34d06d2f06db480c393dcc19c"; + sha512 = "8dfbc8fa171ef91691401f3a8fba504c61ea0d28e9502be0b891c801b1d29a1621cb045b9e21b3227586ff1aca28da480ef2ab089a7ac9299ffc7e63d7de5b4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kab/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c5296bc5367dc51eef2db5fe997f5bcca9d2239e3720a1a27f879f00240a61d5382273a00fa335e537a10084ada6db72948594a0203e1c2d96b6ab508d0ac4ba"; + sha512 = "8703637be9bb8a795c24a53b779b02fba67dcff975861a509f1529f51d36f8f7dacfe8a4e9d0d51d534ff90370ece46a93ed52cce9f5b29fb524f79ea1973f1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "01d36dc73a3949085ce3c0d674517b91a0cb3ab4492132ddbed8b8611d1c2af8beaf9fa8bc502af261d3abe5fbb05e11b8a50d172138096f0ffd1cc0da029863"; + sha512 = "84132316153907e0adf26e5aaa27250cfada67fb6fa509a40c6761bfab75af59c5858e3df59ccdcc4ec555950a44dcba32da8f93a1bd99289cf9f82c92451e52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/km/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3275ddaa870e43474c2d9442c260f095f8064804463c33fdbbd49ff9a9ae71384aaf06d42bdb9745156b2e6b2a91497aff12a6f5d3b1ee05e9dff711819d29e4"; + sha512 = "30adc106f266561e957420467ff83f9408e99cdb6b7c7bd6eb1622bc3b7d3aded8dbbbfe1530cbefb5d7428940f4f7fc6b63eaa6ee6a7955b9611609d404aff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/kn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "26d3dad47702a4d117657320f525ad1a0a9aae73884aa251ce51c6c04a0504bb22c90b07572345c6e7e3a0efb39959ece605e1d9994830b8d63b44827af60ff7"; + sha512 = "6e7e1f9257e414e90257a6aee2eadade4b312c8d5c3ede4670c6ca67826f2a37b81aa58a700c5482d1c49699ea68d92cffa1c1083d853ecc7eb92baed7873be8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ko/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "94e84ebe0a125dc6bc4dffd1ba2301e164bbacb7c847dc4006895ae97a8d6200538e8c942beee67d4a602721c3f0d9b63ffbe5e0ee4e939b4328cc078579055b"; + sha512 = "0b359540dc6c8f56ef950b0491face08ac8998a3b38733b3db1cf4c6ce2d28cf8ff06bc03ecf45c434c2eb925da40f2fd672657602840150edb3f5331b7b2ec1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lij/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "59f58039ac468e3b5e7ff691aea1d70dec3a4e28b0c59521647a1da8fa7a30ed5818ae42cfe159db733e003f9d64134fbbd8f6ee567e49ae3141a82c3e332356"; + sha512 = "c799e621345fb4299f63a4fbcbc452a595bc1ece639d181437ecf3129f1b3213b67e1b97bfc06ff9366391452236e9ac3635637a143c9e845f100d5b850fba52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lt/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f97814c744c7d2a2a1199ba19740f5ffbf7bc785a140dec5490428269cd736758c4ca4a2bbb5c0b53eacd115fd68bbbaee3700e690179d25146c399d0fca05aa"; + sha512 = "5c67ff0e68884ec6e8a80f936584ddd2213fafbd86d13c1e5fd9e3e80fce88c5b9e2e8b7ee99ff5c4107d93aa473515a4f6b1da68c8f139839b4ddf3de3151b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/lv/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "7d1fda58b62a2314705b64090632df36e4e50bbd696300c731343164ce23eee893b933b4b51addab42d302d50b0834177b0bd0eeeab90be3ae4352e844254687"; + sha512 = "aeee95b24a36cc5b7b127f3252a43d0082df9eb812f6751476fe6d0f3b99a214052d52792b798995a309a15dbe2d5fbd95f5cf006fb6fa4da4b441b1646b8532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mai/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "caf028f8984326bdbc5bedfc30c6939f13fdaeb748bf16e039d34a0455c83e9997279fb6f8a002d85aae9b1f7369ddc2d3965edda34caf5b2a3cb759842b4d26"; + sha512 = "117b71ab103f1c86e7aa595816e35c83dafc9510d781c3d1666db28e7f77abf1bc04b172a15fa8cb02432914691e3a205c57633268f984104f7fd1aa38a5aced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "ea67c79d846ff200279b67a0749fef07331051a7d65ec46ef53c73b2f08bc950256e1fcefd651f375b9db53fd6e6cb50d7c5417cdee4854330d92bc612b0f87f"; + sha512 = "6547c91c39dacb0d49ab6e114382af414436eeab54db0de294bdd755cf79554b0e858105e47a909b6b6a992add9741720d2c8f422de511a4028defc37a7996e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ml/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4b59d63e20178bd1d089f3a003dc30002590374354ef7df791b94e53b2c944367c46e6fc1252565e358b05e50006a91c7571c0449ed922ae3c83453f58fbe906"; + sha512 = "5ff7aed1e5d55c3e141c8cf8595b854bf7aee328780a980a188f4a9f46bdfc07126474147ac6bd8993bfb3255384990c2e22bc49945f02a8a3a32a420f7e70df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/mr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "215967d3811be5f81e1086ef6a3751afe2188035f54708abc8bc37fb9be2eb025d23423a92829a1aa2b96338715c0f3ccc272a7e6309463f1390cb1e669af5b7"; + sha512 = "407465edd4060b49dae07ba84a9121d2d007836493a8e2312211e05245e00a96c95a60d2a00e05a849c31cf6df81953fdf675308813d3531d9b7bed2e739f0b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ms/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fba2be2fc1428f55f5046be4c82e9d798166a7108df2bff43d17daf18ccfd14dfff9f3513dfc89f48b9ad528dbab8852080fd9162dba23dd3c5ae46d8ecddb7d"; + sha512 = "0b4ed8ce93436337ecfdde2a87f8fa7566b6d5fc0b3f6a5a8cb7e629ef6a779eb34dd9f00248c218c05baf84b6efe57b025fcc5cfdca92ce9ce2b8e18f46224c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/my/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "63fe95e185fb45d557841f8f7d66d88e2dd8a90f62842b8b440322366235ad2fe202008e9ebff9718e2e5405a7cbd0b20821965cc764dd8328996a73a1942f3a"; + sha512 = "54e352cbec4b31a40d9049a506e21425d2a230968a9cad016841a6100e8adcd242bdd60ae53b1fefa4668acc42df455d6a328fa0936263b897068808d50a6909"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nb-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "780cee54a6c91d172f8cc0d7593367f825bb17d2bf2d98fafe0b89381f1e97d9375d2dfeb83131b0c02919696f354b5a25f3e5766cf971a21ca1a371fc1e2036"; + sha512 = "f2a873a13b814f2968f3dda37e92403fd65e5bc8d9222a8ab46e56490dd51478f3bbfcd30edda146703a3ba1fcb6c17267bb2e16515dcaf4f8b19327c3d4b2cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ne-NP/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "48bbe58b75d5ecc4ff9a357f01663f158ae492111ab80bce2ef0a13ec07390dfd8fe3b6ae60286b79ffef1f76e8f18a801f84f0e52624c25e1fe985bae5ff7c0"; + sha512 = "51c125d58a4d07a171c898cc08e670b0e7d7cfcc677d951fd4fb9ee7a3489a0f490b33528ccf2e2c4ac78890cd78c2ae72fb614792517d958db3c03c3aa4b75b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "72c2c191bcb5436c95653dedfc9275c6c0818cf545b051412d6c05f0eb76885630e86f11b6bd606c4ecd9da65f8466669f44f3a7b12566e4236b15765db1f23e"; + sha512 = "385cdd56c22590fdd20c47f063407267cea5068972c173bcfccf8b4992555da6ddc15af9768794f44b8aa537accdb2d82ba51d6ce39d60d20b37c6860b4fa44f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/nn-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0f8fd8e79fa3b0bc2b595d76b37d855fe6444eb0fb2db37e68100176e35c28b9211449866976e6a33d61e3c2414694c9e7eb87b4bd6e64581313d6586dbc22bf"; + sha512 = "8d928811ac8c6a82ecd839b80e37935ff62687fd46ff713ced23bdb5a6d1dbb1acb3e8b1e30850df0b212082b59ee46389f325936c05ffc02d70bdc3c989cb77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/oc/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "7d5a4b33ca3e1ae5596b1c913eb7126d3c2dd77a8c3e092cf47a60c9c3a445df000109041e9b3e7cf9471ec544d602717ce20c6d75169c0f9835e0d21c832830"; + sha512 = "d16719ba0bbaf9ee4419d64d6976cf4df6f99925d56aa3800817b63ce18f293e862aca2e10d88e04b1e0cf2160e20c1b5764758482019391e334be91ed9216f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/or/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "41fa63277623f6f3d27540f5c7540d3e6dc4da1b7339c85f728bd549810077203f078fdde4e485cadcb186d301ee45dba310d5394a26e080ba39757a851fcdee"; + sha512 = "4e816fce8381de73b0091e85c185e4c9c06f74f8d68cb0c4386c1c43ecf61a0f14afb65d4288d255fc4e5a29843030ed86e19ec3c7795585b9b41e50a0df966d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pa-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1b158394b06cd14dd80df249135d5a78c0d149c8890d0fe14db68c8729f05ec7a58532efc181925309730c9fbe0cdd1e508afdc48943c5d80bb15e88687b30bc"; + sha512 = "ae36d3dae59b2cf5a0953891665cd122a6ac62af62232ed22bad5c1088c8f4f1c5f723652c14e74fe30492c9ea765b0d17563dcd364f9c112de235c688667f86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "101f51942ec1a5b98d9c4bdbf7db9a214cef288885334aa46cd6911761b4a83bfd9d40b82aeec8960b864cf61828d108cf8806c9afcb0bd42de5fa426be36650"; + sha512 = "40005eaf43cf1a68f3e43e4e056ee91ed2ec1b993aca744a066bbf10765e5bb76315b4ff8fa7f7542739c3155eafe879ac2c26b2cc1680525a9fd70a58ad54ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pt-BR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7c984497c8d412a7afa7031d7f8da11846ee3b9765c0a983c282b4969acbed35e18ac0d242ded8fd441e01e934e7cf556ddce94c4a246044d46df430e133f160"; + sha512 = "7023ac30d742e655f577612e39e6eda3a4439a969c92d5d0d0c8d57ae9b51ac303c781bd6258681e916a6075fedba0c62b7f3eb97f341b8fd4ae4de924e07ae5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/pt-PT/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "dcc1244206ca7715856bce2377159bf9e5e77512565718c817f5fa97d27a6423f938d8f8bb41712d2fe317202619bb4e6a4232c5baae09c43a070bac2ca75bc7"; + sha512 = "50d5a0abebc9f841f8d46fb4a17235f591ac7a07139d1eb30ee7cc9e2f25a22c98521614065f133c1a55612fe7913f571711c8054f248651a49a8d7f4a82fbc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/rm/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "30a1f1529193f04213b5dc2ad7740282a08fa412bcffef96fba1bc03ccd5adc8d85045f5ef17bea870baabce5f472e5f7415f1b8bb8ce4af57ad73ced79da30c"; + sha512 = "e3b35bef81fe0ec3992534ee391a4b54719228a2058212aa330f5c35bb286ff79239e9a001b65911c6dad84f502a13d8af695b7c71aa96815c8a07fcc0314ce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ro/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "5eaeeca9c47db5101e7bcf5d2e3716acfa080e30dca67ef95297e5865b96e204c21846b7b22eb036a76e36e0d61daed8782ef5e8ac3f769aa8442689ecb860ea"; + sha512 = "9287e088f2c078c7589ee4285a0d6f1ad3dd996d2f0e814bfb37bea8a2b1be5d817355f865df364a286507f237d5d7d9a47d6b882ab9c3359688b65b4f9e5a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ru/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "56bc5995068476083d925ca704ce07d96d765458678167f99371e07bd5e0a42baaeb9686b3a1be967e2c5f1f7660a0a920597a598ef68ab2d26aba6a15016de7"; + sha512 = "5931c0a0f2392adb4147e37058d08d82663781d075c07fae760b2274a8afd7889c96a2aaf94f2cd9b2f6ee0175c7d798768bef9ddcbd7338d689187b686193cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/si/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6a9bbed1a3c7da20da354ede60396afad68e0d3c47e6eaef94f942438d5a0031de4df38b0056d6efd407aef8e14df33ba34cffb8222055499cad0231190598e1"; + sha512 = "7b11ccb6cdb92b208049d8e13acf0f7c681248d0f35c49ea8f3684ac30a9cb598e6638ba2d447d6b3ddd7253f2bc2cef0bfb4378846b8ec2d5e78b5d7b7102a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "de5c54339db849c38a163995ed5ea495cef2e326afe0c33f4b72dfc840e4931d998c878d002cb8fa543344cfb476dfa2dd6e6140eda0743f8272258e7b1b53a5"; + sha512 = "a770204e002cfe658c7c432703f2af0e6bc55827f9388a9bebba5dd2b2b0a9d1ed4b08968f84379f30bf2bd45df0b0b8ba9822aab8fab090929e793abf64d1c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "8f5454264e7d04f8a91559223e9f659af0444e5ae14d1ee511ae97bcf9993132fa4f48cf2d2946e2c56d23d16e9f0293ba3c7fda56e57fa198fbc3e9157f2782"; + sha512 = "c2b35a4eec21d032f806b79fdbf8258ffbabbacdf66062ed18f9176a7599d163164e74b398ecc6415a8bb7afccff03c87fb011963d65f430a35a75838ecccd98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/son/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "872edaa811f2aca694151904b326f57b16a6e486b9925a73293f3a73aa175dd2d74b96c0b636ed79684ce21c212cf559134c4f92c2a4d0e950ea2a35eb305b94"; + sha512 = "0a140dae1147913c0c2a217b47cb3eba6d4a11fcf41ffe3b2530cca1bbce719bd6b23cdf61422f2bb2e092faf50adbd24be565f1f20b4168aa2fbf2da7e0cb2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sq/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "61fcf211977befb569ba38189171559cdef48f00771877bfa628ce519caadb9bf62fed6913ba0b9eac7961f6e1fbffa63c03112e4f1267e0da2415fe173f0f73"; + sha512 = "69c639bbfe03cff7d220b7e36227ddd3f82a4075abb770584a6d3e5064679c53d7aefd9a6178c791be3bdb134317151183585650d6b95b56fd7a06db7364a54d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "04cadac4237eedf25120a0eb91fbf5de4a35099b61657f393d3888be894036d6509157e1097000a21009bdeb159c4f39d3b91ec4ef616c05358d67acfa34b593"; + sha512 = "8616dc48fc38b75cd5b3115512f09dc9b447c7e160449301d6319134e34fde0cce86ecbde54831b7197c1cf92475c25eb243d0f72a8d5b94a0ce335ed39f1386"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/sv-SE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "29ec5c7082e8b2629085e6748fe8e06de65ae2a90ab0c05f094b9e7583759159b20500aff27f5b791681c26183478178011205cc0ca0784e59492a27676f443d"; + sha512 = "97652d6a29e4486a96315945becde0c1ef2ba5a3768b5b9ec82a7f1e0d8e3af011b89a3cdf98778ddfd2574468510e675e440d51e6c373743e48f650caa47d47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ta/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "09f72ef5d673ef6932b498e784380b69d40235bb94dab70e1fe3b61614c34813777f699dbaaf42c3f2a1c88b6c3d15a61d398ef9809003be34391ca4845f0eb9"; + sha512 = "996e822b9297dad8faefc7dbce588c5c55128b09e68c80353c2f3022265893f01726aefba39a064fdea3834362f6ca81035c1b439a5092dda7beae2e0d4bfa93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/te/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ca1d6da340e656d111d82eea18d094a6ed7c4e83ee12a2b3f022d36f00ebd5f8a14dea6187c19712a971a856c0e2ec11ae5487c801a112002614f065851e09eb"; + sha512 = "3ae40e88f243b4625369a5e2a8639092ff82e4fa7589b916864f691a8ad1aea85750d0a599f51ec6f78975e4088217f59f9bec526cce4b8786e7d704cd6ec918"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/th/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "5bd2de469ec5c94da8e914961a90364a4b6e16959b1e7c0e31e4394ab0056a705d89f0992d1bfd5af3c0f099976b15efcc4641c77867f3dd1ac4cc7259f62693"; + sha512 = "61391a53d7e067736d5ffd377321a45712857f5096c9c84167f08fef905e8222631be537f3ac3441a31e2f873474b6e53cd777602957a5405702557e75279c59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/tr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1e09cadfa9d233c45ee5d7db491f95d3e598de422217be8e4e5c0f5582b0b6a1886c4922f8c61987c522508bb733817ed95663c70a1a73ba273439ab2bc2e03c"; + sha512 = "979c2e4697b4509c5cc98e077872baa155b7cbf5b92de5854a6d4fa817147e7d55cf297399bda86643c1e2426a4b8f9e973457dbd96526c1ac0f3353cf161774"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/uk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6b8f8d8dfc013c2aefb1c5502aa881f592065c172595f22937284f4949da014ae7cc463868e3c4b1f2f4420af5e1d2e26aa81b97d696be254f87ec6512740c83"; + sha512 = "a72d01f517d5ea0f25871a23b9e8585bf423482f112b95fc5c1908b2baf0234b984914e8c2da4ea1a3ae4599d6b132ab2b14c15017cb92af2a62b4ef4b50b7ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/ur/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6e5bf0d060327388d9816a09aabc1368645de937633d3ba8105bfd2da935cd3bb7c191e46b3a56fa00bdf99e16a67c66f37aec094034ede04b5519d2968b7dab"; + sha512 = "85753eb41b8cf5719d7fc2ba373c9530fc807a44c439682a0d9ba16fa9392d3bf2af709139474852e3d4db066ce427a9bcf68b377bb159fc268b61dc1c306b74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/uz/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3a74620b79138d67ee948eb47c6caa192bd4432b088f0b8be4ba5b0769deaf4ecf93933cc9cf1c9389f120c828918a48227b4cb0bb2342275949b816ed7af4ab"; + sha512 = "a74374571f221ec9ccb6863b1c5318026bc0c1e94a51ce35f1d6c2cee8fef12a94e15738c9a02c67e72495bf6745f2fe442d44855e8ee1ce6fd8f5d1a48905f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/vi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "aa5e5afa2d19e319fe5b263fe076ee7ff837f2b6f93e22afb90f18a5d1bd446605be1475559344aa11c2aacc825341c786d6235e87ad5fe5b6da4138c5bced7a"; + sha512 = "8c9a894c1138222474e23152c47440da32624f600d3d24f87c32f79d15e832c049e53167539a57d85041fe109eaf39027a4617b02355787a14f58f4ec801500a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/xh/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "db2d6d8781dfe93ef9ebe8e750871d950a4f7046a2eedbc7d1646e6da9d62a5c14573d8f69d9cd8365763a4809b79242f1451b6b1fb7b81888ffa69405dc087f"; + sha512 = "c7506ad5b3177600dfa844f050b3d9f44263812998feaf12b1869ca9df12612c2535e88dcebbe06d887b2441fafd6d83a492f20cb39783f8c9a0270ae61a2c55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/zh-CN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "6d386c89e7dc5062ee72eacf2e3524cace2e6a6af9a52a418a07c20e91d3d8de55d95dcc6f4fbe956a86be2d6b8e32667846b81299542c5b2296ccf4283dd315"; + sha512 = "1f3d2fc2982ef5647b8bbb33ffa69f28e78add814e8156755882212d2a4549b9929d027f43aa7cb44981877f4ff3edff16d295316e47fce6a4ff824746647c7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-x86_64/zh-TW/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "7203b16d135152122592a09399c694c00c0db97535a8a46d97679765730c9d7b4417523a3220a57aec8638b9e40f4b63941c0c20d23534c10ad1cdbd6e0cfdcd"; + sha512 = "2df7396edd46afa6e14ebc30d4bf444943842be70b73f6d03090e049c97d5ca247b2e43eedadd97a1ecbde55d96befa9ce2980e1db8646af70547d04da1702d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ach/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "05e8545f2a3f7eca97a6537fa5113a2b9da13ddbbbb5028d5846ba2c2307bc276d5f555e7ac1c318bbb9b34a26f9e07fa94ed3c74a9efed2ebbc759c6160b0d2"; + sha512 = "967645bd716371fc5a70cf59e3ef40f5ffa96217780f5674b6f92802bd5a7b16d3a446112aeb14caa68fadfdad86b48c0665f5952545ee978d2a70f30452077e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/af/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "6c6cad4c7dc670d6fec681c93aaf2a64238edeef4654ff58a887bdadc26a1e4649a356c9bfcbcfa54d013ac8ee4a252c4be1259e64c5e2a358bfd32ff1e78ccc"; + sha512 = "d822fd96b9e14056eee0a554c9bd4cdc8235aef3e5723445640ced78d6d4145aea694cff45ebcde9fe8214857a2a4b66bc7cc23d15089708613b4c038c7da439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/an/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "81f25c7edde79c8b5f023cc99b63b9e4e0b14e7b5171cac6c17874e29ddf86f3e21e215fd0d096f2552c4871bea3bca64527c578c0d85b5abf3fc6cc09a9ae4f"; + sha512 = "2585e242e56bbe0434074bd44c8c2171ea415d0d076cfd74521fe47786aed669677eda07caf1eeca6b33b304e6f92d43ebe2020db1c07287c6deb6cee14df551"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ar/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b917d3f9d0cce6895b5012e89a58396c1daa97b108598412305a8d0eebfb31de3f46880a5509ede12313dd7e3c23f39fab03e3ada6f305ff3afac4a1ec672824"; + sha512 = "f84fe74d42cd109ce0a8edc99c89ac38856ac089983c4e0cbdbb6dc7475f4c4e0d4100ffd9118245615877a0414e2831ef4bbfe39e9f0cf107a1dc03cc5ea386"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/as/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7ec4aab5acb2c8063d7ad50c75c1ad7f68f5bc585dc44843e03f64283e1bf8ca523f96b594ce714b1e8887466af166c22950439f2e2826da74ea48af70c6000c"; + sha512 = "7d7016cf11fe6b2986d59925d162ebd97e0c04d099ebfa7fe8d5059a89d71c0a59fcfe360f0ff5b4380cc621dad0938cecedf2713ac3eff828241d84fcc2e5d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ast/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d569429f61a1457c82a7d811fa648e43c32e530f7bac23784ce0a2d46dc9af0fd3d1227f56d42a78178cc7178a68bd61f960906a671375c94d5beae3695d1389"; + sha512 = "dc88385b02b949b43bdf775775712d4271fa9291c333c3d517430388da068fc5d5b7ed374cf8aff9ed9ffbb9a02f9fd377e58328d05f8cd76ef3ba850a3fceae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/az/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "061bfe7c52091a204dd66d3147cba88a674c0a3e8fbd4cd2daf679f6bd8cedf4c7c204f89876605e558399acfdc5b07712feb8c575937fbf000b8e22b8311732"; + sha512 = "5064cdf4de7520ee6172e841d2aafe8d66074b4b354ecd44657eb62c81e4c3318d8ce1197c9ab9ae01328f8ddd66a072bcadd74f6e6dac3ef913861b97991a08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/be/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "68da2d1a6cb21c88dd2251958d824818416f468f55da69bbd4f7a3c95b07901be8c8baa661659969706ba6fc7bdc89e3c8c109b3bd4005f1d3c734c8648b64de"; + sha512 = "0b112f496965fe7deecf89773afa708e66f80040acec07a15dee7119d25d893611779460644f034ad942d079aedbed0d8f0237fbc6d371b64040c9844ece645e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bg/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ddd78ae52a64ef2f99a928cdef1326ac4c2b21f71728831273aa69bc767a23b698f019642ba1c858eb7e44a697ee11ce51b64540de02677209133d4b685396d2"; + sha512 = "15d6f54e3d46c52d0b54b157121e50651104212e91856fdfc0111e9cbc5c33f51c45ed815ebc17f1ee714e6c943f53289838fcfc409e43deb14db6eecc78818f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bn-BD/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "2e2bcf0675fe48f876a3bc6c247f3affdbc36b8ee48660f9294827061d31775084c9c25e907881a7b32446ca9832305afc560928afc409395ea15788b1fe99c1"; + sha512 = "adb1a598acc8105a75fe5a2fd0e815db40a946236b3982e370b8d4d72946225ed6ddac13fb9109ae3cd0659d5602d03da4cab14693be3b8e12c29cd2f18c15c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bn-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e92fa6388b49a2c516634b1294c8cf67319a62eb3c3718e53121dbf8a952bc2d2aef7423b79c07b39f32804d2a9088adc2bcead8f52f7409b7c847d8eef03f02"; + sha512 = "928d68357b274678c454f4163e9fd20938339f069b4b32a15dc220a73e46d60341fd9ec0cc26463eb3a6e4e0d219bf2d38368fc745b9c843ed11ea3412f8e5dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/br/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3ffa38ecab1d96e4bfc62231bc311a3fcc71721ab735887cf1a3f40f8d6a483cf6f029509a784d8b58e9410834eec3a05f8749c7df72f55b42d34c9c497534d3"; + sha512 = "7d01a84095a06fe0c0175ca2b0c8690353f2224ce8bced896a7fa549c6efdf34cb1045d6316c8e4e4aac2aede5ff491f356e55f5e1fd8cca48e7c295c827876d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/bs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "09d2fc5b5df4c9040d81c0d0b91b88be7a44a244997c4c09344cdf9b116ff9c0cbc76f7e0d391533575b6c4eec56ec184e53cf36ec1d8f4c22a6017a5de743f7"; + sha512 = "e8d3ad64270c1a1593761c56c42216cf46a14e91cbe42eef296b4b82e881dfdcf8466fa81097e8c5a44d788a52b1aa73e1fc02e7c7ac6bfde48e45e062caf79f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ca/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "df7fb7fcd5bd01e7c71c2d2b94ee5a00d3006761cfde5946947ee28a7a04fe343672d41fa8ff32d6f7099e960441a0fb9b9d12ad50e6668f795ba81c1251b7fb"; + sha512 = "45283426655984f4c8e34e183b7e4e680596c816383912550aa44caceab9d817af45f9f625d3c663b7bfd8f952be48222ec1bc49cd861434de1cfc63b846c412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cak/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e40cb218abdc28ca054789384b19205580d3031c4d6d568a29d95252f5a7c23862e8aee403a46c427d1fe70184c3ee81515f79c5dec4e476d44af917e275300a"; + sha512 = "ebe6072ec6827c0cc56be1992abe3cce70d7db6b7efb52d035410228ad51fb3bdc69a8946e2bad2071f283b4bdb08999b13583094cb421ea73c0bcfe5f498f83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cs/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "da0f27f23e1d08cabc4c8df41e3c7483c3fdd263b062f8d9b9e0caa6cdd869856e275bbabe3e6883011de94840c7c1684f2709feb461d38d56a25575065403c1"; + sha512 = "f772bee5ab956a8a9d52445ee1a0837da9e2b34829dc589c68f95bdbb7f93eb8bd939f0a0fd1e7c7401918b7dbc0ce66744eda45be07a02422408db059cec611"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/cy/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "da5f34a558637732e5d312b7e9a48f817f5e94b26c1e4b3fefc2e19b126da249a121ac2376ceeb1519adbab3ea8b690c8bedbf6ba73ba5d8697ab748a8e02fe1"; + sha512 = "21e943e93d9aa8f7efe5fb4911949855e8d1b1a805b7098b4031c178c45657551d9141b8ccd3457d632071b3bdb7d1e5cb9e4540987ff266400d7cbd2d37fa61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/da/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0827ff6b5ebd3f6a00d5e0a1bbc539a2281aad34434ceda8dfa09f50e1b96b91e7507b31cc493da9adcd879bcb8f9ab6d2614def969377cdf449454906bb31f5"; + sha512 = "2c2cce846c7d09a891f22922ebd9ea87cf1d0da8f69f85c9b1211a3f5736a7e43cfcab0133b98b1fab1a7c1a2e1d39f2796f290418c2cb69f987ca2228d05b73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/de/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1bed4fb74ecfb8a7259142bb871c88e88f9a6bdfd425e05c2e3253c972ca3f3609ea736a58c49e370bef90698a99caf4350327e876cec4f485ec504ed99d8d76"; + sha512 = "92cbbd9cd3d0ba48fc7509240b1c486cc494f64d655c76e05eb6cd34bcf331f35093a45863319d4282737b0ffe36e016cadaab7e48aac199bd29395f65bc8fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/dsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "908f90a44a2f4d42e617de8658674abcd7311f81b5a0dfea1f475521c752b143a48ab4f26442ac41799e540d1809f524eb308d4d0f3d2bae283c4b1d4c262291"; + sha512 = "ab797a4f4af8ee5d06f33da64c300f3ce04789262a70fb771e7d510a79f8ba79862b7193655cfaf6887e7cc2f3316a365012b44922e209b4ab3f37bae1a27d36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/el/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4c920a7490f67d3f1a0b53593f2e08127897b07bab5a1b1fcc94750cf661c4e6460710f482b9e79f8680b4af2bbd481295b2403c192166287a4d5c5b7a59834b"; + sha512 = "ab6156b46113720e8f68f199b848335ba8b5c0600834ac79123f1fc9d03b53da3539b1af3a2f72710117fe43a19f0cae46fd5f83969c0181b1859a512b5e00e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-CA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "1d45f4973aa3ca40ad48511232a5c003eb2008911fd42e777befbbf4ead3c1f1c932a07439c7312c1b22e250d1ce6cc37ca4d65a9aeca83275bc0cd1297c7c5a"; + sha512 = "dab3209b762f56973ae067a76ee3ab625179ac1b5bbd25f4087c6419f557c5602ba00d5891bf2198a0d10b68f24c04a476970cdadc9831e8aec4272da2e78d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-GB/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d10f9e09af2ca2d0c2de3834b2601b1ce567c45bf8af62a49ea982628b18fa4efe4cc0140a27b275bc1689021ff80cfe2bf2ac1385506d81dda8ed48e42de143"; + sha512 = "dfcbba6c3ef81e3c519a45bd074f5a87ec65f0b6ed752455d9fb3be43b92a2744069ed5f4408d623aac5cc6997028bbf242ac634f9ff30e6ab38786e6aa1c871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-US/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "851371d96f9d951e9df49fe124d09e5b9351edca88ec9c73c09497f55037012152b2ebd16feb133f1072353c1557283d3ae818b7a09bfbec6544605a75f77f22"; + sha512 = "b196f510b70806076bcd84fc934b85f9d53a0f152f2da63af5a48387a07046bcf2a0e52e0196940bad898baad218efe0ff6b17a55119bc19faf52498cad65fbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/en-ZA/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "897060daae75f0d0dc706eef76b83531e52be488ebe06d9426c49214d800e8aa4ed7e74481c5cc3609d6d972dc689c72b44e7c9ca8adf624a553ebdc3b878fd4"; + sha512 = "563b68ca9febb2fdbba1b0297569942ecf5e9fba768640882b97c1e65d340b2a36be3faa161d4d41f8b538ecadaeb70dd705a0caf30d330887ca3391b9fadd41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/eo/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9f249a21eb3aba5970d9559032e7607f312a267445670e680de36941076ce94fa1fd097455928b48c1fc2ea261ab4c3ab690446dd4aa76fd672232c87dfe34a2"; + sha512 = "5719e2839d907a414e8dd3f19f66a74e2a5afea3458aecc8c91e6e59534f283582babf70b7b2f4f1b5d6dadfc4a61c1a5f6a2e5ea0924a99601fffb48286dae2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-AR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d125703b4ba3702facc644e232ca99e80c3010ae16a264ce4015a54097d10abfe556fd5cb64a6516aeeb571e5ac62485fe232bbc5a7a8299241e10c69b899ee4"; + sha512 = "3fab7730cd6d582bd6dc55fad2ef771f52fb1ae022c0f206d6c69a5dbb869b4b8033ee0f7f028724dfc88a7dd2a49da8f617b7f430582e86d0fd45783fa78a7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-CL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "527bcdb70f9c58f87f8c6b6ac6f3670ac59333e96388317febd72427d71bbc0751664d23874c00bb15776e90b373442151768bf0e50bd4eed2b110bf42ba7899"; + sha512 = "f91b3b3f26c0beb905ccb18e899c131bc5c1b1144c524b4bed77ab055655b235cf5cceca3ab8e79066d1e1c5ae4baa4088250b6f24f3f8851c2d76d26d9c445a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-ES/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c80796ddd41126e488e2cc54585c5cf4fc5be4e9208eeb9bf37a541f4f04beb0ea8dc6b8fc5d1652c281d019079229f257f4d3e6473884a62534f7e95b44ab38"; + sha512 = "505d0965b087bb00ebeeaa5607d3f3f271044ae8291d726be4579a1bfa79b195d7dea94f7e745ff5f27ab4b8eeeca6cbe0c126da2870218d8ed713aa13312dbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/es-MX/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f536bda54effe87e79259aa956706bedb4a0aeff2768bfd1acf4a4afbec330ce596461c535c5fd0e5e04491be650b8bcdf723a33c88674a0a372196a8be769b5"; + sha512 = "482f7ac76cfee68877d9745ec222ba4bbedaac36ed51544fcf88f42d016cb81bdbed7bca6bd564c8339c117d24edd3f038646d9dccebda6a2d44c0fd737b49f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/et/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2078e6d8b02e3b56c03fa09539e79f0957ee3a4685736f259e97f3d0c3e54cc7822ac696b4cba64b5440af99b0375fc2adefd32fe91f2f1e4cd69e88682b0c99"; + sha512 = "1ae7380f5ae6c7d8ff58c398ac43ff66badcf2894a640e533703e1fad0e63a15155906b2ac6a2534666193af019502538d74277f04cad08f69a38a5bc3444491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/eu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ea548dd6a8885b97713871131155c130f021993682269b84f18d84fe47b0a36c9a4b831d17dda3c49b75274a1c6b2091d23eed71ba6998429c950ecd12e394b8"; + sha512 = "621280f1d85280a08d2be058c44515e5fdcee0ccb96d47b30878d81f4cada06d241a924648e2a6174f7ed5f4ac68924cd078c941091f008822644691575adba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fa/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "21f69295ea88573d2b86697cf40b0c2dfbb91bbbac3255167dd3fda9358dce96db60186093566b29ea5af616685c0c38635e347f80004a1474f05aaffd6a91f1"; + sha512 = "212ce3d4ef9ad7f56752b106ecf02c2ede856863c5344e0d68f9bf96a4206cbf3b22ac0ba95c009c516bf160cbd01b6285ff62bf390f07812d2726f73ad30a52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ff/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "107b54a8bcba2b6c883b9056025b6d5a1cc0ebeabdc7a6e5b9d6d5b888caf451b2dcd5533d43d64f635ef0ac4fd4d76a49479fd2b7d28834430e6c87dcb617ee"; + sha512 = "6709721ede6be365153f3dac8b8b38e1d4f88463fae1dcb6617b61f801829f74253101d9f55824d8f39391817877e5f1cb0cf13f85efb19fdcf85af9cea2e67e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d11ef17af249addc815bdd4a7c452020a988858f4cb54a5de8e0d6b3865ac7f2ff6c46253031a174301d4921e10647f03215a52f72de22f59c686821a669501c"; + sha512 = "0473b788edb45f61a65d5f7e16d9d8341bd5233e571eb0cc1721d428fda6f428d119f6a399e7d97733a210b86eadc2ef904e07c01612aac01c99f6f3b923e85c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3c08279fb7de2fa92a2a7b139d0e3e33445b999748c44fdee757d0c0ae659453110d1a3cafab1e91aafd09e546aa1134e7dba5270a59c43c07d1ba63163320fa"; + sha512 = "26e654786722c2fdb41077ac8edbdb9e51933cfbd192d23918a0f93a47111b3b339852851b90322e79d98e44cc5fac0c66f493ce53cf9c4e496b21856fd9f758"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/fy-NL/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "022e12e20b75d5852a4021cd563fbb06b3212359d37b0de5bc586e5810f105756b95de6fcd74b523e5cddea55f8d4cb9e0396db41b8fc3c22c6f304d7bb01e5b"; + sha512 = "89abb03ec55d6def4ad7f9cf9bc7d01509088c35e95e6a8e7e2fbe1224da263400171973d65e14180e15457c157b3b944766edc69934a0ceef3f3eecf2df014b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ga-IE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b2c5e4804b1723555334dc5286e1b263765fd85625f360f405499da4901cdc8e07faf33c76ef4db98858619238caf531a433ce0296b51ad42e856848b7ae6207"; + sha512 = "e65b7609da64b649e1085dd2ec5a844c570d0b9699034216156cd085d523a2f06bb50e4af04d7c77dfe177539b72f42c47b422db0616e70f77ca0bfd61ad717a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gd/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "9fe09dae3d82f840b2447246c347ea42f263cac096a5512cdde71d575d615b232e5ba1b84f833a7e6bf7f71ae8835a799035f8fe7b68b16e075aefe5a40e8ce9"; + sha512 = "c36a91077cb129a37d8e69ea41d6785eb5168765779b1ca960d1c855b8f75857e7343031b86c03e50a6aa2f527ebfd8c9963a01812fa96e45857106ecf058593"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f11f8fb98415a628a4155f6f4fb37652f3e270495049ff58fb782968c222a3623e68cb048952b8f4cf7fe6865544e596cecaa1617ee2132fbf1ee3ec7a3baa3a"; + sha512 = "98fe18bd0baf682953c16ec25cdd7dbe7caaf61d099864335ccc2936e4da8f7b1c47f03036a2aa59dd976f806b03d810b3a9b218860700ec6593be5f6b22c76d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "555a97a026f3a034c81b02f60ea9374c5b7cd9e59c9f7a21b15f965f514cd54812d50b777522db242151f938f72d401f41af43188f3f98afac1140e0c9b06244"; + sha512 = "d914180016e7548813e8e1d1945a2132756a60a8f690811d5216e84c6011380c1c868f2dd25f2f9f5fc2b842de164d3e02bb8c0758f258a48c65c2c79098dadf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/gu-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "39332b77ecebf9aff868d82f82d1e77c05eb8dc11da95fd1d959cdcb0e240fc1d10004532b0a400fb497bec3eb136396cdb2300f079950c3e101257c77a6df8a"; + sha512 = "e870a4400edc3ffa53c92cfa9a37e5d7461e81a635a8049063e044932e50d64d42d0469f66d36a70f3afdad1efeff8a5cf7c29542057735fc75e520b6990aa4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/he/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "de37d0d61b096408ae5610cb44d5f88f29c8e7399053ca62962e17ebe88eca895eab9df49c66d949354dfaffa0a3bfe427a6d704c969b578d0471bf411a400f4"; + sha512 = "616cf9e9d2cba477c71ac041ad1d2d72dd12998d8d3ba9df7a5478e61aacb875461f4bf2b25038e5d7bae8517014d68efd180ca91e09de5eabe0e302239e368c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hi-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bf46d9a1cb5e6ae120f546ff5818c0d0b0dea7c6c9eea7bd16e867453c7c690d5f7dcf02aa5037ea3a847f10d677224cebdb2df454eddead23c2dc611135826b"; + sha512 = "7c40f1dcc26f7ce29ee21c693121b8310619d7c0062dd2e6095f13eb0d80c5bddc3085c2cd03d59ca1a951c281c33829bd7db08d257387c0a8ffb5ed6bf6c8e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "206cc0edc61f7f14496ca252c91b199aec921496e012684c1e70b3b3b7299b9f54cfe0cec07992c5198c3e8d8ab3576b94307d5c989aa3910f21046f4f88473a"; + sha512 = "b8712ce8c56f7d35816116a1a6ea2a6a98bf99d0ea90c922954bd245dcc2750e5c058e1e47a1e7d6126981f26e6a8b534d43e677af0183fc682eae0c0ef82071"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hsb/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "de37187c7de940ef9561ea5ea37dee5def8fcd77ff3ec7e41cb0e3d2532f8c8d0f6330881d2fc5bb35051586c936c6269b0c0625a9043443b3e62c974fe97766"; + sha512 = "d62ca56e6d55e7c5a5ee92528d596fdb0d40b9067fdb2527baf9c9766be37e2a26816655b787b99e9409b2618a66712fcdd9164ad1c617f3d4253ac180411e1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hu/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cb5285ec2351312c4ce92d02762c6f70c01993c7fd8835bbddcf9f78cbd4bbd1934b289caca41d7397ebe5925766711ca59a30b64ca0134deebb91502f7184d5"; + sha512 = "9959745600988f950a0810582283172615653cb1dcd118b74a6e8f8f6e58ac4e4b9dce282f38902af5bf4a1408c759dec167c566ea8d8e84f498ed8207490cdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/hy-AM/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c76a6ae2abe57adeaf770a6aab892752c968a646dca1d4cf4ad515a57decb2b831bf5b2466cb0c4c873fde6c3e63b1d59ee0c4c916921575573edd29c2953a3a"; + sha512 = "641ad0198ba1b4a2f48e6019d9b5cab3d2da8729f72fdcb4eba5effb8facdf72205b3770d024cffc6f4f4c47ae47805332365adcc503673e005cf469b9bad842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ia/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "77cbf9e977749a72d830a0409618b1e584190d08f6befcb8d326864f686822a099124e6bd242bd108e7f7eac60e7685c4dedb39ed6cbe54ae490dc1195cdbfd9"; + sha512 = "7caef9c279cff439d4aa0db54d295b3441eebb791e3757715cef0867a6253b22c6fb8996f4f3a105b3a1194d4e82762ddfcb36420b57235eda941546abddb09c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/id/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b4869d563ee35de55efe8777e47fb32a4cef18969d7889c8dfdec70ecf253602855ae4c646abe685c669cb1014730e9aa6ff1098f17f464f13aee779c1a1ee85"; + sha512 = "12f44d127ca6071988aeafdd926ac770c7d8e16e6c1346d1aef35e8245744ecc02612bf4a8f0db978922836092115d2b9881ad3e7efe2d9a59cdb33f5fdfcf3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/is/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1b27ba489a4f0133826630fc364f30843d11abf171f74b30d93b2f1a5b86af2ccec45063c5ab780e842e60afc7609b30e886fcc8236e583d8abd34ef7d52adc2"; + sha512 = "067e80dfed79b46d6034ae7d4ac619535cea99733b8c8ecad703df703e99eaf50618d43dd7f9792e797580d97cd65cffddfd8a28e1cb6430b8a2cfe11974585c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/it/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6a7fb879fff792987d183f04f4922ab44efee647a3ddba78999bdd40255b84a7a53fa53397826c5f183f4312015170eac7e74e35cd3073019e5db248bf661d71"; + sha512 = "f849e1249e095066376769e58f93b55a7bc9fdd0dd9a6d36ce4c5b3f38ebb0d410d314ede64cd5a35d2d5e29c201b43107dc67eb3b6d7b66e139bb9ff90f9799"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ja/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "19b51ee4e52636382a75e9e910eab0a965121d5986b9afbd79e067e51381980835ab3ff0c461ac7fa715c2e5de3ff48665c6dd8034a7c4f40525d8a4a1475fb8"; + sha512 = "2985fff17a87c95a1d5a0d9b06e90a86f289f09a773ce82d0634597c5c2bfa2d41e4b801a46ba19e477857ab91a4aa16e0fd6a27ec54c23ebca6ea572f0989a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ka/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c792a5b920a6ee1b4abf38930c442af67e5f4f0a3305f3e4c7d3baf24b1937cd68a7a869f7f40b526be8c3b68cce227b5c7b393b86d7b6fd4e3365dc9ef0f13a"; + sha512 = "3fed499e05e441f417c0231d8c60241a40d3d47e90bc9562ce7b982b4d659c92448385d9d1e9fc82814c4d5a52558423b4cf6592a2c4121082359ddf422071c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kab/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d7cc7a186fb777cc3e6a4477a3a95cf86c689e32d3e9e1e42dd9464562101ec9be2421c6a5d02694f886203d3b9e6120d580076664c60bedb6c3a8d2349a10f0"; + sha512 = "2bbb2abe991d9c1141ccc271571c59abaf8917270d033ede7e90fb9cb5dccac3fa15212f0965cf20d53bd5c344e67b58cecb2adfbd64d0511a621066d957597a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a5f355f987edf85410133b259cb9b0531f60895a0467c5655f8bfadd9c731de8655d9a790b299c641d70bf8afec27ac6aea47fb9f2bce70f973284251b3c0ab7"; + sha512 = "95ef5821fb9a1aecbd35163426fc78a5ce060761416da89e2d98fc0c4b6b09e84dc7b7efb6e8f284689d0b8681c09e29fe19230dc870d05ed0f83823f36fe13f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/km/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "9d60a9e2ab8f54e7ab81c9c232cc50b7b311ab5c6097984f4c77ff360045b37bcecab2b4f03e483b058e14300e7c6fae47db8395b2f1d2c8a4a71e73a2508922"; + sha512 = "7df030ff8a6763afa07b18914b1323aa0e2ed9ee8ae78630951b907c3f15b03b1e80996f7f2014af46b0c6fbf2685dff428c0b41ee2ab91d8372ff768b2f084d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/kn/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "761b81406904250a88ffd8bc4c0ad05f81ae9ffbac30b65c1ea75d2ad8c9d8b0beedac2a9a5b453c694cb751734d5d9e132e57d75f78b8590ca917f2b329c725"; + sha512 = "aa6bdc66712d494c3bc23d3e20f357b1d4753b38a4ec777ec4e53d59fe98e380deac6bf7eb7b2e5d1939d30efe6f14e19ecee26142fa56464f21f317cdd43074"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ko/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "be41e29713f24023ec55e48784831dc6dc49a01b30611a69d7066739d8712e580c0feaf72f44265de2df5f789b2853754a8fa1b22f9cc6e5a9e8531ec8296ef0"; + sha512 = "d0214a123b45f48e4a42a37c3c9cf6f836255672c2e185aa6ffd67260bef48869897eb456b3a76665ea64509e621319907e373415497ce9833355ae3c3e12570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lij/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "93eaffc2d1980651203d742391e3a68b6c10c1f06bee313e64d775f9ad441eb5c0313c72cc6ca2fca8e897a2817e73ab8a601e42f6176ff8264923a3ea76f4c4"; + sha512 = "9c7e0c74e79ff4740bd8aeb66620c20404d4ee85a4dded859f0583b0caa436e7a067e4838996474f1adf8c50975dd9889add78c94f02575ade9880dbdde07e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lt/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "80c920d3fac48870cf30c3455f84bcd741952e267a88767f1b196ea755b62c5fe9e7b8e31994e3675aee243cbf97bbd4f92b0dc061e82b715816c07968351fd4"; + sha512 = "f5932df1119772d8ed4ee6336564dfd80ae7af4cad6d0c7f273e68ccc878b0d465e79ec660ede6df0916d5cd4c696adb7a1e844d336a84934db4d02d4be96a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/lv/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "379255160004e55fc493f01215a3c796b085453d8a8b855462cd28f905470d0a25d8e3cac1ebe0a17fa278485f5c153742516dfa009aa3cdffee73e9d9254289"; + sha512 = "dcbebc94d9da58f7f7c03d481ade1f2460347587c3978e8c7b796a341eedf19d3cb3160c4bf1695735ba34dd0d8ff010fcc4ed721a309e1063152afdd26a5ad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mai/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "db312bdff17db4b5e5e01bf8040e915e3be8969ea8c98ce85f244432c89ce0061bc7c0deb10bc8ba83f430079fb1265f518eaaf410abe481a8e0d9576974088a"; + sha512 = "12444b32136cf00da3b54fb8d1e17f0f679247db84b2fd9f66a0fefd933d20951369016d7a93f94b9d447994fe2bd73c928bbd5fdbb30d5c3e09d8a8dfe29c1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "55f9e3cd8f1e13de00a1e32434a5322faf67da783dc1be8d7d41ef835a59ef73d9dbaf6757414cdae4d625b7497356df810a6760d34fb9e26823b050ca5d2766"; + sha512 = "ab8e81459ab3bb640bcc13aa78210560c7228c2f9b5ce1fda9dd7a50a8e48e960154d367a760a814ca01406dbe75112ef51069d98f5ae6fec33328164850ae5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ml/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3b27044a7b1e5c0c31babbd44412e70374cb865c7c243e9b593adddbbc3f12e6be721532b2082bc05ef4ee475fd72370e31aa340912b6187f908f674c3923341"; + sha512 = "a882f82d4d9bf971ccf0e447294f76b2a40b53d938fb0dc7fe910ff5400f5acf615e89930896000651155532750e5a25d403c4ee364ff2b4feee0d4107481947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/mr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "04fef5a56e611a91e0f49b9ef8747d5ae2f64a05f3ff6fae7d4933d047f67dc267c30717d47f675c2a2c88a9cfb87769f3f78aa3939b764ba77184728d456697"; + sha512 = "758760da136ab2d02c3debe739601029790302436901522768216e85fa61dcea6184f9c18be173924c38d0d391086d6f0ec72f211ef6e2d30514981362c56c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ms/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fb4ec9edc24cc3717b30544b68afe6fdfd794961ac8e79d16a2dc7df47b45e2b44c0c908e64e52553214417dc27a3ec1302e70a1605ff304cb86ae8ccaf422e3"; + sha512 = "3d034977c7416b28cfd892f96dc46181779e9cc9fef76ccc7e5e84a7bd9b1aca22f9d039e54576132770ba9cc17cbae989b2a6fef95aff9f22fa44a0f09f4551"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/my/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "35b62a3f008eb58522eec17db537af88f83aceb69e85e2286ab28525cdf61114c532c5673a08643b8a73f82c6775d5be3a7837c538c942790d07861b580da992"; + sha512 = "27d0b3095c95c214fe1f58548e839f6b8d2a84d932c980455b9aac36947917037ef6858d50bc683a8062daf22157b6984948f593af01ea39912b042025d7f445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nb-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b89e3cf1351ded3174864f651230a2fef05d3bf4cb38f5bdfb8a538359f5074d9c51c2e28e96ebd4b6bf5e65fc19c40aa314d1fc73f8f5dea5d2395eaa42d2b6"; + sha512 = "b7e42d080a5c808377cb5fdc1960a27e6391e3eaf36e35b61fea123c78266d7f5be27e34c5acb0176f9d776990d4b1a9ed59d3ead9028f74cc057ebcef79b1d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ne-NP/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e6e24ce09459fcca4f0910ef26b1a8131fc5154fa6ec395257cf12a4d637e158937833ed7c8a35c22c86734bf4b144682c4d736c26aef1407f3ba26dcbda4c9e"; + sha512 = "e919396148024bf95bd49fc00036c0e25889e5c289ab95ace12336ddb6cfb5bde03ec44f50cb7c8f4b7323d467848e7db8b43c80390e5994192ab72699512001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b3f2bcded513040431f7d394a3b262f5f6c2a7b0f0d1fe24806ffa6f07169e94779d2a91a6217a190c24ef85d1bb04895dd379c89d144ddaa7e2e98e4ad44dc1"; + sha512 = "c0cff3321ba4f8df9e46e18b4a4a5054fba6852cbacc10cf1d51aafceb654cc8b25f4cd856ffb7d8f840ed213822ddbb90860d39c8f1a8011eb4f2e3e84ac80b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/nn-NO/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7ca3a47a1601668717895870a5e68956ab8f5f464694105a9fd28e5dfb5965c3b2063658045bd58801757afc9607d63deade730893a29beb0b886b88700f107f"; + sha512 = "30fd6a19a923f0b4f08d5bd0941bb332523865f9dc4e5033e36e6a3531ea413ddb14a227bcdc64d3e99d3e42767a0f629be317f2c7b28d44c757ba3404efcabb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/oc/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "80ec6dae359e04632c718a72ae8c8a7a9e4f4908fddc0dec134c485795ba57ace2ce767a3f08e320e6bb903900d3bd76a0a5d01deee792d38d23d3a95fad206c"; + sha512 = "1950ebce9f7c1d5b0f4a66d164315555acf17dac07f419655461788ae08cc95c5db1df086386e62acd999820be497401fee6bbeb02c3290e1158b175ffd5f0c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/or/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e08af296de25fecb08cdeb26901ad95269212372f08703f8d199931d9ca5630b62e177d2d6fd67eece4fa1639fedec49c73ad2513ee7ab8a8ad841194f65a2b5"; + sha512 = "98c02bff9a4cc0dc725c19ec7488984b208ad89f8a4b2858d324a3ff07bff732abb69b3e2ce946445eed5451cde4f2a8c4b806d221774321b876ed11181106d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pa-IN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e50745d15d84facfa58465815521f6569130ef040f5a726bcd6b6a6462731740fa13a924ff48fb4406cfa6d72672f75894d00b1509a66fcb2a287c5b8328d707"; + sha512 = "f4eb3b72fa734b3d5e6b3baff621eb59b572c4e481695bdab0297ae00bc4d8b2da7d1728ccefc23513c937e1943e57586a28fd97b87e74b457b41e4a454ed700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "31bd0ae87cd147599ca5212eaa990c4e5dd58df0ae5c5ff6bd4841633d3a85668d66450464d6d9ffb328245671d37224a2988af65fc1abc83644ff121e7c6a83"; + sha512 = "263a62697332df30670aaf24ff3111b8b44c003a3d0710aeb6031afbe56b3946c70c08b71bbaa375d9d45e41d29ec8a5ba049281b8859e5c3628f21cc500e02c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pt-BR/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "dbc5693487df47f592380d603b02ddb850c0b6e4e664351e5704e45f3f65dd1615d0b0bdc08a10f5e8f184976eec156d58a3735a20564b5f6b197386bd4c7a6f"; + sha512 = "d92e3cd9028fcdaaefdca4f2936459bb8d37de528bce9d342aaab7d70e2012275db19d6f22284c4a1964c578cfee8216f1d386d8af1c438c2e1f8f7e00650485"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/pt-PT/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a5b753bd9e21380f9ac5bec17703b81e591b6d3bea809600451c668140f34a6c3cb6b23bb99e72817a67efc16a30ddac12cd91c9ba16d80ac5f873f99927e228"; + sha512 = "7f3fd60929ffc746ffe45559e6a9fa677e4caba9f9208f513a59a98e7b8c41e87866507b4709f64487faea0d62262ff5eddc68ac1fc03aeff3024172c609be1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/rm/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "0d7b5bb6f5fdbbc50f3d60898602feeb494c54e0659485061cf3f9ab69ca161aea5170c99837ccba96fe3afb600ea84baf959b0bb62338af05264e1a6bd6d598"; + sha512 = "5ee7098edb3586dd6d2111949fc23cde561130c777a3f5939bfccd4d18dd14e7094f08e6194dab356a5ef76b49b6f24edf9d9d2be32bd245710469bd27440fc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ro/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "deffffacd851d82adac2e0889531825e86f030a02c96462c469fa2a955dfcdb4f60b02fbfd90859052cd73b8408ced16231025c776c6c530662ddcc5a11bc55b"; + sha512 = "359f9fcf20954e6b16466e02c6ea15ec965abe82f7fc64b9f5ed2ea68e84ec2e9f4cd8121ad7eb8473af9fd0284b3a518b8b0fdfb894157f9c15712738b08344"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ru/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "119f52b77e6a174c16822247d440a8faf69c3c415106df4863bb4eb4ce5a7d9d9126ba341576866390da3465477e5f219b0bc3b98338dca79aff28548d341b4a"; + sha512 = "d0104656f455332be9b6bb4d5371114f16901e790b211671de042903fb9fd3151a305526fee5a9851ab0fdf20369948ca21068ba28a0457c326fd3ac3a616f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/si/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "7f7c7b105103c61519b42dbdfa598cf73134722ddfe8007d7bdc8ded0672da7a233fda7b97197fe9f7b6f87a27bb91382d7f59fde86e7bd52802f65a61d01ebd"; + sha512 = "bb3fa16a18e8c7fad30a69de358ee7cd22bca90aedddb40752ee60225220c48322ebe7fd0528d3201964aa3845ccf612351c5563a1fb2781797c631d599f54d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "934919d2a151d7b8437c3f80acb06823ff682085dd668bd6902394cc99db53b1d328629f72db7d916a57457f7ea51ad3bd5820fb31388eb74d21b2a6b28e89a8"; + sha512 = "d6e0f890dc03bc5c1e5798d6cf211445b7fac339a0c32cbd5d6b91ba1983f2b730970e21fca503ed39059772cb180a7d372fa65fb3be7ab2c04ffb57158ffb99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sl/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d167add005229b3647f0397dcfe39c0dab180adc6df384f86e2aacdbb555edc713059d64b33bf6f2566c113cf95db68b6d849de82f5cdac4384db313b7e49b2c"; + sha512 = "76f13adfe833ad813730f40bd2ad1cb61636541b50f5d525c1baef228ad9db972275497c61ee2e8f09eabcc9e489215b645dc5988a24d7a209eafef0db3759e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/son/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ee35cd86bcc132339f5fae096b1447d8e2a77d00e757e57dc8a52185ee7adc57b6278b8580312800fee025cd3abe50381936d9da35635a22541ac1682a65d9d2"; + sha512 = "a4433fdb4d889e9746cbeee49914984795d25de2397082b3b128e9c4f182b2f4112fbaaa936fee5bcdd144f06c2de64e6cf22fa1d8b9cd96a93dd8e6979400d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sq/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7b76f65f456dab1f4d88f7d4dd43a88aeb7e92783d3b3c5416518d9516870582d2cb579183a34f707b9f9ed4b0a52e1bae6ee57b4b73632bd3000e8d04f1f02b"; + sha512 = "d0600fe7da875ba11f8d4dc0cb4a8f992771f4ce177200a67a1bf126689f7e3469e4e8ff3ea019a2bda6a5a6963f6182620d03bb5ce24511d01b58c74bce01d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "2246d41787f073ca4fe28a02cb91b7780accc4d93240b98caec769cc2f13c8c7a6c50fe53ac86ad35a8db15525ae4ab0203336c061fe200f8bfb1af21df8c94f"; + sha512 = "74a0ce9704712a058e1ba20ab58d77735bd09659203cfad28d2fc3330e2eb98fe663f6b7d6be9cc42f864a52f161827dea0afdc3050b33fbc98ca3926aed39bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/sv-SE/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "113294247e8459161c3ebd17fea55cb474ecee7f76f74cf71730a6d4994c7a1e1b25f255c27fd646552dbe09ba335d62954bee5fb66a0bfebbb655bd8ffd2674"; + sha512 = "e05b7352032f8bbf9d17d76d4c6239a651a01b547bcd894759012fcd76720edd048202e2e0e64051912a9ad3b29387177eb945d7aba13705db7e35ea5f15e5ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ta/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "e7ddfc1e1d1f5cb5492f4a5e37614ecc692778d73fed32dde6a09e6b30d7f0bea03807ef62dbc8f7a3ca283ce84b9b7db53c63d7c5558f9f9ea4089076f54a5b"; + sha512 = "d4ac1ac26da94ab321871dfd65ef08a672d84f008369ab1782fdd084477cfb07d9cb251814ca67f8ab3abf98261af2add06cb00acb92acebf2af12d25b1156a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/te/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8f8ba9ca13f49df74f7aa24bf93a0820504aac00a4afaf00afc7ad781c06616d96a01fa886df9c6d1f43d08f51c8753cc9bcc906986a6378162e1fa5685ebe6e"; + sha512 = "8bc26d5c59483fc72d46561d4b1af683a1e6560a43b481d234324af1c330526e27347d29107cd89bc368bf35d44c30fcc09a39c26356597749c4bd209c284960"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/th/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b2c97373adad7e4bb74d667356ced230606737b3b2a53c2a140e6c5e7bfe17cf398862281c6775749c774336b4265200f4f4149511006e5a6f9878e8dc643a80"; + sha512 = "75ec5b50f13b1d37fb2e2409c21a99e2b15e98eb9337dceb339acb7c6ded768afe1bd2888aad4d3c125e91e5967f10c4374fd3d1865cedcedbeb6287ddc8518f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/tr/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1a9f803dcc7d7aee156f209608e2f1257bfcd6e145b64a26be68577ccb0db104b22a3aca232eb17042f1bb6b4b2552e181ca08fe01905d4895a6ca87ab813270"; + sha512 = "755d05999c42aa732f66677f94b243120d7322a038bf8f19e34fc2991690ba0217f773ea5572e818e5714b8e5b7bf3c45a4b191ea0e2c2faf7d04d51d1645b6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/uk/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "ae0c6fd6840e00f5da761090655dc38b93875975eb3833c0fcda215f433d4565124f8039396a764728c089b985e568252b7bbb43da5a44950561a64ebe0f655f"; + sha512 = "52d1820452808579449df7e4fa0fa2f2973f40b0d31174ec1f14fd6501c0c18064787f58faa4d756e25b12986f806d8cc4e1a3d78271c2e3b54b803ad41dea6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/ur/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c2a5a90016267c37461c3a8823e1671b8899a9824f21017d5b2b66b80a120d9ea53f42c2e7120f54c5c5e3b0ff014a750b015d3a9aafbe25dc3331664df7b3a9"; + sha512 = "c2e30a3b32f86132787434e7de6d8c2e140f4b5c75f63b00db5a8dfbed51291f7139c3a26ca0d102f0414db61beaa5cd9f37e1a1c2f0acdafedc611ac7609690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/uz/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ef7e5f912057d999cce8bda5d914282756874a6cacc2a3dd4bdea6d8ca738f3963d418629ceac22122c6a22b11c741c251bec80f0eea76cfc0b08d245420725d"; + sha512 = "e5f35c5362c734ea8aaa745bf1dfe1a7464ec7bfdaa676e0f14fb590154788ccf37f0155d8a312dd631cb7d2546ff5de9fa7564de6e277ed4892e7897a6c8aac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/vi/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d5eb70f182e61d0561b5e2c146503ba46ffa7b1f15e60cf9856e7020f6b4079702b314deb7b5e4ec1c28f8f611eef492b2340bcd2ceab6a72e15778ec073a54d"; + sha512 = "85efc19f8def4652f8d287aa5748946f55688bb5716ccace6385036e1e36a8da471bea0ccebe45d8b64d77e97c9edefc29c13f7a4bd1556220b55aade33c3ff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/xh/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "45687da419278f6574193938a79b6fdf7e714692211a84986ae93a819e86997187a10046712c7642b987077bc77c77d204a0b7916c969dd1aac78716f8f4678a"; + sha512 = "b7fd22c86d0529acbb964ed9c6fdb84d4e5030191f53c7dbb736e9202422607efd1e5784865913db4c1639b32c2a2c20eb6344a13c2c16051b2b49336b9aeda9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/zh-CN/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ea09bc4e6f4cec7df66d5f1b10a048564a8a7613fb1ca33f7798d5f86c862673f51b4e8a49e757a67b88601c0a503aae5d20f02279feccc65f091b5204c27a6c"; + sha512 = "608563e45e7c19a39ef085b77cbd8a82fdf77b69833bc778028e538e2d4cb0ae6d0e7c9f8c8b1b54d816bf23fee8c432566cb2f5baa7d9095afc92d29915b232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b17/linux-i686/zh-TW/firefox-67.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2484176d780165bf0adf1e0903dd74671b9ed4983601d4bdc02f8960a17f7818218f9d01660a406ecc1f4db1d2aa489c51845bf69beeb58282fa061db918a8a9"; + sha512 = "36b947d2d168294007845276762704b8d6c9d30f4f1d1ee64f7335a07fd551fc64580e05bfeeccdfb84365d40c885b885a6e63cab9c611f8d0570923d3446e18"; } ]; } From e986f3fec468d3242543d4a4466b510c331af62a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 May 2019 11:36:08 +0100 Subject: [PATCH 121/637] firefox-beta-bin: 67.0b18 -> 67.0b19 --- .../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 2181292131d..98696c1b619 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0b18"; + version = "67.0b19"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ach/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0769bc01b1178b1f86d87f6486a0c1131146675ec24d30d8f17ea907302e773addfa0f6e8ea97d753cddc82a9f301ae54d517e0a2327cfa2afc133f93cbe85b9"; + sha512 = "57938523aacbb017de1b3f465101988862309c8b8b57814eb76aa5e9a40f8f58ceaabb6cfc0d71f47dd00c8efa90f16864d2a55b31637cd0a09d2a884a641a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/af/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7fddbc2f09bd49d3617f2226afba0dcb67fc0b15f7e9263940d54fb0c7421917e9a2891da698cb0be9f76402873592975813aec10b7d23c757e7f6d49c495d4e"; + sha512 = "cb133de3809b95207f3289322850cc9a95a7cab1bcee23af45c7f78cd0bfdaaaeb8540fa73f45eb74433e70490524772fdc2b942f4028211a4946d1fb5094f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/an/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "07e7ce1a59d563dc001672b14d0e0b47f500bba00616482c4b205fe354bd5e7adf3129f33bc8a158a0e6d806c697b7b62828b5bb53c3c16375c123ae0af91944"; + sha512 = "36b8f43c71db98f757396ff62796c58bf325d4118ffb1982a50c0cdf42d52fe511c851533c637d0b2a5536e4dbfa74056c63ea4ed05f4e02ad879e0018402ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ar/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8f167e9b15b365941c0b07e0ebc2764a32ca5b593801c0c63bcb29d8c62a917d6e8574d3a8749920de4d522ed9a9f8bf248700711008e753d6fe24e12bf4910d"; + sha512 = "e45d414c938d887730225337bf23085af4ae19b93933ee032ea59e711bb4471b51f5a30673f6a3d60db558c35b70e0e4da3db5126a091d46b1057eb51de4ad60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/as/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3294af7acdcc50fab8632b957ef98536912b2e13a97427e3f3172871873ae992868ede0fb99d795ec4f989058639b0f848998c49bec12668fd187cc364b532b1"; + sha512 = "59ea0790b6b9c5d8de80980e0615864aa574ed8f78c0ab1bdd38bfad87078e16979f7c995ad8cbc994f325bbc9b010c28e7c59c1c94464436ba042498f8be98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ast/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "27c2f368178e41e3c86ed31a588b6e71eac08ee69c91ff841d2b7e0b7a14547a011a47f7b86113cfa0bc74981310797ba46a1a59095c575a45380f6ac9cc5061"; + sha512 = "3ef5af1426289a7beeeb41886bae7895fa4dd4c428a4a2309e0e526bcf9409292509b4e147786594f90ffcc4f065ae5209a05882f2935eb373c48ae86b895693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/az/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f1f23c600e0fe98949e6b23493adb74f2d16bbd107c1b2b9b3e6f639d2148b6782f8599f5516481b432e551867a5de0fdf417f2d6ebd9a537a8408d1bcc418d0"; + sha512 = "72385d4e63065187595d2a8a41b842ef07cf6355dad8f63306c1e5bcf065be8a95af2177250dc953f7882909d5d2579a22a5fa6c7fa3822e6b835951ff3d41a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/be/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ed79c5ea368d3ba5c6a29169c0d4c4070cd2f045db9c8ef5151d8c489a9099baf74346bbf45806b06afa2034647803df8eddd1bdfcbf7bd4afd44ae42c902913"; + sha512 = "ee5d952dbd52b7c6e5f38d9c48aa275de1255747912b04d43c0721cd4684427677644641fe717b41384d823f444454f02b91de55fac85e6d890c8a0fbabeb3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bg/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "13069aff98bf87c9ee445e4b46d4a43d5f00fd1db13e7ee76863146b90730a644d9beba59df183083ac1b2b7460cbe907d0a13ca5c7d2ef018d9ef41b3058467"; + sha512 = "54c8ea271402e0ea4728c7ba3e03ab664e7fc216f14a55a96dc3a0a8e40a3403616f53142d55d27da391c35b3532d092746549d932de8d7d09cccbdcab5d9f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bn-BD/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b48e45d9591162ef472018895a84633555dc85f6ae9f6920a32668323ebf76b109b4fac04ecaf8852e7b198257b515212a08c3214bfb06ad62d05c59a8ba91b8"; + sha512 = "d73f9cea437730d0a926bed3e5f0c4fbdd68931066504f61970a6a563c0096ab6fa9b450ca0fd7a8edc92a84f3a08ad00195a701050e0c7ea6cba9bbeaafcdf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bn-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6d25c4ce44528e2f3129005e50cd02613b0204769aea79bf7c99a2fe9842e0a935dea26b98df833374041827906742fdc0ce3ae9b73fc80f3dde0987f4bc6c68"; + sha512 = "c1fcbd6f10d9c7624ea23bcbf77ab22098eb06333352945e4ef6c9faee155e2e83dab1ad9632cf90da7998e0336e35a14cffe62b44b5999efd88ddf4887c91ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/br/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "db331005453e21f24453a1bebed498ea78d2399f4122bdf0ff543a1fb1545067de1016b1edcd19a24749e7d21596b8e27141634da19774d192cb477216fe23e1"; + sha512 = "f8bd8a03722f7c4b5dc0f2c7ce493649b5f1ff2cca3d7b067ac4f45c92bc6115bfc3391df128af4dc45dca9ae86f3202b14efff8218fc4d5a5709258e82c34d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/bs/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e46cc4f4eb0f4573185cf1bd76e609e733e3edccddb73746bfa9a6a8c769f6de2a95bcce00212dd25f1b99051d2607cdb7bf568060cf623ca3c5798aa90d0543"; + sha512 = "69fd43f6c4cfd3085ea10b23fbccd694dbf4a7431e42bb680dd4c84005fb1b55c61b84b64dce471c0239c871057916e27275cfcab6e53b37db37e55c7ad9dcc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ca/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7bbad716a551a8629bc75d703ec6b3e6cc2f95c0a5514b5d2fb73dbdd8c392a22505425a9b6c24cac8a55fc020803ad31626c68d84d8c5f550bfbfefb0630352"; + sha512 = "331f582fd09c20d4a22f74b5c97b6690360999f107e9f8c8e905cff7ab820260eba07e9c8b5ffc8a3db2a4a31a0520d1ae35a6fc19ba95dd240a33a52936402b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cak/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4be1b384584b2f8a8a6f4fee65921497def09a554f4d77f50b8ca6b105c3cb17c5601016955bd4c53e7a3fc296572ce144e05eed588ee23d63f667819a88eb92"; + sha512 = "9949854d86c5bea188ea448d19859cd084decf61281fe31e1762293772bad6e74e1ff09226c18577f795e11d6eb5856c47b3519ee64ffa545c36aff3052b22c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cs/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ecfad56ed401b66ff33461bf47c7fc6901b6373eb8f2c4234d281d19bee9c9fa1fbff6fd4da6e39aeb1f75352db5a256f8b8b0085ee43ae33d609a01a5c0447b"; + sha512 = "7f63fb91a382ff5a2592308febd6ebc92ab98a2bbd33424db99cd6221145a41c852d5315b69125d8522ee6bd334b75c1d2f66919bc764fbcd5be3739653074f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/cy/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b23fd53e4d78a75507c86c9de91defdff4726c6a80b0cb9f936afa6005f07bea7bca72b2218f58308b6d8ba2dcc3d9d57a70cea8fcd466671121fea5ea6dc89f"; + sha512 = "57f893fadd7b5b0ad43945597813555f7888a81782f89ae48eb6b63dfa5d62a8af386c21a749369ee52096f246518d859c55a39fd698389754aad6910138fb98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/da/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c0da4c254247e98ef5715f8af5bf63a1b245001f2ecfb86e87698cf97e44e5272c9c8a05d0390c0c82c93789f08204eebd8a56b5cbbc8a2757949088dd53e2b5"; + sha512 = "d05cbaa0461bc9ba0f7eb181f9fb5fdebbf2476cf28a8e7cb81d9ffc55bf4613870672411d7fdbd909e11f74bfadcccda4e51a7901be725472fac9724317389a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/de/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5f87241024593383d139a109c3ddd58b59e4ddd94cc86fb6b4d437c2d8005b4c4306b0854260bf0af594c87c990c2e6c9141ee2a3b6dc7f03460aa2e588ee827"; + sha512 = "b11d17e6a45f098203acfa4ac67a024363722586e9d56e3d8c467a4759fc20ecee34abbe2124496b2a63fa77b3a12085add6275328451a81fd3ccd1363bebf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/dsb/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "847a524b6f97cca3ced60765b6b7099604e53ef38ee05306479dd692ba7c44a52bfe2192b45b7fcbae741f541d3c3c1c5d0a325f43db5377e9e33b74dda13f82"; + sha512 = "8e2850ee9a9682001cb196f40a6ed5bb57ec434c97378c841dd29d40d06672df45cfce0768fdc95da1e279f04ddd44f2e3caa6f87e1c115783ea7c338092269d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/el/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d3d56f8a43b023dab34672d19fcb4e87ac5d38e325b889c92b44d83bccc89e27ec2db7b99dde400f06b5a3249cf25c253ca16ab2529d0336ff0fde002973982f"; + sha512 = "65d71abdb3afd8134a9dca80b7b4750a4c5303a3be172a5c1ad4d1ef2b461a010cd32cc72088fa27d095200bf2c630dd80daf3adc2e9cd3b768f38da6823006c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-CA/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7908a54de36bb5e846efaae0c767309991aa9767e52b08fbed7ab0dbc63615e54bb9be8ab6c93e62f269641dfbf8e9ca14763db70d0c7a91072c950b9469f7b7"; + sha512 = "4ca7439c8bc775f320e17cd429f1f4695c0e28f341bc27cf8fb4f80ffd947bdc3615201164cda8625abda1a779cfb5ddf074b3e6237f07079ec5fae656d0ab0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-GB/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "cfbab51c622b687f7772c3f5532bde334d70714f8917b8dd75f0d4050cf666e506382b758242a7e75eac436b84f77afb98cc7fb32e8f7da5cf55abf32bb7e1e0"; + sha512 = "f573f091dc6bf0977afa8df2aeee4fe99f0e3ff18b5fcda983652dd748712f6d949aa7e64a78f2b072026c3df699fd8632b743709ef04c71e141c6adf9abc65e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-US/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e49eeba70ff6962f36df3d9c717a2d050d5b3be52d1d859be00f2d2bdeb97568e8c180b82e9d449f159b1da71b6d7d592e4df57b84b199d08807ce11b76c4ae7"; + sha512 = "d4845e7816bf84f540ce4c3639a48bed9114d7312a20ecec392359fa38e6bc6aa39bda5fc85f6bb7fa930c8fc5f2a407a8219b67c3232d17bdeb7271735ccedc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/en-ZA/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "5dc8904bef3fd67f1c42467a773061d33de09716751f1d5402872d44c9d7e1a8a65b59ec170cfc769a116bba320a5da71d90e9d0382cdc42fd50e23d09f39806"; + sha512 = "e1f4b64ff7cccc50539587b4816603f25a3ef45951208a616915b808e9ecba1ae5c41ac99ee41ff5f1e165068d13c47bfb2234351fa70c7bc08583978e60b8f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/eo/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c4d5124e969ba0586e7b3a03786ed662055824548fbbdae70d902086ad4c07634e592813bc6c9de2c160e6a7b7f934b08879507658f4a77b1d92ce59c2ba7def"; + sha512 = "a2ccbb24e8c818121a3171b1dfa909e3084a6661205c056fbefffb9dc15891a0e3a6fc162724af1c37022e774f4c5bec1aaab655546e815806a70c30832d5541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-AR/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f9ab7f316f7f1effbe6629251c948a4310a9a4598ceae03b935ca27750d6c70bc9a1302c2eba35a193bd0256ad89724b51a6c5b1ab2782927d96c1ebc7f0e84b"; + sha512 = "ecfebd721d3751004162e2712a2fef4f69cd2c8f20ed903c719557f1d364320111a6c582b659ffffccfdd62b99c528b0f83f6d9b336c1fc316fdf68b602d1b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-CL/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "563ecffa8ab710b178e853581b09f8c624b7dfaeaf3aff40e46a3a224030691db20cfc58f7d914fea45a4c38136919cb6238b1e9a11351825f427191deb1f665"; + sha512 = "0797e04170db48cda7fe1c864bd7d24f1240b27d41248052b30b5b423c1181c2d6c5cdbaedcfc3c57fb6d4a7b7232ba1c6ddc84aa6d566c4a643abb10e6915b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-ES/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b8a6958a4aa86961e02f803c3a590bcbdd4d34963ab0afc0f21b42fd28607b654c2d7a9f0bef2723e5ae54b68b0ea4c52fb79c06c4996d06700091da5a759788"; + sha512 = "0127bfd9a53d3d9eafe9d84c73b1ab53b9efde1a81aa0751c67165b1e99044618b03ff0eca308e79f45bed6561ee4a5290524e54684b3f89148aa4ba0d6fab82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/es-MX/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a0b5c8250832f4333d437082b7af0ec25fbcd604d863e3c402156a298903a88daed24a99e2ff2298da6dd038d41c46045413dbd9a0ec2c1436036f8b7ed767e3"; + sha512 = "79473ab7aee759b5f9485b31d5650706e75ba2ec71a8f91c8d9b41b1496c268ea778a023301e8bb4fc9e18d9b1f3e5adbbcb29561e92fda786f841f8228163cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/et/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7d75d902c248ba18ec5ed6d83c54a4ed118e8fc07597609401ca6a7807c45de3c4fc423b1076000d4123990ed845a9f3c2acba619563adb62418f7b1360c248f"; + sha512 = "df9e12086902c937769663ea4b96df824f448edfed49115c0c364bc4e46e3bb12e054c3863b2c7ae718cb10cd531fb029bc1f50cd510abaf6326f08e7e6c9916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/eu/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e64584b603c6b169f148600d1ff8761bde688eb7159854cd62d684a1764cf14e021f9883540121be31ffd1496eb232a3067e28952f013cba27fbc53bd75769c8"; + sha512 = "5955268edda75f514de7e2d77437ec15e00f3a3c0ce444f5e925932aba007a2f6818041e05f2082f9a861516cc327ce01f337b51af4e23618875ab22b95fc8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fa/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5c5006a0c43f8f8bf32a08497187e506c8c86454551f78f190014d9b1e63353cacb0de9176b2ef2ee285607eebafa6325a2d3b2ee0a69cf4b3b1f3c940b871e9"; + sha512 = "1d54d2337975242a15051c2eaba63837b695aebfe8f10d2f4a313fccff457c395de0dc44557e691699ef156abc5c6c70e1d3fb4104b5a67a0f88d9f457cf442b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ff/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ecec561181bd2132d1bcec62fac6571c56028d3a780789c75bde79e18da09a46fa2fcaf6d5066cb0052fefd3a7a7e189a18238896303065034981ba9eb8bf82f"; + sha512 = "c3f190374e19204c0c9c945b2d17c51c28f3673ca1b437ad6a51322924d745706bcdca941550bf73f07f41fa8074fc82a39779ca4de56b0769e09be810336223"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fi/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "39ae1dec658a8acb20110bcfcfdc0ae36918387b49fc2a746ada7318ebdce380de8cf857241af4a4c4114fa8dc9467eccbccaadfd67e9b9ff1ce67959ec69767"; + sha512 = "a2390b34ee7df54d9ff75de306b9628251783b2a602bae4097e4d68aefd884c2e079a651c47381b3ff019c932d7cab3f9b4448a30d644ddcca1db3518cc1dfd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "75319e1be73306b18114df1afe1f6d5c7fcad6a540c253cdadb4e0cd63b03aeba2a0d9eafc06b68ada3cc96b2c515cda6877aa78e0a6534c17fb3c892233bfcd"; + sha512 = "0df41f6a930e5c396db2846e9798cd62f7bda0a48c115f87f7148df9d3d31a787abb8119f2e239271406a30568bba01405d1db78b3cc213824873aa5d3b6f29e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/fy-NL/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a6ca5052394d1faf664b664fb06684423831f2eb7b9adaea3cbea0c7e4cd96eb78b3946c00f881ba4e859f12bebbf8f0c6caabd1e128a13b0fc34e7189de8103"; + sha512 = "9e30a7dd5a6bef2c6e9d926898c6087f70a0fdd3d5e915f7564ea7decf8e9817ae2077e11d1b4cf49581f9ba6784e11b7ec8b78f07f1bb961353b3a1fa05682c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ga-IE/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c99ee94de278b0cd4b336337888f054d67f009e421008f4ac8232e6ba9376d3e30c56990f78c9da9843f5d3b3319b002a9c0da7711867ac6b9b44f3dc3008adf"; + sha512 = "d964d95eed12056f68ff0e19c7df406aa02a096f13586db7d1ff9c127184a8044c0877537aebbea39d0634b297439410c083a53592bea954b49c903ac601e486"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gd/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f43331474f95ef8630e0caf2232ffd2cf42191ce5a15afa1edbd983765a1a6bde830ac499e98ae027936019294e5c0a0af1bba85d7f8efb8c280ec3f7a17f10f"; + sha512 = "e6921535d97564afd58582da56f4c84a6ff77604595107b87a05c5dd771b74c714ef37177fc736ed8f0f0adc4e88f6a045a562f25b9bc793cc9cca8693801739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "efdfaa97dac023f99f2adebc2415a8c499f6588ee2282aa57c11f4fda90a50c77dc99f0f3e69be81ef84a7273fe667a034f9d3568713533eddde0747490e5695"; + sha512 = "8cc6b3736b63afaeafb5af16cbb01388c0397b738e8b63866f70eecded78f9b7267b9ea8c35da5a1279584ae987743f687745821663ee49ee48ab7a16573fcb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gn/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "98d54c94bec9de4ed3f9a017edfcca02b4c7553991c3e1316f111d29ef541cf92e455197064f83201808ce3c81566189b7d8d8c38bac635c8d41b26bd517f42a"; + sha512 = "d65214cebb3cb6e46e4c587a3c682b8b3a97d9d1bef8e7e275a41171c924b032c3ea973013695e64bc07b7d47e3cb0c9d30489d971b9b51d2ef940622205c3ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/gu-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "aea28693b577eba529100044ba78cc23b560339092262d20422da75def30819dccddf7a129f0f4a51dd2a8af4fd8a8568f0da9be0c9ddef9dfb691cd9680a351"; + sha512 = "eab59070ef94f971e261b80ff4187a9fe844ac114622a7daa38a2058f20069530b9cf9f4962d451d7e5091f84c477c61de7932429a010063da0133b03577ef1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/he/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "865ce6baf7d69fa366fa809221b981d28600985f21445f4d6bc3061c3de9c04a49bd33dd7551f73faf9e5631f3990f87e834954f08876783e3b35cfe2296dbf1"; + sha512 = "bb6afd173a994680b925e51b0d608d03b83cc22b313dae11f20fad48d32c8884432c1f063b073f6f57690d8d1387ebb39cec82d4f6a55979256e6312369bcd92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hi-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "eb7b15bb932a59eb588976c07316d0541317993b9c7f328b4ff20380ab8dd08d9195a33b34cdca0102ef1e43f71f91b63886ec876f20ce81da9746e5b097942d"; + sha512 = "b48e08e40b0e8236f9c7c21af4f320c7d52148a3652fb19d054614d331e6971f92bb3470c82fc274e97d8ebe3ddf7f6c724ccbcd56f0a77b62437649b20e2c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "15deedecdb9529a8aafcbba5d1db62ee59eacd70828f9af1466c484e0ddffb90a95321efff3ba16eedd3d342e30a215d70ad869f7c21bb95e99629164c6adf78"; + sha512 = "513dd5bb1fd6df59f9a18427404c0b3cb4cc99bd14de50c84fc70d4429da965851cf693e22f532b1f8e6640e940cb8d43b5a74ffc7d73611cd1e07feb5ddfc6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hsb/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ed1d678797765d3927ab7c059a203ec054355f49f805af367e8dad4b5ab2e969f3834f339b8b181d380900bb5f67aedbb5d5fd760a5622372468a848ef04dd06"; + sha512 = "96da7de5a628fa805015f1572ca3d00c95af1196dad49ce22d7dbb2c3bab4d410c74c2f9626177c7047f36b7d6fbe9b8d02da4cab7019bdc42d418560f5bccf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hu/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d2e4c41799bbdcee19de3c1d8b01998ce025f64987cee56ce6e5382da65a4c2bcdb4699d6c959991fde1e151a76465af2e2ab6d5aae7701c647712ccd5fd4caf"; + sha512 = "7de676d192633882d4bc0ae6508485d610c132eb31cc50a6fc9223c03cee72f9b2e2fccd02212b4278f507085853d883425378a65144d80d7f1a7e350fcff16e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/hy-AM/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1bf60d4c87e8a74013620c06e0d9101f968b73300b3a00a146c7d46ca4c161a05e91255e569ec88bff90828b54a95eba27b9a776cb510fa7b45f7e763b2e5aa4"; + sha512 = "3c24cc9d4c6e2a75031c0d9bd5913ce6a9e18f7ef48ad6a7640701d48f0130a3badffbbb9c10b3aaf16ef5fa4904bf60bd1d01be1e31cc5f21ed04bfcecf7dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ia/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "ae06a4321985fa2c733e49121c936bfdabdbabf31eeb70c03f9c261413613729c28bfa68c39d4a153e3e543348e605ea05efe76c7c0c0d5c3579316a33fe2077"; + sha512 = "0afa6d0da29bc57e90bc322461d69028822e041f2e678388ffa98d5fff41399b2a97007969a6ba6d096e514a8079d1f7370a851b0291101e96947c091c7cbb8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/id/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5039ec6545708bb227e0d0ce3d3220c378ee4522969bbf7d2213bb50de8d1ffbbbb21c169acd9187c7dbb5c398466732889a616afcdb9644b5492cbb139f8180"; + sha512 = "1c28aa0a9efba4eb5110282b1536109087e19055f36ded529f770ba1b99bc626f8684d516ac55f8734df2e60d1df8f982e444ebd95e4ec5733683c85682ff0c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/is/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "254e8b9009ec4573fc49e2725112637e62e9fe5c85861b3f183da39fe20ef8dec8e8c6d3db69f777d0ac587eaecf43e5aad5e76066b36427805bf1c250e12427"; + sha512 = "623f611718eab78bbabac527ae06e1c11535b55fe2d244338b5873e43df843ea187006436df9d75fe8a9c391649ff6b20bf789238bf22db4395ef177031a6269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/it/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "b985e79f40b896ed9544c2a46383286a6b4938363ceb8e58e89afc74f7e35e7c5e6e97abf0582cb6a06a21222b8a6617e3b1a762e71f2ce0bb0bc385bc1a53a1"; + sha512 = "4a199c80ef60ee5907e3188682bbc7f55ed0af606b39db737c92159574807913df9816954a89da7fbf6adbcc6709828cb5d89c5cd017a9a73356d6444a5979ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ja/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "adcd758688288004178f4da7a99511a97f9b71bb8a8721c40b283b50f640e1e0941a7a5e89d5435e3e437a99ab02ad46e0426364637cb28165b5ee953565d11c"; + sha512 = "d284a11142685d5289d1b54e468ebfd25305b3178a3726dcf870628e64b78bece3e1459ab24b050cf6a6b9b0a0ae96b686fb84918d44e117af7a52ca083666f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ka/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9982f01bab9ae08f08faad3e51d3b1f036ae8de41ec3389e6a499d6cd592376844a133a2c847164cfc0044840a5a433115c113b6e9785a6da997172e342c5afd"; + sha512 = "4a22277aadfe945c5e153e97c1eb455be54b8e31525edca42f59d2427732e4ca64019f64e933ba8d2c1dbfc3a5cd624eb925bbf645f3bb204b9f91710355bb80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kab/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0f93718bd714a4d72b74442e7429605ccc2fc7dc92c20b9520eb6348b93944401a1541a311779ed6f745aaf57e2b4093fd73c4c0c2546045c7a16a8235fadaad"; + sha512 = "7d23129ffbace8b59cc9cac660316c93ded2838eec3a4233f21f4643e5395ba823ec60b3ba590b9bf0dab7c818f47da6d78109cd253d5b46ddfeceb68d0e5754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "032ee445d82cb90afcab1d6c0ae694b6c68c6472ee540fefeff397c8ed27d0e06324d7daf56015dbdbbaca6b0ff850868ede9faaeb7c49958175463dd6c40820"; + sha512 = "081ce66ca4a60dd04f37620c60b10716705d8300bd64bafaa42f3f57d1a738730aed5b392f419d1e253c82d44378e0ba949ef4075e98bbd797f234e24df2783a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/km/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "19cc0593436ebc13da5cb8ca9353855c85feb7d7e8eb62b8b0f8afe9abee757ab19eb85ee78df7b1e608629138712a83d8cf794299dd073ecab5c5baeedac7c2"; + sha512 = "c97a3d9324849f44dfa6464d59101f27179831324c5f785251df18d53a0c1cd2eaf208094f92473db5946c1427a4cccba70cf72b97bcbb3235bcb05c77edbd8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/kn/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f111dce7f3f7eaf59358e0ad139449d022aa48131a1237806fcff8fa50181ffd8beed9ead2f1a706a99b34ba579e5251a62291b25bf4a05536208b4f5309e86b"; + sha512 = "219e84746b7fb63952c5719452c531fc0857b6a5cd54bcf05345d36cfafe23fd48e5668b0fc8b73c6090c8f2d8fecc252447dfc6dafdf594997dd3f010e5f38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ko/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "7a66013ad733ddde776adde6a0213c5065545d310862c8e1ac9c30ef488689dbd5897bfdbbe25d33acf598e44bd82ba53ecb5f94d0b343a9308f00011f78370d"; + sha512 = "7a981a23a362030bfff82d0fbf4367f37ff96a7225b394e7a24e041b79551c28f85ec4b0b452143171aad035055137e38c1f0e8f9efc5d9d5d776cec5ca323a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lij/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8740aeec08ed4d69c95e561a072843fb97c95f14c1d1aaa5dca67c7e5e5e126db33b2d81efdd8b6bcdb373efda4fb3db660aa84bf080f017a7aeb57ecbc46d9a"; + sha512 = "770c4ddd5953bf57e725d7848545bc78e7342d8081173cdc70d05017e121154b42ca286ea699cfcf2c1ec53d3edf9a32b82f4881529ea7d238ba9eed6f6c0704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lt/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "140e2978c80a3a54295d7235d90f50935df8820cdea9e90283efe9c6e8f028e401e9c51c9111475d08b96c2b25bc359828d7ff13c8f8e4dbbcc914edbfcd548d"; + sha512 = "a8da67799fcad5accfe3df75fde2ca05c342d96700992a0cb337a36b06d2f267a0c695b657cb8508c4ea6498b78b5c9968c8b44cf3adab0f804b7d8e750fc970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/lv/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4ef8038cfdfa5b94900a7b9d003f66685250dc2d414ed3ac3b107aa4f93ef75e486cd8918bde06f546a259d317be6a1d21a7d7604410e817aca94a8d5c6026bc"; + sha512 = "e050d0feb11302ae87808e6d7ab39f8be08bb725e712935473924382ade0e3a148edeff35f2a27c354cae8705ffcdfc84c453a4c21b09fbc3246eb7ff41831c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mai/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "111e20a61d66f2ae901badc6ca60f57214b0bac6dd6e7d962059eb2c0e0fc136f140546f7def96aa7fb36b8bd870a751edf721b0fac4e8af66bc0fa502b91d0e"; + sha512 = "78b7fcad151c8601484f1d9c9dfda6e4c869e849d9ef997b24aa1563dc162cf8152a79771a9efa4c4277c240810d6a2321f05bee7a7a832b12fc3407e55425ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9104e981c567d62f158de38c9eb5a6dd9608482ffff04f203a5d8992ecaddae3bafd7a626fb6dbd46c877717bd7be6330a33b6b59c81d231686346cfc43c1810"; + sha512 = "05b70933aaab4bf44b0b81d4e98ded64baa32b4cd5094e6f4da3a67fe7a74ebe598d3f038a328094c8337fc2210dba8641500038753de3b174c83ffa77e624d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ml/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4cc80a6160b033b5c1aa85961e2a3a26c0f970bc1cebeca3cd75766e4adb70f88be729ca2b95ce32650eefcf993a95a73b47370324aad26c2d6c15904bdc3bd7"; + sha512 = "db08a385fb68b75bca117ad831c3d007636a46c4c762f3f3d7642fd472ea284c54fcb8537b19a8294efeb562b07ed35fc003463e8b8887126475cd00ffd01994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/mr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2798883732aecc034228fc44023e0bc4877817c1886ed5bf383cdb70bf57499116b4d7c33b2d04f472d545fb4bb58f0bb870d5ea31ee1eaf556803c90833aaa0"; + sha512 = "eadced4d2ca385b7e456a7c1d3fc8714668e4cdbc80cd53c493c81fc9dcec0eb647126c54f191c46128fe7081329621f3db9041ef743cfda10ab63c113df658f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ms/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "214adc95917428fd59df2f92e58eae7dd933ae00100ddfcc7a1bfb0beb943531473de19e95c51d37f42f10003abdd438db61bc5ede062300bd58feb493c90b8f"; + sha512 = "e9221ff1002a8c8c29a3412e74f975f5bb4755d7588ad39164b931c3d4d5b7b4d286ff479fd492c5a406f78e2002ff236b84a4700eb5561e2cbbc0afea6cb4c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/my/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "586747badd496571e1260e194d0028596cf535deb1bc2ccb90abf8e38a3ea1b204caeb78704ff3f09dab01a8c2fce656a170e9c281ff661535b5dd2a73920e11"; + sha512 = "d985004ddff8ef36bb23a57a968fe580ddd258f39177b51dc65ad4cdf0568cb8b07bdc018263aee8bdc1a67cf0a46d7a860ede56c1f483340f63459b72fdd8ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nb-NO/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a9e0c2981212d9086c735a1e26aa8dc8b8ab8336742b0dcb55760141cebc60cd69e08f4140f3fa4dd7dc8e6b215fa9e6b822a8f1c02749d84baf33e8797ee2f0"; + sha512 = "7fda4f7ae66c35c9895ae70a6587cf4caa9502002eeb685a34dc46cd61267a335281dae3ccb79efaa2adc1ed1a7a14c0825aaaf6289a427e5e34b36742b1cff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ne-NP/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b6e5fb0ffdb34eb3e626d83890d447c2948cf9a3f7bacc1d85c25aec2af50cf92c82f09f292c6b48bdd8d181c0855cf0476769d213a5f56b95a00f15a98f65cd"; + sha512 = "e6ab5a32f68b2e322ce628fd4b1b0e0ae16feb4a5cdce8c22f5fa8575884b47b777be366577714315fe89dea7dc6464548621ab356d5c6c38cb0a9c04b770759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "93abbcb8032f4f8a24a02e41542165cc22c897d8dd83ecf60fe8e6dec88037e2c3fe70756fe45394fc8064275c9adad55c66c2dac2fc3ecff18184c4638def0b"; + sha512 = "56d489df90868442e9e5d8c4468ba52e9731a7f7deac8622033c840681d4d2238a3cb40418805bf62b0e8033ff9908f3d63e493372a6f532da0962094e82f7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/nn-NO/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "61e5fb53bd02424e85d9cfff876cb9159d6f2e2ab24c9d8eb80c0a5ea32214eb6d9c0d7206a343ffd959a785050a3d7ef6918ebd6c31c51cc2bd6a8b275a42c2"; + sha512 = "36feedf12fb038ac9f4d55833e0276219b11800f8123adc45372dba2d3682aa3a5322fc344a93707cd5439a0c22bd4a48a97d56140fdb590a9743665b74e4832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/oc/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "8e0dbe72fcdc44af79d4585120c6db0e7c8dff6f5d44a937cdda99d0f846ec9c0cae770f455295c11c3c9e42affdb725839abc8b62399f925761e6e0808c779d"; + sha512 = "0d5107a49a16e547d975ccb4789b86f3977e109b77a6ed082acb8ff173b3c3d87466e6b009793080e180f8fd8d112dff93f8c129a4a6763ab6a6eafd94bf0a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/or/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "be4c49933b81201de3eccccf1976c3ad19eecf4b6296b78ac13636259cb35c94b6788aba2217924ad7249bf5b879c0fb53ae4ee401595a42321582c81e77b305"; + sha512 = "7e780265d04e30d14f7e5af2d51a77e0f50da76a208ae05fb7de581fa6f993bcdf78289df2baefe2f72d2701bc3f2eb69a6a9e390a17129387aecbfa84000cd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pa-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "614e98f7ce0b0fafefd2f78585b6a760591b1c30c97301f9b2021450678b0995fa2436dc9e848d869198b8497eea0f5a061ed1cf6c0ce81c3de30e0c2ee9499a"; + sha512 = "6ea56109bbf046e7d5e4131700a9488d256bd2fb505decbdeadf3691114ebb6848e6db0de0efa23d988f0d552a748187b19b01677aff09c065d0a4e8491d9d33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "05942bdf2a87295506c798b9ef8e1f3afbbc234247385b5b6ae43b03e5e8d0898de100216b838b8e0715c08ec25673bb66fcd0200c86ae4615eb4dda37d60ab2"; + sha512 = "03f7353891d9a3cb9d33bd304f4571b7df975100cf3fb72cc8ee48d619bdda5cd1a36fb5cb4d93ef9385ae6a631296a3f7998b113406946f048b650dd40ccedf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pt-BR/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "16d53681ac12f1fb9061054b4eb4fcd846517e5600b5825909baf6c973078c3372ea96a02dd0a2220ae738326ba7772c85336aa7adec0f195da68bd8c4e881a9"; + sha512 = "87050f10cad58304905934ee2a48a89cf9b1b2d5ddd164fb548098e88594223cb14f2dbe0a637db093b2e9dc36167f06e6449e2b36efa906eef6919a33c93156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/pt-PT/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "fc9c22cdc6c500de25b3d7a8051bdaebeb78b80c24d191e6c5963d244a17f18505edc29f167ff65259e4ff32a9ff267c4f93b312a8cc23fca23f4198f56c9cb8"; + sha512 = "7d2092678130021af4a54ee78623424aafc3046ed2b676513ebd6b32d7ad3bf0dfac4592c1f9dea6beb3145e4593eb3400843596db97f72593815cc5243b7e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/rm/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "054291423e1b2fc39248015601724b121c7dc4caad88a43d1fef95bde779dc7aed53ea19517782dda4e2940a4d7562cdd108b07da97b9ccbf0890a3c6aca522d"; + sha512 = "d8ded668f3deac087d3b5acabb5801388cd832229ab426be5f37251387b59f95a904f4e39967148eb15b799a28e47b38f3b0a51e98a99c93d0342062e2113bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ro/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "a5c6e8a29dfffb1ae942e25bfd697e3863942656e81997023f5f36122a09838cbc5b49a2c63643288360162128e638b12cc8f087ad71ea2c167d8c8b19d3fcb1"; + sha512 = "034b00dd1ceaae395264576e2fdec94ad1d732afcff6bf5c7f94afcdc0014f465375672704b8ee6d77611cdb20b7e3d7b46a658f60caea698c167bff9547a7e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ru/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a1fa36b7b829059e472779ff8b6ada126cd662241a9b94237fcb285b3f84f5ca2766a107ddb2fec1fd10f87383082ae9b016bf1dc0c7df04206607320c124420"; + sha512 = "25f66d9deb094cc730d929b0fa19c4cab12e72c50f381ec58d0f5791770116d3266190653c5c4af11d88e2c61f39fab62b3dc86c90a4ffec05293b5dbe867bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/si/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "00a567b640dffbbcb8cc16070a8466f1915d19b81482ec76bead18aa481b0e9c5ab4822113dd3cd7b27f38e07e260fd49c1e890bc018444728fe35901b0e895b"; + sha512 = "9b5ca67304f8c7280a7ae90cd8a35676d4211ab34ffd510a951e81f40411b37485362997c224441b6074c8f625634ee4f1ff1dd5820564c73ad9f68ca8989a3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b7ff5274e86fb3de19e16eb2239336a6a65f6c74baa516a162a330b44842ce9e674d73d998cfff22b2935a4c72ba60083919d0898664d5ffce8d8fe0ccc16d9b"; + sha512 = "25676759dda907f9ade31c0938419223f6ee4b749d558d8fd370371be42eab18331c492aa35803723b0161246e532c39e6153ce663253692803eb348a9f7ed1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "87b009942bb75273d19bebe713722d21bc0f9d220b386a4bfdd9189f7fecf39a32b4113e788cab9a190b43c6a96187f57fa32d9c34182e99424f4afb03a00302"; + sha512 = "8ea09e6a7dd3ff6ca2dafb4515fe7e2d06a46e5f1e43119c5aa61fb80b7485119214136d1818df34f2b2bd281fcfbd6cedb1737b5b5b7fdb35ef1f9efec5ec10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/son/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "bc2c0014e7c141aac7d45ddbf94fa5b82423959a61a501bf92577bcf880f53a812c99e6fedff7dc5b7b0981bc709bb919d4d628ed4d42d26c7e80f2f5be78af9"; + sha512 = "2cab780d3075504808ea06684e7877219817dcae0be2458ee216fef285b04ede560ce6d40f6f8db3a97e915f39a982bc7f59ad7ac039a88ac8bc03e33786ff7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sq/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8f6e87b9de6706d5315709b4644eeb3aa5985ea0b5822e63f401f2c5b961aec01aa2396b844069e7c5198f2f78af84b2f76bf346be5eaba80712c3b7f187dcf1"; + sha512 = "550a1f32de25da126d4753850cf8cc735c324c94d2027451d194053072c446b3bac4039af6512edb3c953a59fda4f6e748fab793903f19bf960a5ba4f9835acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "348477c7fd28d1cb5e567f6700f10e4deb70421b48a9dcdccd78dabe11cdedc80894128992b073848b697146c09ddc4cc7045e632cb1c2fc40bc92c67c9a314f"; + sha512 = "c6ee03244b37ee44d4e3a66fca407227c534bd7cdd7adb5947258ad25d9e28b4fe4b62e92a8ca2695ec0068483522aece0dad3d86d4ead0f6d78508885e05fc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/sv-SE/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "dcf45d07273b63ac7c2209366db6595204c379b2822b8b9a01c41ac56865bfecf582538f34ae3c25a4253ed22a7b300d18c8b3c90897736bb50c65d403a23b2e"; + sha512 = "c853f3a3a2b90dc1a9bba89d56dda18055a663a233017dbe8d304f10399bdaa3511cb4782c9a3082a931a454611882fb1c7574e925cb261337e2b0e881f6eab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ta/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6f70d677c251ece26f00d34ad241963dd5686b64ce85ee13a2b46232f29afa72a8519105e84b583ebcd297cb76e17dca65e4f7f79a8bbd4accbf4efd2a34720f"; + sha512 = "1389f7fb148a751914d7d7561171f5988a004555572b3a1533af4e6f814aaafbc4bccacc66577c159df7f62b1e23d47c1ce22502c0909e56529b6347890e7bc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/te/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3877da4c91a7ced22828ae4f706ffabab178a4667c61b1a3a771eb2f7fe073b1079edbeb009d1c5039477ecbe29a4e14c501b9cfdf3d8b02052f0d857e8b3e45"; + sha512 = "7d22a8165981960ca325ef12f47e7df350a382b835288063f443584b88bc7f9fbec8d69e8c2237ec37f75f39561f3c441c4abee85368d46880503552920325ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/th/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c3547e34cb5ca350723ab0acae61e683abef0c842c3702602f0867001f02acb6a3aac57595cc0c8e79222336625243aaefcca9b9e2f5550349f934708d489a3a"; + sha512 = "56badba24a1943447580119764ceb9e7c69c0a422be5cfb73a5cface05bb12a93acc75270f91b3e1d85d74f905dccfc468a5be7f34cd98d407e00142aab68b0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/tr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d044e57778f3b4c83c3a952525e092b5d6726598540a0887050e51797564ef50ce1046692e5b3a33a661360235b41da99c6fcf22c546839e3b8cbbf755a87356"; + sha512 = "2fa5cb982d9b29698ce1cc628b1eeb8985a1dd6cc9f27c9a3af1a1dc46219cd00c01d68715c3bfec04f00e20458940d788cac91afa79c2bd902bfe00593bdeb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/uk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d9bb511d55a25325a0406e5ea8541f92122db7a1aa3e9d14349d5e215b55b411c3c88f02b329c53ee930eaa352a5e4e107f97b020c18b2cd71f375ac2ccb63a8"; + sha512 = "d66110d57ea1d346ea93fe5a2dcbcb5eb05de11556759bda99d3f352ee1a753aed199af901b1f26662b0041f7e0ef171bf4842745a6fb86881f949752652af89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/ur/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "49023c5c550a8098dc19b972a13820afc3e9c4f143df0d3d983f99f94adfaeabdd098bbda2577a94f2449eaa9469289beb092afbfdc08a1b4b6cd7c45be09b23"; + sha512 = "4c6a8483dd3f7292063d02b0c29f7e57b688c55c18570bb4f4cc6e7ce23966a9624f4b592559797524fa82186389c20b15923c3ffc800aeff2a6a813acccbe9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/uz/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3e47215ed738f4c00c5d891aea775adb21c1a41ebf8a6fb4f94b2dc801816390cb207b064bd8703b4c006fc6dde8ec4c8057eeb203a56d7fa0478c629cb66489"; + sha512 = "6dbe7fe728ddaa6b7484efb5beeee5bfb3bf93f5029228a3c369c4d0a3529c5ac6c35b86d379d70dda89ead017c1c23ab78fc2aff8750edbdb432e3679dd19d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/vi/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e6ad9cfc80fef308a2365d616b1e2b1949ccee0ecd2bb4cd421a175dab35956146c4e75a7976b9c71e680202811ebddf3af5b99a992185a5c523b90246c41156"; + sha512 = "0f0f1f30820686b77bbdca4f7b093094cf3c0484b83e37c7e891e357550ba4c9ce6bda40f9bd1b533bd74196a51db562fff1d541c5a98605dbfc6d94f479008e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/xh/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "f3db5f03d9849095d8fd96f1737a0bb727b91ee98668b78e5f068aac0468621f26bc686bf69d07cec2b57023ccb2780bd68e62afed196e1668a90532b8480a2c"; + sha512 = "c630381b05128e2061cde6693a3e3f2cf668046ef2a47c3da4a7b75463a2ace4c38ef76c0b5c8b2487bc8005afa0134648f81afcf63baaa118715e36c6c0882d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/zh-CN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a562075894b5f1717105e5816ca3901344266e96fb2a0d7957c7dd846bd3315689eb1549ed6604f05708c8feca48740fde1efb6b4553330b1da809ee49cf79c4"; + sha512 = "a8290a1278d8a51c04bf4f48bd8234c7245375fa15041e604fc323702759beea2332723736ff14caddaf682bd17dbd04ee31566f8dfb9a1073918d04b0bbf049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-x86_64/zh-TW/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "efdefe8171624596f027e1daea7f4872b5faa6247064fb97fb81451c213a021002f32be707d4f92661f5bf9e73dd7190fc0745ec8b6984198549bdcd048d6508"; + sha512 = "e064f158e421739a83469aaadf71ad847ae001e6cedcfd36b98504f09d7d3afa484e00311ebf6dfe7a67f52fec344d51f71f2af6e1e0e5d480d978ccb82710f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ach/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "443d44cb68f0dffae2e74dc07b583a6edb33499bad2648d134b8205ff96afc395ea433ca1007e832ffff1f2ab9b35ed4cbe7f81d84b9269fce6af06713a4cd90"; + sha512 = "271a22cb04ca96858a95da435467517d6f4dd91ba5b88def8deef55c29d50b2c4af6c0f5e7d57b52e129ced1c53b3227d599373f670abb29d91215d63baa6b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/af/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "03f9b49f091f25a3f588b388d4ae93786bcc98e015d869829761b50e52b1c13fd0d8cdbacac72763b589fbcde13f563cd84ac661408b80bad1212862393a6430"; + sha512 = "b78b3b4059577b571186c16f0188df75208cf5fc7fc6a33e3c61319acc50c6873f3b4a02708000dea98a164ba904310be7255ff7a242bda70b8326773ddad724"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/an/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0b3412d5fa232a32429e75d0b165956b73712abdadab3a04159a8b412f5c40a748d93e2b8494fece5012cc6a020dd2a1c8436f986112eebfbbfa07e0c8f02032"; + sha512 = "ec31aeff559cbf0794eebcb52ec5a325b5c652a64b8778d9627028ebfd663095999b86e7be3dc195ce2f3f4ab6938cfb6e3c35a89912a81fa5d7a1455988629e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ar/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ef93aee847557e02aa8f630364b80451787fc758e06ed6226d9703c63f9d117e92ab6ec697fe48084e1f7fb50896378f88562049131fc32ca456765aa3890145"; + sha512 = "046602d76a6f5d101e92faae3570d8614468e2a2ca2c89f1e4e7caf9e80cacc121e759d20799757535b474b667d72eb4f2a6c7e36e358d0d87a34371d1a94265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/as/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "272958c4f4069ad22836fd15e4ff663e8740b90f34ed816aafb10b2f5da039fc4da7faee1c2ba6e8a6b2de19d19274aea2ff8d495b808bfd1a98684b6edb2f24"; + sha512 = "83e73c16d60d17d1ccb56e0ca5887ee56f4acd2dfe156b6d97c7a5be7872e568f55edc822fb39b89c82161a3259e064429ebc8e41b9b429304cfc5bb0f8a901b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ast/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7f48fd4d4da18e6a1cbda39f73d97adf6544ec7a11bacd9b2d433dd526becaa157a70db033531951bc771ffa30c15c9f501bcf80a0ad6a54364c6b919986879e"; + sha512 = "4a26a368fe393cfcca1284de3fa2be1658b0eb79659d8bc2e002f01698198e750d5c82504893f1f98f44c021c1dadebd5b47711681f0466fcedf53522431e27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/az/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "554da22b2703c8eefd3c3e8ccff156ff5c2d7f33e7e508b36908e25b5a289157d09a204c84f88312d845e42969ccd874baef7afd08a6f36c9e4e01e4f2c3be7f"; + sha512 = "8db5c25d53c250521a9188a2988b695ae49361e09ecc7f74de9fb1697b4ac5e3cb5eeef9c46c055ce24c5c4bff12f2296106a706125cc921552adf5b2fe6107f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/be/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1b0e39d81b3ced1bedc1e3472504aaf71f2cbbedabe5bd1a6f894a10f94c9941c7452447ba4f1a969de5236a33bed82abc0434d9fbc37c17467887b12c680cc4"; + sha512 = "608202a789ea95dce05fbdc1d0f1b8f56e60614d8dcdea3c7513ab5adfb621f20251d7117d5f39ffdf066b52e9ee67b80e1d04ff2155167ea8f2e155852db4d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bg/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4318f2a10487d87de120b49dc01be19dff208c3f3a88897e50ef1fba5a96da038973d2df837881eb54b2cad13a1b68beced5f6a426ff304493192876fab2ae9f"; + sha512 = "65fd1ef12cb801de951c3c3bc81182d233b1f3d1ff97aeefa7d5ab872b605525df289cc6fbac694b3b5eff0ff4094083619e450dc2553ec690579ed32dc667fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bn-BD/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "61743f94bd59c57ff979fffad91e7d0762d7732cda4cd55d861ca52363bf306f818229a69165a0398a2b2e9ce8a70c22112673779233a88e8109b61f2d27160e"; + sha512 = "6df5ef5621d819a92deac01075a8c664ac505b574724d5d992fd62a9d73ffddf938a716a4c21278252cfa95346fe14774913a3874c94373564ee31c478245802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bn-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "75ad4d61195d148939681038baf3d9922fafa2d8204b72ff7cbf9017b332b3fc8028e8615edd711ad5b1f58b1e8fb9825ea69d772ff1a0c35910c86d35cd0fce"; + sha512 = "dde950d6884b8155e551d2d627614e13816ee4f09aeafab360ca41110b903e03bfedebe09d29030020971b6bba80c5d527771dc8e6043bd2a9335990d3f2da71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/br/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "54b7f2aad80e0e0278fa541118ac60df4e129c063a5c28563391f11a8fa5ae0ba51a63d97cebfd4226e47e6f623748f6e6961b5e2e4cd721fffcdeba296b4835"; + sha512 = "d20a97959b98490f432a5f2689bde17c3f999ccf1975a2fdcf0e71491d502f54c29e4c6c18047fa39c91af2fde12131a49121c0086f655dffcff56161f40f580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/bs/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "04444859798d31fe2c713357c963c46802d42ade7d66cf80893b6b39917b2625f78d5599e3f97a24d9269b2b4e5a90f82d1fb645633e804062a58eb4b79f6bae"; + sha512 = "470a2d45aa2837e8b19ab6919d61bfed48c0832a2b87c06e78781630a5b0aa1d03d21ca85ab6b144fb624003d5da4a22a7318baedf386f9827b11a6caa939238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ca/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0f62333715524c65cdee1ccc1da4c345953cf14449143206b64ab5bab98e635b94c23645c40bb4865ba9c9585731aef45cdb1bcc6d3d268667417cc86c366c91"; + sha512 = "bf889704dfc771ee9928cc08d48ae436cb9c97733ec7b59cfd1154df591595fdcad0a6f15ea8e9be716b9853cb6ae5540e176013cc19878844beefafa9940005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cak/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "867a1ee75564bffa889f0ef10974459f6dacb07cd6ecadb622a129f846f0987d8cf16e47a9010d73260cc2525f141cb96dac52a498797f1da3bc9f6d7624a4bf"; + sha512 = "118e07bcc7ba57aa745df1e334a87f8883cb76ae37f9e77d255465600f30655f69187182ef6863719ccae4f925bc2e2d240e62fb3d2b992465e94976a8be1a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cs/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ca44584f699432276a7d8aa578d0c4c76a8cfd046e82f053f62f194681829382e2695f8a1b851de2fc9482969e7975dcf05dea58c92bf505b1fc71c57c7b6360"; + sha512 = "b263022f277c7b2a35750a96a008df603f6ecf1665940346edc615574693c9f56b513ea4c26e8da4763e93ecb4a594962c8ae25a475f18d9abacc2d3d11ad657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/cy/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a68a618fd33012596ad5c511c6b7ce3a218599b60c55ff8efd4d5cdcb8962efe4fda0366e6b0e8c9b44d71954184a334b6baee6896d0d7cb0960a08d41ad14b4"; + sha512 = "245e370141a599c0c4af1b2d6ed9eb5612f1b9691825ac941be5e17c353850255c99831e234d1b40bed9c9094fa1f42b9fb6f6e21b716d78eaf90de9b8a5b8cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/da/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d69efae3267554ffeb065f012acf7e63beb584ca17070b80d6fb91a2767b03cda4b86d1291a2c2211d7e7ecb867e316a52e7c17e841c1fcf2e0757571ad4df6f"; + sha512 = "454ebab2a21489dd12a4329689845592cc098da18b691dfa31761cf8abbad7008b4d64efa3f61e67af82b36d240880d5d72208322d380dc68b27172cfa03b76e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/de/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0cf2675d8fb544cd896b21e0dfe211b22c43bd418a9f51bf2c63be8d29aebf9220b852465d18af009e48b5ef8f08ec7b14e53a650562f1c24e2e08b045daf792"; + sha512 = "9f906a6c635da37a791803b418a2fe38f36993704eab43cdd2540593a14a07c998574e425c08a62952649401c9547fe92a842be28c65e2a7ab2b8429d2af8622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/dsb/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a0fdefea46c4339720c1cbeadde59359b8cdb07093061daa9527c98d41d972bc4d16a5882ef57322f4ceed46528c7b62820440541c2d2b96d93dc24a070e4cf9"; + sha512 = "2e1ddd0b46fb7a2d91998642044a10b17b683ac0a05f61ef7f0f27bf52a273baccfa4eaecaa2aff217ef0c857c02aae7769c85851686afcb74ad599b1014f830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/el/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1cedb34a76f1a6f98f62569784534f642de01997dc8507bf83ae3ddc5e195ee02d4848cc7d9605dad7681413373fe52811d610e917cf995c5d80ee883df58021"; + sha512 = "6c9de4b2302239bbc05ffd8d9738b0154abfab423a266ee93aa15cea56e2af3f920b97ea7c95cf0647315476b3764abd4c08937c4ec273b37dba3b6b3f0afa04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-CA/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "44504283554c88cfd80b8a662e795e0405fbe1c0fc009f2ed4da5f036ccb40abfc9f5769de658e9c89d6c8a89a5adaec53541f50c3ea1018ecd5cabba43c8b17"; + sha512 = "9074137c1e0c5af2a3627e0a2805f31b6ff1bdb698a53fd1da962ab8e7888b7fac727a9677f3307e8b9b5e6fdf9736c93ad4c40b73d3f4ff45942711babec0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-GB/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "40d2985c60333d6d95cba75efd0ca20bfc9e9c81434df050db08e6934f31a9d141eb63a1417b3ce2f9b01d71c5a299126fd7d95c34e64edd83dbe9d853c05b50"; + sha512 = "d1a17fdff00548d05ab173e6d99630f6f20c1fbcca110008c5e4e3b298e2ad44b382cdaa36f6abf86e204e61d54e36b3a02e60853347b1f014d336bdb5e1308f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-US/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "083aff8bc27d00ebb3331f81f14429bf105cb16d4ac9464d9e275e7ffcf5983c7144a7f9001e6f766c668f79a9d80fd147455cb55099c87c92a4b2ed3807d1f5"; + sha512 = "00a92d18c4e50fa8d48c066a59556406e65def72b8c26394feee0968de1e1a4748f4b94575ed55a2e35d8fe364d2e25915e91295f6ae7338b02616dd3f8eda5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/en-ZA/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "cef07a63302a00869837d3e526f7cc5b6518f2ea49932cd66e788912bc8e71460cef265b73c3fff64ae35c5eeb9585323f605679b816d817e4569fd1b6073772"; + sha512 = "da78af0e19a7a7a5785e5b38cc2958b9e67eb671b1e922cb263c536829b15b8f28d80ede618079cefa13c37a000d383f84a1bf7953e2d7e1e8324d3bf91ccbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/eo/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "37c35c893cdcdc2dda103ebcd4bceca4097a999070ec3db76288b00080f71e4b39c6914760bf42f1ded50c193e56261ad1563c2a5c006c66703b7c3065190394"; + sha512 = "8d6c2d4c11796c7fd0ac56ccdf5afe8c88c41a758912e3690fe904553d10eb7604ce248dbe24210a8a8eda9fd5a36e22a03627830173043f374a2e9a6fa0f645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-AR/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e2975c93edd8fbe942ac4072514fd786446d1c1e4dac39c3cc7222377006acfd6e037763018b81c428b80290da0d7c685620719cb40e85e6941a4e759574068d"; + sha512 = "a321ee7dd610d9dd19173cd6616b101bb499fcaed35097dd690a0f18d45fe9afe353cacad5d896d2aa33c1b3bdf6143c452c1dbaa03b84a5a223fb024952b439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-CL/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5aadba2d88bcbad41750cce4ca43d1cd9ced8177c4bb86ef7c85302cde7ae5900cc5c015b11889e80011c0a9ffac839f9d68859ba298d88ed4117e62645992ca"; + sha512 = "0c4a4f2de3b2889a9d506d4b31d7fdc4e3192dda6aa4822bb2a0fc6dc3cf89c8f394e08b53b58d634bbe233b5918466c2ffc9e57ee7541c25c17ef54122db002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-ES/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a8a68383ddcccb81123228a60006a59e3ab260c53508a44d0360c56bd1bf28ae920893d5c3c8886ab2d223a7cb92f98d4e19e6eb17d75d2e1de2bb6e4090d082"; + sha512 = "6185cc8ec39fef52c3bf8fac4cd3c7c187ee2f0bf20d65bbb3f4b2dc8160b93f2a25bf83136e503dfe4f4065454fa9b6768b9c3593b86d2f918016614a02b4fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/es-MX/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "0324d91ebbfad06b5c9a51d8d4a4b0312d28b52d180c463bbdb2ccd282983d5734a9299a0e6ac4e6b7688dba24c623c0c61600609c0846b60a0edb340393daf6"; + sha512 = "29e5a9b9255c55e117f2b339598c3ce15a3b427bf6ec48718bebf4ed193c4f8a34211c09b9ee7844dab2c99b88c12dc50b8616503740f92233fc98f1939d84e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/et/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a2a21987984ea4883cb514aed741d95fc0fd612ad00d137353d5576da0f3741eff7e280f520613f9ddad0dd573e9c7b91ad5394030ca4ff8a6f9209fa607234b"; + sha512 = "7f144aac2c68cb72091f02098768dd71f524d19060eea709a66d72272b27c4b4ebd56a072cac756af5d1390a3076fa508a53de84ab1a190a77e64ffd6ac6ff03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/eu/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "20a4902349677d58f9ebe2b3c8ffd356a11e5cf6cb7cf3a7389a77e1da1c2697963c6d77c3c2724b0946665b02166b5741f9a48372c6dd687028751ab3f87116"; + sha512 = "c7407d212b3d1ff7418177a75c603c178df0301b9e6f16c2fe4d4c46917588adbcbee3f8a20cc13824e1ee0afe67e8458c094c37e678a5502361753329d7180d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fa/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "53a61213b2c6e652804ceb53b810421635e9cd392e8b3150389a067045275d2affb827732bf6717e32414cae76cb1eac360291d5863b785a31fe5a14701fb73f"; + sha512 = "848d5b90bc56a40b6aa882975de57691fa665eec67b9c7bbeb11b1cf343e9c693a17d6c50c196cd2fb867f258512f427d74a68a946b27295339227ce5649495c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ff/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "4427caa3218b20dc0ef5ea349f40c41606e6cd57b536b0a48dc590e8a2e48c6516a2e5fb930745aa28a17bf835107f65a8a0e586b401d5b717199ef8cbecd387"; + sha512 = "e9f66b81fadc716ac742aa81676d25d1de71e8796e11c8d459f9c49ca49b556223d5991dda8e5252dd6b5136e3afc7337fb9be07ffcf7a30891f61528c230948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fi/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "08cfd6ad90c88e5daf264241c9c40f89930d0c7e84a8c33e8333741ebb139e681b3d7b3ddde972aa0ce325a686bb75b56e524a0259ea9ae696a926f052dff84f"; + sha512 = "67651c2029648c761027d2155293275258c2a81176708671b35be49a3879444c1289186cb2e13c505c9aa4371f009dfdf0c367bdaf82d99540f7541a451f05f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "50b63fcd9a60a32964769d766927b913b0b5c3812ebe88738aa2d0420b448d5aefdc374a1b030c230644ac2e89faddbfba1b50006eb277c109ed36c81ac436c6"; + sha512 = "a8943228def1900fee1baeb8434205046ceddf22699e99290e77d40d3e0f21a45b278a9cbc9fa3a7d02fc9a9ca6762f148ce3960acd656f4f6680cd76c8fe9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/fy-NL/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "616b766e2c3e564dbd0e4eeab9544be322aca47de9ba44444dbed96274c291e6bcb155a2be11aa2d6b43a296422ce84ea5143425b174b73283870eb2b78e3c55"; + sha512 = "8d4208e45fb408dc948f4200d78066b1dcf43baaf990eb9a8ca6e628bc068fad715c989b2bfa607c3ab63186b0c4400b551393a6ab89d8713fc4ed1c4946499e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ga-IE/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a00b961fb0d3f832209d5c33147102907599abae9c10b5062c038863f2162b5d93fe48b918e958890a273c9a449bd223e22d7adabe2c60a092246d6fda150e59"; + sha512 = "4fbf13a8dfbdde64c75feb1120e5b6f5f684cac77fc1b157151c11d51570e338409ac98f528fa2c40f7b855bb41e549c3d83f38212cefcfd107b8367b94945db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gd/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "cf8bb3ab406e4893a3f7f09789c95b51d1e7d745dc5fbf30e809827340ae056b6bbcf5c6c8e224a7492001ea182ad6354ca0702a81496a3b543531dca92d2ba8"; + sha512 = "3a2fb18eb6ec63a4dfa4403865f3b5e67c0e82916cb2662f7c1ab69c4158770fdf4100763b65ea452d5dbbbedf84a559173e9cfc521099cec25e0828c3511387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "77e143d6ce058654b9e4a92bf1a1d9dffd37339d85733d5785885ce51d32328f525140f9a9409f6f1532146514715fe0fbc750077a384f9156ca07e994864530"; + sha512 = "99783449e169d18056cec7e8ce94c1101bfa21418c9dd4f395c3f17c644b5b7fc5314c2ccd99e4c4f2aaa769b1923884179d33e44e16601649ded26cb4ba4df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gn/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "baf483e6285268c50d07b75ee358cddabf2ac99a502fe5c8524e71ff5ce1e9982df0ff641877ca54a8074c39ff7e964ce0d82dd7970fbc674994806abe23cc3b"; + sha512 = "82d626303ff7197a0c5f3f64d58263ab131003048f9e0336e0ac12097d802543b70c6cd3a68ef4b263f49c6f1f581c6738ee41476c5b6fe2f46851587022af18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/gu-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "771bc1ddedd8147b3e2cabbf0bade2f241542886533661e3a006c86cbeb922517a1a417ae80d31710461c8b4e5899b2e745eb1fa3fdaa69e32f498a9b5ac848d"; + sha512 = "3584620f077dd6bd063fb9cf70d54bd46917c0e6409925cf5c028203033481c23e2cd81f0a435309213f7b9368039eb98590ec5fa3087a26ba54d9f6bd7645b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/he/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e52d6a321d1fb8e39ab376cbfb8d0e75e820ec543950a4d21e3b01b3a5fd33e1f5e017d002c608b3f19edb50cbad8c949b50121b29b70d3557a6ae5d0c4bb96f"; + sha512 = "6c5b10ce4c4345c6cc4e831c64ead828a3231de9e9306b9bd85376d66259f09c8f965cdd4a88dbc01a71e48a4aba8bfbea95a48343cbd8caae3ccec142177f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hi-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "fa37e7332b45f518b9d1ca8287da80a6b558788f97f256539e21b83c09a6569344eeb3ec9e766b0fee7ee33a91247ff59ae639b83f3713f110c2ac993dadb7f9"; + sha512 = "0deb1d107cca4b0bec7e37b6a1d0e80fb8fca8e92dca558e66f99ceb9ab8cb65c72a28c4f614213ab8a3a84288ae5dca606fe0993ea321ece72f5bd1b1613990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "fe56b9438ce09381cbb4865e8bfe051ac0397414f15f0da7374de8d82a1f6f0bc13d8152d8d3543674bf01b1d6fd948981c6e95c19f84cfab94f33f482be7124"; + sha512 = "1be2bb454b6d8316a3a80086d512e5a8f75fb30c52384914e70e78cd886999217883fa3d83dc184faad1842fc141c19c79ca6b73a66d57817526f55d2453043d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hsb/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "24565e1079f23217165c5dbcb9c30d4317b9a5e8d71f9956a22d643326229f519ef93b7d1c2e676a94f95f7c80df133d73d6b6d527adefe371f89767563c9aaa"; + sha512 = "ff9e7a2e0b106971aa769d508ef1b5835860e633f6ea01304274c6300873fb8b6038e94818ba7ab0f5014a6ca31fa9642f7b03f276f6d7e85ef9d2df5f87e2d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hu/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "67e13a7752d7f9078ac1827e93bbcfe2175bc328b3e45cfd30acdc153d73d1acd18fc318ef6cbebdf12b9c4f482df89f5b6d88ac3144f2ad2128e9f0224783ac"; + sha512 = "50f75ca5877d2ddf03b4f73c82802fa159485456867d93b72434d8f7a706a6e5e728775df1a251aa535ce8b24657ac703d8f543f688ebe84b8a9461dc2486c0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/hy-AM/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d9ee9e6ace7d15c619e5e25ed443c0da9cd338a2ae255c85bcf31f990c92a26e3b447c21b510efcbdaabf3604877166c0c67d86c336704990a8b6cbc10b999af"; + sha512 = "4b768e33d3886c2ea63f1e922d76c8529398e191b746b32fc7709c17b33384d74d2107914ae13b7d0a7a3faf8d9a5f46bca1b81083b4cd380168d233adee6341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ia/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3f2b35311ad2fe946c6b761f73f2e4c4004a0ecadaefd6888a83d6ed16d79e1a1bf069c15cdecfc9b7207b49b0247f1567d640d73eea445ab0b6c7153ec6d315"; + sha512 = "caae0378d08e36e5973605dbb4f6ee126b70706b3b2fa43b2d12805591f66204aed8cc8c183fa7966f17cda0ae1b5c978be95c5fa8d319cfbffeeaa7121971f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/id/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "86c35a9637ef56b7b3e848f455b40b0d857a18c32298c7260f69716bf7ec4270ec00690f5f23ed3baa61eecd0422f23500de48ee81764a893db84fd123733433"; + sha512 = "5aef71014347a6c28493b2cce5592b8c720b458bc5ba6ef183bb6c4f42653d3a9354f6f1f694892db8985279d93b3957e32bdc3f18a25a8797524a539acedeb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/is/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4c8731b2fe7206efc1ab6717805bccbb50dd528abe0ef7d60921066985f30ff1dcd4c370e5f2513e9e5ada2df13f7bcb127bfc893ccbcb671268af3d13691d65"; + sha512 = "0eb2ec000c0c3627362060caaa33b5f067ab6ed534bffc0f0deb96b9a324c9e6a53447bb1e59743dd7ec6cd5218ceb92f936c1e5db009c1209847b7ddea38b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/it/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0da9b1924421e704fcc0ec768e82acf743f6c444122c24bd48f633d0694e017b54814d776dc42593267c967f3825c2f4dbcfcb209660d3df27f9dd405c850e49"; + sha512 = "c8a145b36c217b230a075f30f2d94f50091937ff07c987ec128110d591c59c2fc5d5516bac340f2be43c520d3fb64b80a555796535b16843abeb5d61de236197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ja/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5bbfc6a34dc66f685060358aba485b1dbfd0b6f5f25bef8239c500d00990a66aa8db9e67d3652ab84441da4aa0f8417d5b6c61a305afd9dd8dfe199735bc51c5"; + sha512 = "8487ac967f4f09c37a03456013aa1d53e3a1011382b3e18ddeeb185c4239c02a7e64d7f7179de787032e9a97bc7d0ffe1ecbeb9f76185be275118deb6056141d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ka/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "68b484fa06079cc723327771251000e6096c2bc8e323aee3a8cf10c3991b803afdc8dc7d12e282eb9635fb1a81e90b5fe777b592d7865a525b78ee845e6b0174"; + sha512 = "4e9bb5e5aa4caa8e8d5c12cd83049b101fc37b22ed1058b19670ca49f8760f15be2b15c3bc606dd5d0e30ad7cf8d7a6108e1a8fab613f3a338f5589defa03714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kab/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f8bbc287251129c314d459750b28cd6287582e48f8fe6fce0fa5bd55ede6ede9ca9312e04e44ce973535f750a8989675993115f796de67b2fae8416d0252cd15"; + sha512 = "e680aa334d2dbc9dbfd28a69029c175c2a7b046a61cebbc8c06258c465e0220eea4eb55c587b3c9735b0fb4c1744bd6347c222fb4e5502247f1daa6660eef835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0b45fd12636de2709e45419348e18ff38b69a54be9f7fae8590e6468ebaa2608c0c493432ea639b0c7417ffc44cb6354314b0b89642f7f97705d063f9934a6f5"; + sha512 = "35618733fd9e5d8c330b3e9a2117ac37ab802dc4ee1a3386e03d3b359d2fa60bd6dd5fcf676946d455991b2b52ea2ec8664a0056d8ac34550bc88325d8f6f112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/km/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "a3f2f417b1f00e5def74ef2851a96e75db1d71952c74b3715646210720da7cd5a182ba9c25fdbc36f82ecc197ed598116d91a004e5946184c02108e2d33708d3"; + sha512 = "c2c6dbd6bbe31b1ec4c89a569554e91d07d125464f621a68f20ac365e5eca3ca303d646279f984cd23df8f4942b3925deab875b66dfc10308cdb72178adad9d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/kn/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "bdeb06aa7a025117f8f8dad65db32b42fae8b2d221354cf72c3e04eb54cf94ceec0954679e93847aeee5da01431f76b52f8eb6a7ab9e5c3d232b69c5b17f0605"; + sha512 = "642c4177f958191344d408caec1e98334c399ebc6fade05c8bdc23e1c3e3d28868bface838e5d561610b3344f23bb406c530b178d72f20fc8931267486364688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ko/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "ddc3f9091d9e01f81eb0c8a07f125c7f757f2110efca5eba5967dff550211bf81e8e89153ae4b8e76d53c4187b25791e580cf0845788c55c1b65242a80712fe4"; + sha512 = "3452fa50bc137f3589a6d310764bb970abe1b89f22426dac286fa136335ef9db490cf31a07bade071b70a32f38a2a648e7ef33969d2c01e96bbe6b8418c14eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lij/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7ea1e6cd38910148e6e2593d975bceaadeb3a2c6fe66ba9199bbeac5be7fc4943213fc81077970e81df1fb8ca7168becb3e77c56bfe51ce38aa17a02237af8d0"; + sha512 = "17a14ddf9892b66172ddb8e234c816819dc8245d8ce6d30b323665682b873c3f416fc55fef1479ad7e0451cd38c3b541a72cb19eed2c0492a55638e9ac5d4d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lt/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "a8dcfa87273f1330e5321dbff06fcf82f6a4164f7b0c2ff9926b211d1b151a9991be1f0904d587b7755583db457299c67d81417af75bce7b1e1056508b652e47"; + sha512 = "6bee86baf4eb30f1fc6bbbb10e0c1cd21ddb4a669d1d831d482c80992bb2da546f7452bc512682113f32b9def605f96fbe6c0957141c852cd7f1a910e49ae42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/lv/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f4c7d14014d0c4d9f22f90d0bd01c2bf720a36e5f19463f57c7f6f76693e45e06297613fc1486ebea2637637bc0ce50ceba2ba88cd2f1f77aff3c25155363986"; + sha512 = "64c0dcf94618036e2c0150844bbfd510a31c1cfd179889b85ca1ce942fcd556bda11cf72efbb6f24fa3e0d7e295c11e0cf164cba9d0bb5adb7cb65068c47b3a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mai/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "06b5c4c32654e88b3b6c1c67708142453cb0da9e85ce287f11a693f88577d7f614b56204437ea0ac4811fc4145d36ab78822bc3b9d72c3d71551ab75d6860db0"; + sha512 = "dc4ec60fbc00336186a2357be9e650917130bac11ff9df1ed73af13175461da809934ee4a4612e492e8cc8394e735724b81f3bcf109a4fc1fbbf3b223598e410"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f6ba1d2dcfc7f2b0a4f70c6f86b8ffc1a3becec61cf17780c52bfe03350b0f1cdbaa48bea7a1fc5f0ca58353c8f57386472d34b04257e8bd2131383df7855006"; + sha512 = "8c62b755509f18f33ec7731857438423447dd9f007aa5f5ba6bad5cffc58cda7735b3d1639c6df00508c2779884f3f0686628446d3f4b10e7969f54fb76d9fec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ml/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c40d68315d5c6118f2c0a61cad7118427186e558aa8cf9a89443f73d4ac012598988a87a03547e366142eb0d7a8ee776e965a07efdc2d44611c51dc9cba5469e"; + sha512 = "7e48d922c9755e8fe862338d84b074b9931a7a35a105f533a480462fcc7280788bba228a4fb8cf75460ec5a61eaabc933e22da04828e61ceb1e1b0c90c3412cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/mr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "603980ce2bc2e3b13019e2de439136479b3b650a76d0cec91f8699fedf8651fa3e872662160d19d022bd90597e59982f0f0ad2ba4cf0a738bf5292b15c4c22a0"; + sha512 = "452f4ba95e03507645b0ea472c7987fd14cf0a5d33a9f52d7c460b3b76f1e58144baa53eea78d646e79cdc2e1db31ffadf686bacb7c1f4a015a8cb191cbd8ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ms/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "62698a95379733edd5f63abe8e9f110d5bb853272d0b8bd4b40228251a8055464520a9e1b13975dddae88a624edf8dab2a9c751ac3f5fab4df4bdd30064a2fe7"; + sha512 = "b87c136c5f4e7ccac6a0fa3e872720c0eb13b58b79062937f7674ea51dbb004e26467d3d4fe156590016dc52be4d3e01d538f157904c5ad519ae2e3a3ffdbf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/my/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1bde440109a874ea1eb9ea7db01bce2338f810985fc5b5d059c8f558f9ee1fb2bdbdeee2dbd7fe7b788e31895ecd9c32c036d1ab9dabcce850ce49abf9f7da53"; + sha512 = "2cef4dc9d62471cea29c53b4caa85efb211b429d078ede6477d6d98fd2a3d66707a76f1f2521591483a6aeb95f5f9c394f0079bd3668d80e702cebb0b6633165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nb-NO/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7196b732947ccd0e94022f6687a885d5af1c1613b605fec82bcf97eaf8cfdd170f22963ca446277d884eada376e3ff0f4e79da9effc712547fef56adefaee62a"; + sha512 = "1086de072f1b5c4a57e5235040237cc291e026ce0d553236ee7cc72e5c5f99b2e9183d5971a8d407a469dbc33a21960d33a6af7aa6dcad72fd748c7ea3185faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ne-NP/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "27220f803c33302a9b8636a77324934e94cd2ae395c43bea25cecd977966d2198be99ca5d9f9714109e00349bc66de6391d7b7aa1649d2e0530d8d4f3726718c"; + sha512 = "e62081f7eb6a5c66e55555cc9eea2457759c4644522ec8e2a0303d9e45c2777b82262021dc4c21a65c5f65ebe09e2dd34d62fb8e2bccee2729c0bac7028c388a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c46f47170d990d7711d7cfa7d3f7b7d03a1dce021a8c7d20dad1f36db5af7f0d5071eb33689bc7f55b89074d11963190f31abf26387fc4bcaa28a6e3403c88bc"; + sha512 = "a5935a6a66a753403d4ec1b730f94eb1ec13d4813b264758de5c44d6a0fe265bfad7986266814a7eed6f7a4b6787eccfbdcd71610bd7aa2222073274559a8c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/nn-NO/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4769f386b959ec8229d3d6574fc93327d90be06129ae433906fa1d36af7dd03d3d5288ec81af3097a7eefdd8bc7574d035e279b6e4c923415038fb8e6ee779be"; + sha512 = "b79ba80b5003e54ee3cf417df07e76c02112f7aed1b0753d953caaf7901c7c3a957447c04d7475f285de4c39b05be721a03035f66401603ee5eefefe37808f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/oc/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d44203376cc4e58f7cd5241d7e14e970dccf0465b9b156e5004dbdf56440b7e5b713a45a15d8a5d0100acffebc804fdfd1fb45a61439b7e7f9b0c17f8f413d1e"; + sha512 = "09b331ee720958b41031a27389cd8704d2b44c81613b82f1c58625bc4fda9eeef1a64781832fc641e5f79ecc69b656bc612dbd1341c479f6a64bcd068e3e641f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/or/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "6e4b49731a4fe471af22734ce48e67751d7ff5999db8e55b74d5e18d176d7e8d354b150897b6863e2913703d5d43211fc90e48c986f57112622f5ef820182cd5"; + sha512 = "fd0cb812d1fb81b70c83cd923fe4b92b48d166e799ec1fbace03a0a75358b75b673b5d66deb21eaffa987ec469ba0fcc7b8c945aeeff9d9784fb7697faacbea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pa-IN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "09ecc51e3cd84c20dca84ddbabc89ee98201d2de3630ee3b07f1a03838624a2392023ac0912566d9e1d3422f3c641698485cccc0310519643dbb067742b9b739"; + sha512 = "afea185808ee794b1abaf8c90f90eb5d86f590ed4e90e20790f5cf917f7702292b076cd5017a0dd9095fa2e4a87479a27193e80b047020e77fbbad1dbd2769a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "818b35596e13654b8705af0fc731e0219e304b34693e48006c508e5e516e3a7b0d89db32b514d51a04bec569e88ea86b1239edcf304bd99bed34811a0fe33473"; + sha512 = "3a4ba58b7824409b3a8b2630004e3527287f070e0f857408131806916bc15c3aba8d258ea750cdd50ce4d96bba4c312186da9f619682405d4e002fa63c84bd2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pt-BR/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "047eb09354fa50676378c7e3082dadbcc71088c0d25398e1e6bb25f0d44fe26b9aa025b222970e9bb33d9fb0f48f60639c28024c95ae47624389d311f62753ce"; + sha512 = "00db0624f796877ff4f526ace01adc152bba631b95d7a050d7306ec6aa69fdc271d9b6a66cc54ff3336790ceb27cbd4667539e03379a097d44ea68b2ca737a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/pt-PT/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0674dd63e12bbc5169817557d1fa9ada97d1202cbd97b8fb36595f234adb2716b6f79c6b7cc1aaa48e9513e8c6fab042852483fb3222ec868a655d43c5315d81"; + sha512 = "8468856aa469076b8f325cc1e6cc56027bee6f9f6e66cf5c443396da2e88fc7858332f0c2cddb7ed5ac62830f2e2760ee9181ff5ea74143574262b5db98992ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/rm/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "18ba376b1e1edfe731428d486f9789fdfc0a2fc7fffdc0717431ee3ed60f737e3166309aa9c28f7ceb321a7410ea7c160a85368458b3d7f7e366ab81fb48b802"; + sha512 = "50a761b26bc0cd27dbcc3df8e17b389232628dae30f6fc4c16982a54a59a2b4a0db20bbd018744cb97dc5e13e6eec1835164df7c1256de0d5cbffccc5bddafb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ro/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "46b6b7fd59e6c5367e95a5d5c5891f9339043faf1ec2518242ece74dffceb8582b46289534978e7bf39e8c2bc61e0d011ba3f1adc5d34022b7f857e5b25f237d"; + sha512 = "81449f647230eac6cc8ed68f16e2d6254347dc98e142df5c50a6e24aa40a09ee1de8a09d7a218e2054a604b32e68c341d71e2320cf409552f1f33a6e16afc6ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ru/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1e8df6f7cd3902d6536a5e9355a300dd8a75a97036f58495967a30ce18086bd9610bfd173df57c4a34cd6a1c64e0786d94400da312806a2430493e684c1d6fe6"; + sha512 = "ef71110f18cfd6cee4b8e03c49fc1eb8ac069342eebd099c86943e173bfb0d7450f776b843ad19054af197b57ee3d9d2d3e2e03c7af6221ad219edf8765cbed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/si/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "06871c8e05dcee61c3d2e1431fe051e5cf70b2d623fa0e07ca94ec3a6d6b85699585c41bc9d978e33297b1547bc2132c09fedf5160084f911de93fd01cbeaabe"; + sha512 = "7091000c8eb946d8feff6ce27ebeebb5022e81b4455b4dae9e00f291f94d4d8f43a08374efe1ccac4bf1e76438a4df7d48a2b847a9ba594f2836950c827409e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6f46bfc89960fe7f35c3498ad144a1195c2c32085b7c4b96bf73cf25734a46dbfdc17b555f3adb53942a96dd87995fec5ad911e22e7202859d8aff4f7410c96e"; + sha512 = "bbe0c19edf2abc3ad8b0f9b495e7243e5690f5227ec616376af007f68da46081c5caa155467d61d77aaed13301f079716a0c6bea622649bfb00e768bf19b358c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sl/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bcf428d707e38bd783fbbed5c21a43cc171840fa24e0a382b56945168ad19aebf07dfa6b5ea7090a767e10043d89277556d577e404775fd466badc9722fa46db"; + sha512 = "7f384d56c5db35a7f0426ce2dcd148793a38efc33db8d7decc51344ea69233fa27e2cc14c89262e62d0eef7e7c8b8e4260dd9e776c430bb99631d74024ce660b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/son/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "22ab850e4c4dc0af44830dca37323d758f7350f55c15d50dff5acd5d44402059a24d5cde697812b46e7eeeb92c9e75a5e2acca0582769191b96d1161692394d3"; + sha512 = "51e9a814f4069f27bbd6f2aeef696d7f9d79437282c0537c7f0a65ec5bf6a78455c12f09df132ed163b9a8eaa3e75ada4294a1984d87f0b1ec504b5281855682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sq/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "46a3a290094740d45f50a43b6f680889da5134cb158a81776c253fecfd61fe36a0a6c3d6be717e4aa4f97deacee9aa53808210676562086f7b43bf40f0fd8f1a"; + sha512 = "bd4fe0889b6e682c6ddad77b194757be67ab392303281f8658600ee35935a4137dffa43624776761c63ba624d3618ac5244d4807e9bc153afaf8cb658de0759b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8d3cf3a5269ae6c4455048ba6b659c01de2897809c10811e602dd755b742034d10aec16ff5cc9e2c4c8222764938c5335693f33d8ba8b4f9a749700c43f52d4f"; + sha512 = "4cd11d22d97037719719ccdb055984be0ce1474def23488f4efb3ebb7a68797cf51db88bba38b5958846ea428a60d33b8fbbcbba7d4882ff77a203d5700af187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/sv-SE/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3391a5258315f095fe4d560f6c2cd8e70af8cdd6b062e2559ba3955abb162814a15907d8a9fef933d7af39b3a5b7f7a1fb1e531edf7a6e1b5ae1b96d4adadfd8"; + sha512 = "8d5b90a6fdcf38deeeceb09106b009cf5798eb3fa5a91c17c3a4ecfb567b8a2b474a3eaa659bedfe698b2ca465d430656f538a0a9efb2d74cad0937d4263f291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ta/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "85c58141e9a871dda3807b4d4e0d8b4f98a18fc963953afa44efb0f755cc60d793a6ddc0d8add21136fb5f98c83bf033cbd62ee3fb1f70465127ecc47c5932b9"; + sha512 = "974f65909f3a974b3e66fd61e6bcb69d9d8dbc67b0a8f99ff8d40774abd784b1d90620c7959af5b26a9052c17c81b605a3deb7087fe8b467d122475fbf5a6884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/te/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7fbd1c13721120550fc755f7b277b145c3f6a23a176407cdea7b0cd36ceb1af8ee4986d74bec056e7d9ca823550964785f93d2e906a26968b3e45bb51ac72920"; + sha512 = "6538213f98590ed8d5209a933f036cf7873929f45fef70f983e5e2879e7ed9dc51042539a8912f80879ae7563865f57a8a039a9c5e3fce985206d96cd6edecba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/th/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ebaa8f5c8b4504a5a69d4687cac4ef3c9adb51043331bb099535558b4255f506f9a30909df98b0f8f6345370e2c86b217e4d59abad69e88cbaea8c3bf05f12cb"; + sha512 = "15281399f09e3e5032b29b654009c5fa7b39edd115b9fa6dc87650f6788dd6d4ded5a19d391aea0e082641b4890106d50fef5016a39d3c98114983f2c2b931f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/tr/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fa0d0cbfc24876a0bccafa7d2b1264a92d94d5fcc394e2fe87fca0f4ee28bb7157c20a55cef88cc30d01a9163c353f9013c122ce4072647cf4922b4a0958093a"; + sha512 = "89f43e8995201bc9418af32bac238d03b43d29d0a4962e92bafd415a3e342679e20713cfa7eae4f34e197aec224c3546c347e3cc861ac4be484314f28003705f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/uk/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5f0ac76a263df2c9424897994a65843e5b83a7f6a31cf67cd87ba42f78526566cb1ab0d8253c9292dfd8633c153de4f9f1c2094794e6cd008eda22ce3d121605"; + sha512 = "7589d71b82a54d2d93dd99589b08efe0adfa8514c681427dc04080ef90ab49fed5adc492c26e8ee7a9d1f2d21e79cc268362cfe333593d6ac8fdde5d26efab52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/ur/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "46b0f84deed0859b03aa5418e73b15fdb925f424dc2aaa37b48697a6ddb2d22c2cd1f98d8bb8252dfee80a070a2099f29c0898b79b6cd91dd1fcce2f65418472"; + sha512 = "e2f4c990c2f0b55faab8e8a26967c61fe869f42f9a1a1a6e9ea982057773fea8853c313183339aee6ac695d74277ed1d75cd63b9a76d690816786e159ac36261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/uz/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9faba9b67cc972f0e60e2fff63a4808bd0836ae5467dc400dfaa82d9249dcc7091014180d04750ff94c4d7b5645fa18ff11a950297b6598d731726093a920dc1"; + sha512 = "b17a1c515cf0fe463a1d46ec3a5389154efa27943dbabfeadc1aba261c07ccb4b27d9df121ebed26a408565e7427414c31e8f640316616664cf9f266a4da9cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/vi/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "40ab917e85d5e625bbf29c6e89c2ef816306c22f00b84e3296523ee50ca3de44a6e3a09623225ae3b2a435c098639c828026b38e1fa987cfb6f1d46747170baf"; + sha512 = "f3c677964f26fb99a74b66307b7b01d9e8087504dc4b9650c4550e5482a0cca6d6a91a42f9bee0a8a448278fe61c52b5513716132fde02e2a0260a57f389fb44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/xh/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "da5e9e56e4016650602a28e28ec0a58e00ed1f42392ef410274abb33c4b5fb71732b6810ad61cf172b618cdefbbf943386601e114dfc9564723b3446be1ea1ac"; + sha512 = "000b1abcab43200e080f7c5b9930686e8d3eb6d0fcec032c0204e0c4d67e0094b8260f29896f896a95545bf36bd4d2e056fd32b9b43db2cf9bd3d29da53982bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/zh-CN/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "94315e64a5f757b90a06d94a6bc750e16a66828b6bdfc0ecc7a0dba34c68dd0c1c93a6150ece78c58a372276daa7a700609de9477e807eaba395038ca99e0583"; + sha512 = "603a384fb9b17131097a3a6bb0b221a6d40f6c6a650cae09218f9bc2d6da2f4dd4b0b5e89becddbd2dcf655e86749cc9fe19c40f99bf63bfa937c81e2f0c943b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b18/linux-i686/zh-TW/firefox-67.0b18.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "81c8b294c88985bcbd8bcb73767a5f4dc0cc767e16177a548222727f66316fabff379f0c74e4087bb5d4d6dd19ae59314dcc1a43e13328b9279750f1cb87e4f3"; + sha512 = "a8995e5869cfa4d850d3fff73e335cdc23cd698695e9b1eda02c86605a451e1fc0abeb9e50ad84ceaa04a0376469832c5bca0632ae70880928d7d1a9d39480e7"; } ]; } From 4f3012ee355c60265b81a5ec642633fc00971980 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 13 May 2019 21:18:05 +0900 Subject: [PATCH 122/637] nyancat: init at 1.5.2 --- pkgs/tools/misc/nyancat/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/nyancat/default.nix diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix new file mode 100644 index 00000000000..47a91915c43 --- /dev/null +++ b/pkgs/tools/misc/nyancat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "nyancat"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "klange"; + repo = "nyancat"; + rev = version; + sha256 = "1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/bin "$out/bin" \ + --replace /usr/share "$out/share" + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Nyancat in your terminal, rendered through ANSI escape sequences."; + homepage = https://nyancat.dakko.us; + license = licenses.ncsa; + maintainers = with maintainers; [ midchildan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318cdfedb17..fb5b0b9785e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4841,6 +4841,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nyancat = callPackage ../tools/misc/nyancat { }; + nylon = callPackage ../tools/networking/nylon { }; nzbget = callPackage ../tools/networking/nzbget { }; From 8be03860e40cae2292658fc789d599ce21ca6b3b Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 14 May 2019 21:13:49 +0900 Subject: [PATCH 123/637] flashplayer: 32.0.0.171 -> 32.0.0.192 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a8bdb7d5b2d..0715a01a951 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.171"; + version = "32.0.0.192"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg"; + sha256 = "14nydiqjvr7hc4dmn900p7j7rp6prwyaf6xnki2ssbq6h1ni2lg1"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 417bdf60b12..cde919923d7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.171"; + version = "32.0.0.192"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv" + "0n5m70mz1fa5pgpz1ldqgn6bkr4in5qjn79kb85127wmg8fddbz7" else - "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr" + "1q6pjmnw2h8k09va5x64ijmq0kmfb569rwcibwl0d8kylxi97b6v" else if arch == "x86_64" then - "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h" + "1h2ya3szq24dczv2izxy47kr2raiahxx7zvm49jlvlcp5cygxvjk" else - "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m"; + "084bv0m9w1v2s4bf5rgan40l1fajwfam3njvgm47ffyg6s0kg1kh"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index cfee25bf3f8..19c7d93b9a6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.171"; + version = "32.0.0.192"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8" + "0j5rzamyajkiblalqkimx29bwm7yg9m4nj9z7z8hahcywpf81yqg" else - "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg"; + "0qnz383aggm07hbvyrnqphwhd5wp9xbairf908nk4i6ad8wg1x3r"; }; nativeBuildInputs = [ unzip ]; From faf5e8ad8cf2a4b4a09f86b1a6474f1c32479af9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 08:23:31 -0400 Subject: [PATCH 124/637] vivaldi: 2.5.1525.40-1 -> 2.5.1525.41-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 244f179ec15..c1764aa3d5f 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.40-1"; + version = "2.5.1525.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1samrhavjz21vynv1vz8qnv9bf30mcy0da0qkpa1vhbgkga5flgy"; + sha256 = "0hdyk2f0jwp9rgzkqidksrmbri6lgihlgny6hpksfz132m00lv0b"; }; unpackPhase = '' From 00fc5bd08fc7c5149c50895a5f5d15e9db171c02 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 14 May 2019 18:27:51 +0200 Subject: [PATCH 125/637] simgrid: override checkPhase -> preCheck This commit changes how failing tests are ignored. - Previously, the whole checkPhase was overridden. - Now, preCheck generates a ctest ignore file. ctest doc: https://gitlab.kitware.com/cmake/community/wikis/doc/ctest/Testing-With-CTest#customizing-ctest --- pkgs/applications/science/misc/simgrid/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 43b6f294cdc..5272e3d8418 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -86,13 +86,11 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - make tests -j $NIX_BUILD_CORES - ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple - - runHook postCheck + # Prevent the execution of tests known to fail. + preCheck = '' + cat <CTestCustom.cmake + SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) + EOW ''; enableParallelBuilding = true; From d6d94878eafdbb28bcf2c1a78098eac10409402a Mon Sep 17 00:00:00 2001 From: Peter Ferenczy Date: Tue, 14 May 2019 18:32:34 +0200 Subject: [PATCH 126/637] pg_partman: init at 4.1.0 --- .../servers/sql/postgresql/ext/pg_partman.nix | 33 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pg_partman.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix new file mode 100644 index 00000000000..b8ca074f662 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_partman"; + version = "4.1.0"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "pgpartman"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06"; + }; + + installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 + mkdir -p $out/{lib,share/extension} + + cp src/*.so $out/lib + cp updates/* $out/share/extension + cp -r sql/* $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Partition management extension for PostgreSQL"; + homepage = https://github.com/pgpartman/pg_partman; + maintainers = with maintainers; [ ggpeti ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 70579ee292a..e5f29dc7d57 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -38,4 +38,6 @@ self: super: { tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; pgrouting = super.callPackage ./ext/pgrouting.nix { }; + + pg_partman = super.callPackage ./ext/pg_partman.nix { }; } From a3ccd4364717132cb4a2c6c2d5d2d6dfa991bade Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 May 2019 11:03:56 -0700 Subject: [PATCH 127/637] chirp: 20190304 -> 20190511 (#61279) * chirp: 20190304 -> 20190429 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions * chirp: 20190429 -> 20190511 --- pkgs/applications/radio/chirp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 72adb38c62e..1c6d0478f76 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190304"; + version = "20190511"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1m18f7j0bdimp0fvs5ms02amd5pzis581hqn38y8qffny4y9f6ij"; + sha256 = "1k5smkzkvbr4d8gbl1yczf2i5xrdkgk6i8pmwnlfghzcgy8n4jzj"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - pyserial pygtk libxml2Python libxslt pyserial + pyserial pygtk libxml2Python libxslt ]; installPhase = '' From 9b3d4e8b8ba2615b4380605613d7153d4c4960a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 14 May 2019 20:27:13 +0200 Subject: [PATCH 128/637] pythonPackages.fasttext: init at 0.2.0 --- .../python-modules/fasttext/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/fasttext/default.nix diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix new file mode 100644 index 00000000000..05034dc7526 --- /dev/null +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -0,0 +1,28 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: + +buildPythonPackage rec { + pname = "fasttext"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastText"; + rev = version; + sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + }; + + buildInputs = [ pybind11 ]; + + propagatedBuildInputs = [ numpy ]; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + description = "Python module for text classification and representation learning"; + homepage = https://fasttext.cc/; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ebd75b5c1..66b9e828409 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -399,6 +399,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fasttext = callPackage ../development/python-modules/fasttext { }; + favicon = callPackage ../development/python-modules/favicon { }; fido2 = callPackage ../development/python-modules/fido2 { }; From d1bd8a983f04ce22b969b7f15b50a1281c0d4409 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 14 May 2019 20:49:57 +0200 Subject: [PATCH 129/637] pythonPackages.uncompyle6: 3.2.6 -> 3.3.2 Changes: https://github.com/rocky/python-uncompyle6/blob/release-python-3.3.2/NEWS.md --- pkgs/development/python-modules/uncompyle6/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 6996b9bcda3..bb9c874d9a1 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.2.6"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "3a40f4f4b8b02a8687bd98c598980bed38a4770e3de253847eafed4b7167d07f"; + sha256 = "096k1hipxxnsra5k86v6sm7bk1g0kb1f75yb44nvgf566kd6p119"; }; checkInputs = [ nose pytest hypothesis six ]; @@ -23,8 +23,9 @@ buildPythonPackage rec { # six import errors (yet it is supplied...) checkPhase = '' - pytest ./pytest --ignore=pytest/test_build_const_key_map.py \ - --ignore=pytest/test_grammar.py + runHook preCheck + pytest ./pytest --ignore=pytest/test_function_call.py + runHook postCheck ''; meta = with stdenv.lib; { From 9760c3e7ec6ae85ab7ae98a267a6a6bb75b2a395 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Fri, 3 May 2019 15:36:05 +0200 Subject: [PATCH 130/637] vmTools: update debian-9.4 repositories to debian-9.8 Release.xz urls --- pkgs/build-support/vm/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index de6a5e3b62f..5d04302591e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1021,22 +1021,22 @@ rec { }; debian9i386 = { - name = "debian-9.4-stretch-i386"; - fullName = "Debian 9.4 Stretch (i386)"; + name = "debian-9.8-stretch-i386"; + fullName = "Debian 9.8 Stretch (i386)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz; - sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh"; + url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz; + sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian9x86_64 = { - name = "debian-9.4-stretch-amd64"; - fullName = "Debian 9.4 Stretch (amd64)"; + name = "debian-9.8-stretch-amd64"; + fullName = "Debian 9.8 Stretch (amd64)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz; - sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm"; + url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz; + sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 46f84cac427c5d6a5f5e2d88759ae54a833eb6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 14 May 2019 21:12:30 +0200 Subject: [PATCH 131/637] aws-c-common: 0.3.4 -> 0.3.9. Also remove conditional adding of `libexecinfo` for musl; see #56106. --- pkgs/development/libraries/aws-c-common/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 5b938ddb03c..c8f284acc13 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.3.4"; + version = "0.3.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1z02ndb9jjn0p5bcc49pq0d8c0q2pq33dlszw77l76jkhrfx0921"; + sha256 = "04wrmrw83vypqzsq88b2q8kp5sfbv0qsci3bcxw0c2mfxqk8358n"; }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.hostPlatform.isMusl libexecinfo; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-Wno-nullability-extension" "-Wno-typedef-redefinition" From de1110d5356059fbbff326e269b0c61bf65ae6a2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 14:22:39 -0500 Subject: [PATCH 132/637] pkgs: remove llvm_37 These expressions are now unused, and can be removed to lighten the load on build machines. Signed-off-by: Austin Seipp --- .../compilers/llvm/3.7/clang/default.nix | 60 ---------- .../compilers/llvm/3.7/clang/purity.patch | 17 --- .../compilers/llvm/3.7/default.nix | 59 ---------- .../compilers/llvm/3.7/libc++/darwin.patch | 30 ----- .../compilers/llvm/3.7/libc++/default.nix | 48 -------- .../compilers/llvm/3.7/libc++/r242056.patch | 16 --- .../compilers/llvm/3.7/libc++/setup-hook.sh | 6 - .../llvm/3.7/libc++/xlocale-glibc-2.26.patch | 17 --- .../compilers/llvm/3.7/libc++abi.nix | 61 ---------- pkgs/development/compilers/llvm/3.7/lldb.nix | 49 -------- pkgs/development/compilers/llvm/3.7/llvm.nix | 105 ------------------ pkgs/top-level/all-packages.nix | 11 -- 12 files changed, 479 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.7/clang/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/darwin.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/r242056.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch delete mode 100644 pkgs/development/compilers/llvm/3.7/libc++abi.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/3.7/llvm.nix diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix deleted file mode 100644 index 4ccd00af684..00000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - name = "clang-${version}"; - - unpackPhase = '' - unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"} - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - buildInputs = [ cmake libxml2 llvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./purity.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - ''; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - ''; - - enableParallelBuilding = true; - - passthru = { - lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch deleted file mode 100644 index ee73b26eb5c..00000000000 --- a/pkgs/development/compilers/llvm/3.7/clang/purity.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2015-07-31 00:47:41.000000000 +0200 -+++ b/lib/Driver/Tools.cpp 2015-09-11 21:30:50.057895565 +0200 -@@ -8150,15 +8150,6 @@ - CmdArgs.push_back("-shared"); - } - -- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb || -- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix deleted file mode 100644 index 3c557711449..00000000000 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl -, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - version = "3.7.1"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; - clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv isl version fetch; }); - in { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch deleted file mode 100644 index bf83f169cfc..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt ---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 -+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 -@@ -56,7 +56,7 @@ - "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" - "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() -@@ -64,14 +64,14 @@ - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix deleted file mode 100644 index 7b7ac7297ba..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation rec { - name = "libc++-${version}"; - - src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") - ''; - - patches = [ - ./darwin.patch - ./r242056.patch - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ]; - - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch deleted file mode 100644 index 96245e76653..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/include/string 2015/07/13 20:04:56 242056 -+++ b/include/string 2015/07/18 20:40:46 242623 -@@ -1936,7 +1936,12 @@ - template - inline _LIBCPP_INLINE_VISIBILITY - basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a) -- : __r_(__a) -+#if _LIBCPP_STD_VER <= 14 -+ _NOEXCEPT_(is_nothrow_copy_constructible::value) -+#else -+ _NOEXCEPT -+#endif -+: __r_(__a) - { - #if _LIBCPP_DEBUG_LEVEL >= 2 - __get_db()->__insert_c(this); diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh deleted file mode 100644 index 6611259165a..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index 5ee8f6b8230..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index 1989558..1e42905 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -34,10 +34,10 @@ - # include - #elif defined(_NEWLIB_VERSION) - # include --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix deleted file mode 100644 index 2c79d7b3b1b..00000000000 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }: - -let - # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version - llvm38-and-above = fetchpatch { - url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch"; - sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr"; - }; -in stdenv.mkDerivation { - name = "libc++abi-${version}"; - - src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - ''; - - # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract - # into the libc++abi build environment above. - prePatch = ''( - cd ../libcxx-* - patch -p1 < ${llvm38-and-above} - )''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix deleted file mode 100644 index 294410f9986..00000000000 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python2 -, version -}: - -stdenv.mkDerivation { - name = "lldb-${version}"; - - src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python2 which swig ncurses zlib libedit ]; - - preConfigure = '' - export CXXFLAGS="-pthread" - export LDFLAGS="-ldl" - ''; - - cmakeFlags = [ - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" - "-DPYTHON_VERSION_MAJOR=2" - "-DPYTHON_VERSION_MINOR=7" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix deleted file mode 100644 index a6fd18f94d6..00000000000 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python2 -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, libcxxabi -, debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin -}: - -let - src = fetch "llvm" "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy"; -in stdenv.mkDerivation rec { - name = "llvm-${version}"; - - unpackPhase = '' - unpackFile ${src} - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = [ perl groff cmake libxml2 python2 libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; - - propagatedBuildInputs = [ ncurses zlib ]; - - # The goal here is to disable LLVM bindings (currently go and ocaml) regardless - # of whether the impure CMake search sheananigans find the compilers in global - # paths. This mostly exists because sandbox builds don't work very well on Darwin - # and sometimes you get weird behavior if CMake finds go in your system path. - # This would be far prettier if there were a CMake option to just disable bindings - # but from what I can tell, there isn't such a thing. The file in question only - # contains `if(WIN32)` conditions to check whether to disable bindings, so making - # those always succeed has the net effect of disabling all bindings. - prePatch = '' - substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)" - '' - + stdenv.lib.optionalString (stdenv ? glibc) '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - patches = stdenv.lib.optionals (!stdenv.isDarwin) [ - # llvm-config --libfiles returns (non-existing) static libs - ../fix-llvm-config.patch - ]; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optional enableSharedLibraries - "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ]; - - NIX_LDFLAGS = "-lpthread"; # no idea what's the problem - - postBuild = '' - rm -fR $out - ''; - - enableParallelBuilding = true; - - passthru.src = src; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ac118e7755..fa5e7eeaac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,7 +3550,6 @@ in highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { - # doesn't build with clang_37 inherit (llvmPackages_38) stdenv; }); @@ -7035,7 +7034,6 @@ in clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; - clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { @@ -7694,7 +7692,6 @@ in llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; - llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; @@ -7705,14 +7702,6 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; }); - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_37.tools; - targetLlvmLibraries = targetPackages.llvmPackages_37.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; - }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_38.tools; From a5f60140201ede024783d9bc71f21b8fd01dac4b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 14:57:38 -0500 Subject: [PATCH 133/637] pkgs: remove souper-2017-03-23 Souper is a very experimental package that's only useful for for compiler hackers or people who are doing PhDs. The support/cost ratio of keeping such a package probably isn't very good. More importantly, this puts us one step closer to deleting llvmPackages_4, as this is one of the only two remaining packages using it. Deleting these older LLVM packages would be far more useful than the value Souper currently provides. Current versions of Souper support more recent LLVM versions anyway, so this expression could be resurrected. But it might be better to place it in the Nix User Archive (NUR), perhaps. Signed-off-by: Austin Seipp --- .../compilers/souper/cmake-fix.patch | 14 ----- pkgs/development/compilers/souper/default.nix | 59 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 75 deletions(-) delete mode 100644 pkgs/development/compilers/souper/cmake-fix.patch delete mode 100644 pkgs/development/compilers/souper/default.nix diff --git a/pkgs/development/compilers/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch deleted file mode 100644 index 5ef289f53e9..00000000000 --- a/pkgs/development/compilers/souper/cmake-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600 -+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600 -@@ -33,7 +33,10 @@ - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+ -+if (LLVM_SYSTEM_LIBS) -+ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}") -+endif() - - execute_process( - COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix deleted file mode 100644 index 2203dc980b1..00000000000 --- a/pkgs/development/compilers/souper/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper -, llvmPackages_4, hiredis, z3, gtest -}: - -let - klee = fetchFromGitHub { - owner = "rsas"; - repo = "klee"; - rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f"; - sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz"; - }; -in stdenv.mkDerivation rec { - name = "souper-unstable-${version}"; - version = "2017-03-23"; - - src = fetchFromGitHub { - owner = "google"; - repo = "souper"; - rev = "cf2911d2eb1e7c8ab465df5a722fa5cdac06e6fc"; - sha256 = "1kg08a1af4di729pn1pip2lzqzlvjign6av95214f5rr3cq2q0cl"; - }; - - nativeBuildInputs = [ - cmake - makeWrapper - ]; - - buildInputs = [ - llvmPackages_4.llvm - llvmPackages_4.clang-unwrapped - hiredis - gtest - ]; - - patches = [ ./cmake-fix.patch ]; - - enableParallelBuilding = true; - - preConfigure = '' - mkdir -pv third_party - cp -R "${klee}" third_party/klee - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v ./souper $out/bin/ - cp -v ./clang-souper $out/bin/ - wrapProgram "$out/bin/souper" \ - --add-flags "-z3-path=\"${z3}/bin/z3\"" - ''; - - meta = with stdenv.lib; { - description = "A superoptimizer for LLVM IR"; - homepage = "https://github.com/google/souper"; - license = licenses.asl20; - maintainers = with maintainers; [ taktoa ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..55da6542195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5867,8 +5867,6 @@ in soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {}; - souper = callPackage ../development/compilers/souper { }; - sparsehash = callPackage ../development/libraries/sparsehash { }; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; From baeea1f463f72d1d13e9e43cd1579b93e173c06d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 May 2019 15:57:41 -0400 Subject: [PATCH 134/637] libfaketime: refactor using `builtins.placeholder` --- pkgs/development/libraries/libfaketime/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index cc9db8f7e66..65d04cb53f1 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { done ''; - preBuild = '' - makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) - ''; + PREFIX = placeholder "out"; + LIBDIRNAME = "/lib"; checkInputs = [ perl ]; From 4cdcfc51f81b9f2cc94133cd7973d59bc760d9eb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 14 May 2019 16:35:28 -0400 Subject: [PATCH 135/637] nvidia_x11: 430.09 -> 430.14 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ed71f27bdcc..ff0416b4efc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -20,10 +20,10 @@ rec { # No active beta right now beta = generic { - version = "430.09"; - sha256_64bit = "0k59ahljya286ararncf3mc7sfgsw82vnrszczqicpysn3qfar95"; - settingsSha256 = "082v0xmz83sf4wdvcb2zawddy5vh3pbwjz0fda1rayc7fdadni05"; - persistencedSha256 = "028vs23mnb345sxjxqqmln9pwq8n6cc6dhfzq4hj21ghc6l6fg54"; + version = "430.14"; + sha256_64bit = "05qgakc0sqv9zr6j4i49iqrd271nris8pmnv3l431r71ygx6zm00"; + settingsSha256 = "1hh07258a6z0g8dl6mxrizdxqcgswv58r4rbamfhhwh9i42fpdgg"; + persistencedSha256 = "1wmwmg9ma9rfx03s2qa249f0p7yf0lxdpiadab0raajk1lzlrrc8"; }; stable_418 = generic { From 8c5ee6b4f44a0231bb9fd2a6457d04c49efe9df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 14 May 2019 23:20:04 +0200 Subject: [PATCH 136/637] gnome3.gnome-desktop: 3.32.1 -> 3.32.2 (#61497) - Fix thumbnailer sandbox escape, CVE-2019-11460 closes #60837 --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 6f49afe82bf..4a614b88072 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.32.1"; + version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "040s8ia26xyq25zcd9xji9f5jhsddqd7a23jassy429bir34sxkg"; + sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; enableParallelBuilding = true; From 2d8b3df99b9f034391c8f268b84175786cca8f33 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 14 May 2019 23:41:59 +0200 Subject: [PATCH 137/637] aws-sdk-cpp: fix cross compilation aws-sdk-cpp tries to run code at build time using check_c_source_runs [0] and therefore needs to be told about the expected exit code [1]. [0] https://cmake.org/cmake/help/latest/module/CheckCSourceRuns.html [1] https://cmake.org/cmake/help/latest/command/try_run.html#behavior-when-cross-compiling --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index f46571587ef..7233a187053 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -37,9 +37,11 @@ stdenv.mkDerivation rec { "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" - ++ lib.optional (apis != ["*"]) - "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DENABLE_TESTING=OFF" + "-DCURL_HAS_H2=0" + ] ++ lib.optional (apis != ["*"]) + "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; preConfigure = '' From 0f898bd230084c4592817b6179aba934a6bd26f4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:28:36 -0400 Subject: [PATCH 138/637] linux: 4.14.118 -> 4.14.119 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8cf9fa199d9..0a8b8cd4042 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.118"; + version = "4.14.119"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8"; + sha256 = "0z1vmpbjkn9vqf380dgdcdmi2a22cymjs0spm9708x4x709vf5an"; }; } // (args.argsOverride or {})) From 0a512e03f91ed4bab28ca36e3aaaacd95555a009 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:29:04 -0400 Subject: [PATCH 139/637] linux: 4.19.42 -> 4.19.43 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 08009fe8799..2119c11dee4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.42"; + version = "4.19.43"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq"; + sha256 = "0myzsbajwvskiqdlqsahw87f0ppj9gj7kh05vbs8ndmjzahij5hi"; }; } // (args.argsOverride or {})) From 68bb6a928f0462e7db7c686f04ca95f36b023e26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:29:53 -0400 Subject: [PATCH 140/637] linux: 4.9.175 -> 4.9.176 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d6afc0f54d3..2f2ff1f929e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.175"; + version = "4.9.176"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r"; + sha256 = "0y5i0picww914ljynqjdpv7cld7380y9lrlgnza02zvkq04d151a"; }; } // (args.argsOverride or {})) From 8ce75f18dfe4fdf1b3232a035271f46b3df3c1ab Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:30:22 -0400 Subject: [PATCH 141/637] linux: 5.0.15 -> 5.0.16 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index d48b4da3371..4571a570d4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.15"; + version = "5.0.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw"; + sha256 = "1b7wz577mdn2cdpn8mm8bl5kgxvm3rq7fzy0nc8cxl2j1wwwx9sw"; }; } // (args.argsOverride or {})) From 3b3bfdb4c9c4dc92299dc218b7a0cb3616b178aa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:30:52 -0400 Subject: [PATCH 142/637] linux: 5.1.1 -> 5.1.2 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 235848bb876..e06cdd26fdd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.1"; + version = "5.1.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0"; + sha256 = "0nzgkg4si0378pz6cv3hwj7qmmi5wdz1qvml0198b61n89xdcypc"; }; } // (args.argsOverride or {})) From a9c7679ace80602b15de3c2b30dd6ec838e6c254 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 14 May 2019 18:38:21 -0400 Subject: [PATCH 143/637] vivaldi: Fix chatty update script --- pkgs/applications/networking/browsers/vivaldi/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index fc04137a9b0..2e6c2853eb1 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p libarchive curl common-updater-scripts -set -xeu -o pipefail +set -eu -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" root=../../../../.. From 193018687cdf9bda15c526850b2e5fd558fd3204 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Mon, 13 May 2019 21:06:54 -0700 Subject: [PATCH 144/637] unison: fix building on macOS with enableX11 = false If `UISTYLE` is not specified, Unison tries to auto-detect the UI style based on the available environment. On macOS this apparently means using `UISTYLE=mac`, it can't actually build this way in Nix. --- pkgs/applications/networking/sync/unison/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7862cc1e6e4..ad5a35eb251 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation (rec { echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; - makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") - + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); + makeFlags = [ + "INSTALLDIR=$(out)/bin/" + "UISTYLE=${if enableX11 then "gtk2" else "text"}" + ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; preInstall = "mkdir -p $out/bin"; From 3e6ac2c754fec3ca4ac842fb940e7f4398a159cc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 8 May 2019 16:49:00 +0200 Subject: [PATCH 145/637] taskell: Add package meta information --- pkgs/applications/misc/taskell/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 373839c1dd5..743d89de4ad 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/pkgs/applications/misc/taskell/default.nix @@ -57,5 +57,9 @@ in (haskellPackages.mkDerivation { tasty-hunit ]; - license = lib.licenses.bsd3; + description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects"; + homepage = "https://taskell.app"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = with lib.platforms; unix ++ darwin; }) From f797e8a30c2ef6c5be95bff07035a2ac5852ae2e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 14 May 2019 22:26:04 -0400 Subject: [PATCH 146/637] pantheon.gala: 2019-02-09 -> 2019-05-14 Fixes notification settings being broken[0] and many other things. See the changes[1] [0]: https://github.com/elementary/switchboard-plug-notifications/issues/41 [1]: https://github.com/elementary/gala/compare/1a96644c6aac405927499dacb308dea13512e919..3ae100da4bbd9dabe353f468778ef63ef2dcd5d7 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index ba14621e8bd..bc29dba9718 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno + version = "unstable-2019-05-14"; # Is tracking https://github.com/elementary/gala/commits/stable/juno src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "1a96644c6aac405927499dacb308dea13512e919"; - sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3"; + rev = "3ae100da4bbd9dabe353f468778ef63ef2dcd5d7"; + sha256 = "08xcj4z9mq511w8hdpr60nmd6j1cj7rs7rgs4s5ivyg11kg5w17b"; }; passthru = { From dd79d605de4e5c2f55752bbc2007f336d563aed4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 21:56:38 -0500 Subject: [PATCH 147/637] pythonPackages.funcsigs: fix tests on pypy3 This package has a spurious test failure on PyPy3, which was reported upstream a while ago: https://github.com/testing-cabal/funcsigs/issues/10 This is fixed thanks to the included patch, which was authored and is also used by the Gentoo Python team. With this, packages like 'pytest' and 'click' now work under PyPy3. Signed-off-by: Austin Seipp --- .../python-modules/funcsigs/default.nix | 6 +- .../funcsigs/fix-pypy3-tests.patch | 94 +++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 155f866412e..1a6786c700d 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,5 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi -, unittest2 }: +, isPyPy, isPy3k, unittest2 +}: buildPythonPackage rec { pname = "funcsigs"; @@ -12,6 +13,9 @@ buildPythonPackage rec { buildInputs = [ unittest2 ]; + # https://github.com/testing-cabal/funcsigs/issues/10 + patches = stdenv.lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; + meta = with stdenv.lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = https://github.com/aliles/funcsigs; diff --git a/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch b/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch new file mode 100644 index 00000000000..f4ecec3b613 --- /dev/null +++ b/pkgs/development/python-modules/funcsigs/fix-pypy3-tests.patch @@ -0,0 +1,94 @@ +diff --git a/tests/test_inspect.py b/tests/test_inspect.py +index 98d6592..3a2a1f2 100644 +--- a/tests/test_inspect.py ++++ b/tests/test_inspect.py +@@ -8,6 +8,7 @@ import unittest2 as unittest + + import funcsigs as inspect + ++import platform + + class TestSignatureObject(unittest.TestCase): + @staticmethod +@@ -409,7 +410,7 @@ def test_signature_on_decorated(self): + Ellipsis)) + """) + +- if sys.version_info[0] > 2: ++ if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy": + exec(""" + def test_signature_on_class(self): + class C: +@@ -493,41 +494,44 @@ def test_signature_on_class(self): + Ellipsis)) + """) + +- def test_signature_on_callable_objects(self): +- class Foo(object): +- def __call__(self, a): +- pass ++ if platform.python_implementation() != "PyPy": ++ exec(""" ++def test_signature_on_callable_objects(self): ++ class Foo(object): ++ def __call__(self, a): ++ pass + +- self.assertEqual(self.signature(Foo()), +- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), +- Ellipsis)) ++ self.assertEqual(self.signature(Foo()), ++ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), ++ Ellipsis)) + +- class Spam(object): +- pass +- with self.assertRaisesRegex(TypeError, "is not a callable object"): +- inspect.signature(Spam()) ++ class Spam(object): ++ pass ++ with self.assertRaisesRegex(TypeError, "is not a callable object"): ++ inspect.signature(Spam()) + +- class Bar(Spam, Foo): +- pass ++ class Bar(Spam, Foo): ++ pass + +- self.assertEqual(self.signature(Bar()), +- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), +- Ellipsis)) ++ self.assertEqual(self.signature(Bar()), ++ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), ++ Ellipsis)) + +- class ToFail(object): +- __call__ = type +- with self.assertRaisesRegex(ValueError, "not supported by signature"): +- inspect.signature(ToFail()) ++ class ToFail(object): ++ __call__ = type ++ with self.assertRaisesRegex(ValueError, "not supported by signature"): ++ inspect.signature(ToFail()) + +- if sys.version_info[0] < 3: +- return ++ if sys.version_info[0] < 3: ++ return + +- class Wrapped(object): +- pass +- Wrapped.__wrapped__ = lambda a: None +- self.assertEqual(self.signature(Wrapped), +- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), +- Ellipsis)) ++ class Wrapped(object): ++ pass ++ Wrapped.__wrapped__ = lambda a: None ++ self.assertEqual(self.signature(Wrapped), ++ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),), ++ Ellipsis)) ++""") + + def test_signature_on_lambdas(self): + self.assertEqual(self.signature((lambda a=10: a)), From 89b64ab5e1d21bb1ffb4d7fceab46541b3dae237 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 25 Feb 2019 11:58:38 +0100 Subject: [PATCH 148/637] nixos-generate-config: add rudimentary high-DPI detection Fixes the main remaining part of #12345 --- .../installer/tools/nixos-generate-config.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 686204ee034..b7e5b99a9e0 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -464,6 +464,21 @@ EOF } } +# For lack of a better way to determine it, guess whether we should use a +# bigger font for the console from the display mode on the first +# framebuffer. A way based on the physical size/actual DPI reported by +# the monitor would be nice, but I don't know how to do this without X :) +my $fb_modes_file = "/sys/class/graphics/fb0/modes"; +if (-f $fb_modes_file && -r $fb_modes_file) { + my $modes = read_file($fb_modes_file); + $modes =~ m/([0-9]+)x([0-9]+)/; + my $console_width = $1, my $console_height = $2; + if ($console_width > 1920) { + push @attrs, "# High-DPI console"; + push @attrs, 'i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";'; + } +} + # Generate the hardware configuration file. From cef5ed2cf4bfc7bdb71c894e1b90154e3a35553b Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 14 May 2019 22:16:22 -0700 Subject: [PATCH 149/637] chit: 0.1.12 -> 0.1.13 Re-enable tests as the one that required network access has been fixed. --- pkgs/development/tools/chit/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index a23a3d45cce..c0fa754e1e9 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -6,13 +6,13 @@ with rustPlatform; buildRustPackage rec { pname = "chit"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "peterheesterman"; repo = pname; rev = version; - sha256 = "17g2p07zhf4n4pjmws0ssfy2mrn0v933ih0vnlr1z2cv9mx8srsl"; + sha256 = "1qp5ad83lvfz9l4ihz1l500p8bgf7q0z1k4f3i13nd5n7i3ksdjc"; }; cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw"; @@ -23,9 +23,6 @@ buildRustPackage rec { ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ]) ; - # Tests require network access - doCheck = false; - meta = with stdenv.lib; { description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io"; longDescription = '' From 2db1a06136d6ad3faef897e8cc9dfedf30b9fad5 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 14 May 2019 23:37:25 +0000 Subject: [PATCH 150/637] chromium: 74.0.3729.131 -> 74.0.3729.157 Fixes a security bug with no CVE at this time: https://chromereleases.googleblog.com/2019/05/stable-channel-update-for-desktop.html --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6e96cf217f5..0de95c7d6a9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1b5hpf1j7ygvh15p11jswr8qf33b6k7l8nnsda93fya5bkc34mgd"; - sha256bin64 = "1mwia5l9zz858186m9kj2daq38jw75fipyhh3ncvhkw5hqggx0cd"; - version = "75.0.3770.18"; + sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim"; + sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh"; + version = "75.0.3770.27"; }; dev = { - sha256 = "1mmkj89pmbkgf6p7wb1q75j1rsrqcf7wncy3rl03rlhj64b231w7"; - sha256bin64 = "0mjcdg8las81lyrgyqymsb80k4wwzsib4sw3nyxd3cgrdxgc5vi9"; - version = "76.0.3783.0"; + sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f"; + sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl"; + version = "76.0.3788.1"; }; stable = { - sha256 = "11m9mlzrqzmz7rhl0ff7lry2s4yjrdkfi36qfv48m1cg5y2cfy6i"; - sha256bin64 = "034w01k0c84bx33agc2pj8149ff8rfxnsw371ankx0nzhjbn74ln"; - version = "74.0.3729.131"; + sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw"; + sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy"; + version = "74.0.3729.157"; }; } From e5b4f6f4ed46fc1b6189f1375326db1b9db72436 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 14 May 2019 16:16:38 +0200 Subject: [PATCH 151/637] adafruit-ampy: init at 1.0.7 --- pkgs/tools/misc/adafruit-ampy/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/adafruit-ampy/default.nix diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix new file mode 100644 index 00000000000..be47d42dc89 --- /dev/null +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "adafruit-ampy"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ click python-dotenv pyserial ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pycampers/ampy"; + license = licenses.mit; + description = "Utility to interact with a MicroPython board over a serial connection."; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..52a9cfdfa50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,6 +447,8 @@ in actkbd = callPackage ../tools/system/actkbd { }; + adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { }; + adlplug = callPackage ../applications/audio/adlplug { }; opnplug = callPackage ../applications/audio/adlplug { From 4277333c5aef2ad8e7cda942333cb3a4fdc4acf3 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 15 May 2019 10:05:38 +0300 Subject: [PATCH 152/637] parity: 2.4.5 -> 2.4.6 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index d01ef9ad059..18e3dd4129e 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.5"; - sha256 = "02ajwjw6cz86x6zybvw5l0pgv7r370hickjv9ja141w7bhl70q3v"; - cargoSha256 = "1n218c43gf200xlb3q03bd6w4kas0jsqx6ciw9s6h7h18wwibvf1"; + version = "2.4.6"; + sha256 = "0vfq1pyd92n60h9gimn4d5j56xanvl43sgxk9h2kb16amy0mmh3z"; + cargoSha256 = "04gi9vddahq1q207f83n3wriwdjnmmnby6mq4crdh7yx1p4b26m9"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 0040e207d85bd2b2fcfb3c52a189e72af2632b50 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 15 May 2019 10:05:57 +0300 Subject: [PATCH 153/637] parity-beta: 2.5.0 -> 2.5.1 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index b844c441bbc..ed3f691122c 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.0"; - sha256 = "1dsckybjg2cvrvcs1bya03xymcm0whfxcb1v0vljn5pghyazgvhx"; - cargoSha256 = "0z7dmzpqg0qnkga7r4ykwrvz8ds1k9ik7cx58h2vnmhrhrddvizr"; + version = "2.5.1"; + sha256 = "0nnrgc2qyqqld3znjigryqpg5jaqh3jnmin4a334dbr4jw50dz3d"; + cargoSha256 = "184vfhsalk5dims3k13zrsv4lmm45a7nm3r0b84g72q7hhbl8pkf"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 84cdfb8f31725ae122721d4d0299ba15874b8b13 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 May 2019 08:12:24 +0000 Subject: [PATCH 154/637] microcodeIntel: 20190312 -> 20190514 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 2af0e60b9c1..080fc0d3d47 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20190312"; + version = "20190514"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0n381dai2mv9indsbbr4nfbmp4y4qhshgflr095fyvq5a8acw94m"; + sha256 = "1xdxkmsnic191g7kljmrdcvg8vlwiwcrcxy9fnhpqsbsp6mjylv7"; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 1ce94fad33cbf646b0c323900679f1b751a28a02 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 May 2019 08:18:32 +0000 Subject: [PATCH 155/637] =?UTF-8?q?coq:=20make=20=E2=80=9Ccoq-version?= =?UTF-8?q?=E2=80=9D=20more=20general?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 0a4e1dddcae..2488147d214 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -27,7 +27,10 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; }."${version}"; - coq-version = builtins.substring 0 3 version; + coq-version = + let inherit (builtins) concatStringsSep head map; in + let inherit (stdenv.lib) take splitString; in + concatStringsSep "." (take 2 (map head (map (splitString "pl") (splitString "." version)))); ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" From b72daf71170e4fe6c412843432bce9b97f05a73c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 May 2019 08:31:49 +0000 Subject: [PATCH 156/637] =?UTF-8?q?coq:=20init=20at=208.10+=CE=B21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 15 ++++++++++++--- pkgs/development/coq-modules/Cheerios/default.nix | 2 +- .../development/coq-modules/InfSeqExt/default.nix | 2 +- pkgs/development/coq-modules/Verdi/default.nix | 2 +- pkgs/development/coq-modules/corn/default.nix | 2 +- .../coq-modules/math-classes/default.nix | 2 +- pkgs/development/coq-modules/mathcomp/default.nix | 2 +- .../development/coq-modules/simple-io/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/coq-packages.nix | 4 ++++ 10 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2488147d214..774fbadd4fd 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -8,6 +8,7 @@ { stdenv, fetchFromGitHub, writeText, pkgconfig , ocamlPackages, ncurses , buildIde ? true +, glib, gnome3, wrapGAppsHook , csdp ? null , version }: @@ -26,12 +27,15 @@ let "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; + "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; }."${version}"; coq-version = let inherit (builtins) concatStringsSep head map; in let inherit (stdenv.lib) take splitString; in concatStringsSep "." (take 2 (map head (map (splitString "pl") (splitString "." version)))); - ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + versionAtLeast = stdenv.lib.versionAtLeast coq-version; + ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") + "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" @@ -99,7 +103,10 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) - ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; + ++ stdenv.lib.optionals buildIde + (if versionAtLeast "8.10" + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] + else [ ocamlPackages.lablgtk ]); postPatch = '' UNAME=$(type -tp uname) @@ -120,7 +127,9 @@ self = stdenv.mkDerivation { addEnvHooks "$targetOffset" addCoqPath ''; - preConfigure = '' + preConfigure = if versionAtLeast "8.10" then '' + patchShebangs dev/tools/ + '' else '' configureFlagsArray=( ${ideFlags} ) diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 2429ccf3cf6..d58f6510219 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 6b908f5a09a..4fe86c3fae1 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 9b3b5320c8e..00d088a4a92 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index dc0f0873d07..e5fa11c5cad 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 364366ced49..0fa17e292fa 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 8b4c74fb1a5..85678a4c6a9 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 6ed343952f2..e685de4e974 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.7"; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..f2dab6fdba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22457,6 +22457,7 @@ in coqPackages_8_7 coq_8_7 coqPackages_8_8 coq_8_8 coqPackages_8_9 coq_8_9 + coqPackages_8_10 coq_8_10 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 2659a330202..ace2c5f2138 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -97,12 +97,16 @@ in rec { coq_8_9 = callPackage ../applications/science/logic/coq { version = "8.9.0"; }; + coq_8_10 = callPackage ../applications/science/logic/coq { + version = "8.10+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; coqPackages_8_8 = mkCoqPackages coq_8_8; coqPackages_8_9 = mkCoqPackages coq_8_9; + coqPackages_8_10 = mkCoqPackages coq_8_10; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute coqPackages_8_8 ); From 13aa449bab532d6223a9e35841de7bb48a7d4cae Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Wed, 15 May 2019 12:35:12 +0200 Subject: [PATCH 157/637] simgrid: remove unneeded 'name' definition --- pkgs/applications/science/misc/simgrid/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5272e3d8418..554ef695a4a 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -19,7 +19,6 @@ in stdenv.mkDerivation rec { pname = "simgrid"; version = "3.22.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { domain = "framagit.org"; From c912002f2c16f2247e143373d9f98eb35bf06b97 Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 15 May 2019 13:17:05 +0200 Subject: [PATCH 158/637] pythonPackages.httpretty: fix build on aarch64 (#61516) tests.functional.test_httplib2.test_callback_response keeps failing on Hydra + update meta.homepage --- .../python-modules/httpretty/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 1bcf892cbf4..0f61fd6d516 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -6,6 +6,7 @@ , httplib2 , sure , nose +, nose-exclude , coverage , certifi , urllib3 @@ -24,18 +25,20 @@ buildPythonPackage rec { sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc"; }; - checkInputs = [ nose sure coverage mock rednose - # Following not declared in setup.py - nose-randomly requests tornado httplib2 - ]; propagatedBuildInputs = [ six ]; + checkInputs = [ nose sure coverage mock rednose + # Following not declared in setup.py + nose-randomly requests tornado httplib2 nose-exclude + ]; + __darwinAllowLocalNetworking = true; + NOSE_EXCLUDE = stdenv.lib.optionalString (stdenv.isAarch64) "tests.functional.test_httplib2.test_callback_response"; + meta = with stdenv.lib; { - homepage = "https://falcao.it/HTTPretty/"; + homepage = "https://httpretty.readthedocs.org/"; description = "HTTP client request mocking tool"; license = licenses.mit; }; - } From 63438b880291fc78ad588038d2f562c3d5c30053 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 06:53:17 -0400 Subject: [PATCH 159/637] lollypop: remove uneeded runtime deps These are no longer needed or never were. --- pkgs/applications/audio/lollypop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 2a790514447..ed6ca89fde9 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -59,10 +59,8 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - gst-python pillow pycairo - pydbus pygobject3 ] ++ lib.optional lastFMSupport pylast From ed40b9445f7fb42da34b55bc9fd24862cb4d9b11 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 08:27:47 -0400 Subject: [PATCH 160/637] lollypop: 1.0.7 -> 1.0.10 also add changelog meta attribute, even though it's not really a changelog. --- pkgs/applications/audio/lollypop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ed6ca89fde9..c12ea885167 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.7"; + version = "1.0.10"; format = "other"; doCheck = false; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0gdds4qssn32axsa5janqny5i4426azj5wyj6bzn026zs3z38svn"; + sha256 = "118z1qhvpv7x5n63lpm4mf81pmv7gd450sa55i68mnjvry93h9h5"; }; nativeBuildInputs = [ @@ -82,6 +82,7 @@ python3.pkgs.buildPythonApplication rec { description = "A modern music player for GNOME"; homepage = https://wiki.gnome.org/Apps/Lollypop; license = licenses.gpl3Plus; + changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; }; From b71c308591e1bfc3708c31dc1a94fcae636b5557 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Tue, 9 Apr 2019 19:21:57 +0200 Subject: [PATCH 161/637] coqPackages: refactor mathcomp packages Closes #61456 --- .../coq-modules/mathcomp-analysis/default.nix | 30 --- .../mathcomp-bigenough/default.nix | 29 --- .../coq-modules/mathcomp-finmap/default.nix | 40 ---- .../coq-modules/mathcomp/default.nix | 206 ++++++++++++------ .../coq-modules/mathcomp/extra.nix | 138 ++++++++++++ .../coq-modules/multinomials/default.nix | 28 --- pkgs/top-level/coq-packages.nix | 22 +- 7 files changed, 295 insertions(+), 198 deletions(-) delete mode 100644 pkgs/development/coq-modules/mathcomp-analysis/default.nix delete mode 100644 pkgs/development/coq-modules/mathcomp-bigenough/default.nix delete mode 100644 pkgs/development/coq-modules/mathcomp-finmap/default.nix create mode 100644 pkgs/development/coq-modules/mathcomp/extra.nix delete mode 100644 pkgs/development/coq-modules/multinomials/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix deleted file mode 100644 index 8c315371229..00000000000 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: - -stdenv.mkDerivation rec { - version = "0.2.0"; - name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; - - src = fetchFromGitHub { - owner = "math-comp"; - repo = "analysis"; - rev = version; - sha256 = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = { - description = "Analysis library compatible with Mathematical Components"; - inherit (src.meta) homepage; - inherit (coq.meta) platforms; - license = stdenv.lib.licenses.cecill-c; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.8" "8.9" ]; - }; -} diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix deleted file mode 100644 index e1f58edc9cb..00000000000 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: - -stdenv.mkDerivation rec { - version = "1.0.0"; - name = "coq${coq.coq-version}-mathcomp-bigenough-${version}"; - - src = fetchFromGitHub { - owner = "math-comp"; - repo = "bigenough"; - rev = version; - sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; - - installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = { - description = "A small library to do epsilon - N reasonning"; - inherit (src.meta) homepage; - inherit (mathcomp.meta) platforms license; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; - }; -} diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix deleted file mode 100644 index c36b72711ff..00000000000 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: - -let param = - if stdenv.lib.versionAtLeast mathcomp.version "1.8.0" - then { - version = "1.2.0"; - sha256 = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; - } else { - version = "1.1.0"; - sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; - } -; in - -stdenv.mkDerivation rec { - inherit (param) version; - name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; - - src = fetchFromGitHub { - owner = "math-comp"; - repo = "finmap"; - rev = version; - inherit (param) sha256; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; - - installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = { - description = "A finset and finmap library"; - inherit (src.meta) homepage; - inherit (mathcomp.meta) platforms license; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; - }; -} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 85678a4c6a9..aa6da1a1e28 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,70 +1,146 @@ -{ stdenv, fetchFromGitHub, coq, ncurses, which -, graphviz, withDoc ? false +{ stdenv, fetchFromGitHub, ncurses, which, graphviz, coq, + recurseIntoAttrs, withDoc ? false }: - -let param = - - if stdenv.lib.versionAtLeast coq.coq-version "8.7" then - { - version = "1.8.0"; - sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; - } - else if stdenv.lib.versionAtLeast coq.coq-version "8.6" then - { - version = "1.7.0"; - sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; - } - else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then - { - version = "1.6.1"; - sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; - } - else throw "No version of math-comp is available for Coq ${coq.coq-version}"; - -in - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-mathcomp-${version}"; - - # used in ssreflect - inherit (param) version; - - src = fetchFromGitHub { - owner = "math-comp"; - repo = "math-comp"; - rev = "mathcomp-${param.version}"; - inherit (param) sha256; +with builtins // stdenv.lib; +let + # sha256 of released mathcomp versions + mathcomp-sha256 = { + "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; + "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; }; - - nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - - enableParallelBuilding = true; - - buildFlags = stdenv.lib.optionalString withDoc "doc"; - - COQBIN = "${coq}/bin/"; - - preBuild = '' - patchShebangs etc/utils/ssrcoqdep || true - cd mathcomp - ''; - - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - '' + stdenv.lib.optionalString withDoc '' - make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ - ''; - - meta = with stdenv.lib; { - homepage = http://ssr.msr-inria.inria.fr/; - license = licenses.cecill-b; - maintainers = [ maintainers.vbgl maintainers.jwiegley ]; - platforms = coq.meta.platforms; + # versions of coq compatible with released mathcomp versions + mathcomp-coq-versions = { + "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; + "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; + "1.6.1" = flip elem ["8.5"]; }; + # computes the default version of mathcomp given a version of Coq + min-mathcomp-version = head (naturalSort (attrNames mathcomp-coq-versions)); + default-mathcomp-version = last (naturalSort ([min-mathcomp-version] + ++ (attrNames (filterAttrs (_: vs: vs coq.coq-version) mathcomp-coq-versions)))); - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; - }; + # list of core mathcomp packages sorted by dependency order + mathcomp-packages = + [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; + # compute the dependencies of the core package pkg + # (assuming the total ordering above, rewrite if necessary) + mathcomp-deps = pkg: if pkg == "single" then [] else + (split (x: x == pkg) mathcomp-packages).left; -} + # generic split function (TODO: move to lib?) + split = pred: l: + let loop = v: l: if l == [] then {left = v; right = [];} + else let hd = builtins.head l; tl = builtins.tail l; in + if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl; + in loop [] l; + + # exported, documented at the end. + mathcompGen = mkMathcompGenFrom (_: {}) mathcomp-packages; + + # exported, documented at the end. + mathcompGenSingle = mkMathcompGen (_: {}) "single"; + + # mkMathcompGen: internal mathcomp package generator + # returns {error = ...} if impossible to generate + # returns {${mathcomp-pkg} = } otherwise + mkMathcompGenFrom = o: l: mcv: fold (pkg: pkgs: pkgs // mkMathcompGen o pkg mcv) {} l; + mkMathcompGen = overrides: mathcomp-pkg: mathcomp-version: + let + coq-version-check = mathcomp-coq-versions.${mathcomp-version} or (_: false); + pkgpath = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp/${mathcomp-pkg}"; + pkgname = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp-${mathcomp-pkg}"; + pkgallMake = '' + echo "all.v" > Make + echo "-I ." >> Make + echo "-R . mathcomp.all" >> Make + ''; + + # the base set of attributes for mathcomp + attrs = rec { + name = "coq${coq.coq-version}-${pkgname}-${mathcomp-version}"; + + # used in ssreflect + version = mathcomp-version; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "math-comp"; + rev = "mathcomp-${mathcomp-version}"; + sha256 = mathcomp-sha256.${mathcomp-version}; + }; + + nativeBuildInputs = optionals withDoc [ graphviz ]; + buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + propagatedBuildInputs = [ coq ] ++ + attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version); + enableParallelBuilding = true; + + buildFlags = optionalString withDoc "doc"; + + COQBIN = "${coq}/bin/"; + + preBuild = '' + patchShebangs etc/utils/ssrcoqdep || true + cd ${pkgpath} + '' + optionalString (mathcomp-pkg == "all") pkgallMake; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + '' + optionalString withDoc '' + make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ + ''; + + meta = with stdenv.lib; { + homepage = http://ssr.msr-inria.inria.fr/; + license = licenses.cecill-b; + maintainers = [ maintainers.vbgl maintainers.jwiegley ]; + platforms = coq.meta.platforms; + }; + + passthru = { + compatibleCoqVersions = coq-version-check; + currentOverrides = overrides; + overrideMathcomp = moreOverrides: + (mkMathcompGen (old: let new = overrides old; in new // moreOverrides new) + mathcomp-pkg mathcomp-version).${mathcomp-pkg}; + mathcompGen = moreOverrides: + (mkMathcompGenFrom (old: let new = overrides old; in new // moreOverrides new) + mathcomp-packages mathcomp-version); + }; + }; + in + {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);}; + +getAttrOr = a: n: a."${n}" or (throw a.error); + +mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; +mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; +mathcompCorePkgs = recurseIntoAttrs + (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); + +in rec { +# mathcompGenSingle: given a version of mathcomp +# generates an attribute set {single = ;} with the single mathcomp derivation +inherit mathcompGenSingle; +mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; +mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; +mathcomp_single = dontDistribute + (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); + +# mathcompGen: given a version of mathcomp +# generates an attribute set {ssreflect = ; ... character = ; all = ;}. +# each of these have a special attribute overrideMathcomp which +# must be used instead of overrideAttrs in order to also fix the dependencies +inherit mathcompGen mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs; + +mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; +mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; +mathcomp = getAttrOr mathcompCorePkgs "all"; + +ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; + +} // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix new file mode 100644 index 00000000000..ef387985e06 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -0,0 +1,138 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp, coqPackages, + recurseIntoAttrs }: +with builtins // stdenv.lib; +let current-mathcomp = mathcomp; in +let +# configuring packages +param = { + finmap = { + version-sha256 = { + "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; + "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; + }; + description = "A finset and finmap library"; + }; + bigenough = { + version-sha256 = {"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";}; + description = "A small library to do epsilon - N reasonning"; + }; + multinomials = { + version-sha256 = { + "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; + "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; + "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + }; + analysis = { + version-sha256 = { + "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; + "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + description = "Analysis library compatible with Mathematical Components"; + }; +}; +versions = { + "1.8.0" = { + finmap.version = "1.2.0"; + bigenough.version = "1.0.0"; + analysis = { + version = "0.2.0"; + core-deps = with coqPackages; [ mathcomp_1_8-field ]; + extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; + }; + multinomials = { + version = "1.2"; + core-deps = with coqPackages; [ mathcomp_1_8-algebra ]; + extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; + }; + }; + "1.7.0" = { + finmap.version = "1.1.0"; + bigenough.version = "1.0.0"; + analysis = { + version = "0.1.0"; + core-deps = with coqPackages; [ mathcomp_1_7-field ]; + extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ]; + }; + multinomials = { + version = "1.1"; + core-deps = with coqPackages; [ mathcomp_1_7-algebra ]; + extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ]; + }; + }; +}; + +# generic package generator +packageGen = { + # optional arguments + src ? "", + owner ? "math-comp", + core-deps ? [ coqPackages.mathcomp-ssreflect ], + extra-deps ? [], + coq-versions ? ["8.6" "8.7" "8.8" "8.9"], + mathcomp ? current-mathcomp, + license ? mathcomp.meta.license, + # mandatory + package, version, version-sha256, description + }: + if version == "" then {} + else { "${package}" = + let from = src; in + + stdenv.mkDerivation rec { + inherit version; + name = "coq${coq.coq-version}-mathcomp-${mathcomp.version}-${package}-${version}"; + + src = if from == "" then fetchFromGitHub { + owner = owner; + repo = package; + rev = version; + sha256 = version-sha256."${version}"; + } else from; + + propagatedBuildInputs = [ coq mathcomp ] ++ extra-deps; + + installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + inherit description; + inherit license; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + inherit version-sha256; + compatibleCoqVersions = v: builtins.elem v coq-versions; + }; + };}; + +current-versions = versions."${current-mathcomp.version}" + or (throw "no mathcomp extra packages found for mathcomp ${current-mathcomp.version}"); + +select = x: mapAttrs (n: pkg: {package = n;} // pkg) + (recursiveUpdate (overrideExisting x param) x); + +all = (mapAttrs' (n: pkg: + {name = "mathcomp_1_7-${n}"; + value = (packageGen ({mathcomp = coqPackages.mathcomp_1_7;} // pkg))."${n}";}) + (select versions."1.7.0")) // + (mapAttrs' (n: pkg: + {name = "mathcomp_1_8-${n}"; + value = (packageGen ({mathcomp = coqPackages.mathcomp_1_8;} // pkg))."${n}";}) + (select versions."1.8.0")) // + (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( + mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) + (select current-versions)))); +in +{ +mathcompExtraGen = packageGen; +mathcomp_1_7-finmap_1_0 = + (packageGen (select {finmap = {version = "1.0.0"; + mathcomp = coqPackages.mathcomp_1_7;}; + }).finmap).finmap; +multinomials = all.mathcomp-multinomials; +} // all diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix deleted file mode 100644 index aa22c96256f..00000000000 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp }: - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-multinomials-${version}"; - version = "1.0"; - src = fetchFromGitHub { - owner = "math-comp"; - repo = "multinomials"; - rev = version; - sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; - }; - - buildInputs = [ coq ]; - propagatedBuildInputs = [ mathcomp ]; - - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; - - meta = { - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - inherit (src.meta) homepage; - license = stdenv.lib.licenses.cecill-b; - inherit (coq.meta) platforms; - }; - - passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; - }; -} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index ace2c5f2138..a6fa43df92f 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -34,17 +34,27 @@ let InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; math-classes = callPackage ../development/coq-modules/math-classes { }; - mathcomp = callPackage ../development/coq-modules/mathcomp { }; - mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis { }; - mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough { }; - mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap { }; + inherit (callPackage ../development/coq-modules/mathcomp { }) + mathcompGen mathcompGenSingle mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs + mathcomp mathcomp_1_7 mathcomp_1_8 ssreflect + mathcomp-ssreflect mathcomp-ssreflect_1_7 mathcomp-ssreflect_1_8 + mathcomp-fingroup mathcomp-fingroup_1_7 mathcomp-fingroup_1_8 + mathcomp-algebra mathcomp-algebra_1_7 mathcomp-algebra_1_8 + mathcomp-solvable mathcomp-solvable_1_7 mathcomp-solvable_1_8 + mathcomp-field mathcomp-field_1_7 mathcomp-field_1_8 + mathcomp-character mathcomp-character_1_7 mathcomp-character_1_8; + inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) + mathcompExtraGen + mathcomp-finmap mathcomp-bigenough mathcomp-analysis mathcomp-multinomials + mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis mathcomp_1_7-multinomials + mathcomp_1_7-finmap_1_0 + mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis mathcomp_1_8-multinomials + multinomials; metalib = callPackage ../development/coq-modules/metalib { }; - multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; simple-io = callPackage ../development/coq-modules/simple-io { }; - ssreflect = callPackage ../development/coq-modules/ssreflect { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; From 9388ca29fc0e8b59df08a2efdec8469ed986adf0 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Wed, 15 May 2019 14:47:43 +0000 Subject: [PATCH 162/637] packer: 1.3.3 -> 1.4.0 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5e54a8b3705..162ac045a9d 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.3"; + version = "1.4.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; + sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; }; meta = with stdenv.lib; { From 34e15b1c73553e958d8357681f6fb8ff8711646c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 May 2019 19:46:55 -0500 Subject: [PATCH 163/637] foundationdb: refactor 'vsmake' build system into its own file [NFC] FoundationDB is currently in the process of migrating to CMake, and it will eventually be the only build system. In preparation for this, split off the current (somewhat nasty) builder into its own file, and allow default.nix to be more declarative -- containing only the main supported versions. Similarly, a cmake.nix file will be added later. There is no functional change here (NFC), only an organizational change (file moves, no hash changes). Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 176 +------------------------ pkgs/servers/foundationdb/vsmake.nix | 177 ++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 171 deletions(-) create mode 100644 pkgs/servers/foundationdb/vsmake.nix diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 86c1b9065a9..f6a6329adb5 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -3,190 +3,24 @@ , which, findutils, m4, gawk , python, openjdk, mono, libressl -}: +}@args: let - # hysterical raisins dictate a version of boost this old. however, - # we luckily do not need to build anything, we just need the header - # files. - boost152 = stdenv49.mkDerivation rec { - name = "boost-headers-1.52.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; - }; - - makeFdb = - { version - , branch - , sha256 - - # the revision can be inferred from the fdb tagging policy - , rev ? "refs/tags/${version}" - - # in theory newer versions of fdb support newer compilers, but they - # don't :( maybe one day - , stdenv ? stdenv49 - - # in theory newer versions of fdb support newer boost versions, but they - # don't :( maybe one day - , boost ? boost152 - - # if an release is unofficial/a prerelease, then make sure this is set - , officialRelease ? true - }: stdenv.mkDerivation rec { - name = "foundationdb-${version}"; - inherit version; - - src = fetchFromGitHub { - owner = "apple"; - repo = "foundationdb"; - inherit rev sha256; - }; - - nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; - buildInputs = [ libressl boost ]; - - patches = - [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags - (if lib.versionAtLeast version "5.2" - then (if lib.versionAtLeast version "6.0" - then ./ldflags-6.0.patch - else ./ldflags-5.2.patch) - else ./ldflags-5.1.patch) - ] - # for 6.0+, we do NOT need to apply this version fix, since we can specify - # it ourselves. see configurePhase - ++ (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch) - # Versions less than 6.0 have a busted Python 3 build due to an outdated - # use of 'print'. Also apply an update to the six module with many bugfixes, - # which is in 6.0+ as well - ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { - name = "update-python-six.patch"; - url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch"; - sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85"; - })) - ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { - name = "import-for-python-print.patch"; - url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch"; - sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an"; - })) - ; - - postPatch = '' - # note: this does not do anything for 6.0+ - substituteInPlace ./build/scver.mk \ - --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ - --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" - - substituteInPlace ./Makefile \ - --replace 'shell which ccache' 'shell true' \ - --replace -Werror "" - - substituteInPlace ./Makefile \ - --replace libstdc++_pic libstdc++ - - substituteInPlace ./build/link-validate.sh \ - --replace 'exit 1' '#exit 1' - - patchShebangs . - '' + lib.optionalString (lib.versionAtLeast version "6.0") '' - substituteInPlace ./Makefile \ - --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \ - --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' - ''; - - separateDebugInfo = true; - enableParallelBuilding = true; - - makeFlags = [ "all" "fdb_java" "fdb_python" ] - # Don't compile FDBLibTLS if we don't need it in 6.0 or later; - # it gets statically linked in - ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] - # Needed environment overrides - ++ [ "KVRELEASE=1" - "NOSTRIP=1" - ] ++ lib.optional officialRelease [ "RELEASE=true" ]; - - # on 6.0 and later, we can specify all this information manually - configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' - export SOURCE_CONTROL=GIT - export SCBRANCH="${branch}" - export VERSION_ID="${rev}" - ''; - - installPhase = '' - mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb - - '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' - # we only copy the TLS library on < 6.0, since it's compiled-in otherwise - cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so - '' + '' - - # C API - cp -v ./lib/libfdb_c.so $lib/lib - cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb - cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb - cp -v ./fdbclient/vexillographer/fdb.options $dev/include/foundationdb - - # java - cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar - - # python - cp LICENSE ./bindings/python - substitute ./bindings/python/setup.py.in ./bindings/python/setup.py \ - --replace 'VERSION' "${version}" - rm -f ./bindings/python/setup.py.in - rm -f ./bindings/python/fdb/*.pth # remove useless files - rm -f ./bindings/python/*.rst ./bindings/python/*.mk - - cp -R ./bindings/python/ tmp-pythonsrc/ - tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ - - # binaries - for x in fdbbackup fdbcli fdbserver fdbmonitor; do - cp -v "./bin/$x" $out/bin; - done - - ln -sfv $out/bin/fdbbackup $out/bin/dr_agent - ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore - ln -sfv $out/bin/fdbbackup $out/bin/fdbdr - - ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent - ''; - - outputs = [ "out" "lib" "dev" "pythonsrc" ]; - - meta = with stdenv.lib; { - description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; - }; - }; - + vsmake = import ./vsmake.nix args; in with builtins; { - - foundationdb51 = makeFdb rec { + foundationdb51 = vsmake rec { version = "5.1.7"; branch = "release-5.1"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; }; - foundationdb52 = makeFdb rec { + foundationdb52 = vsmake rec { version = "5.2.8"; branch = "release-5.2"; sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; }; - foundationdb60 = makeFdb rec { + foundationdb60 = vsmake rec { version = "6.0.18"; branch = "release-6.0"; sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p"; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix new file mode 100644 index 00000000000..c782e0e9831 --- /dev/null +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -0,0 +1,177 @@ +# This builder is for FoundationDB's original, somewhat strange visual studio + +# make build system. In FoundationDB 6.1 and later, there's a new CMake system +# (which will eventually become the default version.) +{ stdenv49 +, lib, fetchurl, fetchpatch, fetchFromGitHub + +, which, findutils, m4, gawk +, python, openjdk, mono, libressl +}: + +let + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv49.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; + }; + + makeFdb = + { version + , branch + , sha256 + + # the revision can be inferred from the fdb tagging policy + , rev ? "refs/tags/${version}" + + # in theory newer versions of fdb support newer compilers, but they + # don't :( maybe one day + , stdenv ? stdenv49 + + # in theory newer versions of fdb support newer boost versions, but they + # don't :( maybe one day + , boost ? boost152 + + # if an release is unofficial/a prerelease, then make sure this is set + , officialRelease ? true + }: stdenv.mkDerivation rec { + name = "foundationdb-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + inherit rev sha256; + }; + + nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; + buildInputs = [ libressl boost ]; + + patches = + [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags + (if lib.versionAtLeast version "5.2" + then (if lib.versionAtLeast version "6.0" + then ./ldflags-6.0.patch + else ./ldflags-5.2.patch) + else ./ldflags-5.1.patch) + ] + # for 6.0+, we do NOT need to apply this version fix, since we can specify + # it ourselves. see configurePhase + ++ (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch) + # Versions less than 6.0 have a busted Python 3 build due to an outdated + # use of 'print'. Also apply an update to the six module with many bugfixes, + # which is in 6.0+ as well + ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { + name = "update-python-six.patch"; + url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch"; + sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85"; + })) + ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { + name = "import-for-python-print.patch"; + url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch"; + sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an"; + })) + ; + + postPatch = '' + # note: this does not do anything for 6.0+ + substituteInPlace ./build/scver.mk \ + --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ + --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" + + substituteInPlace ./Makefile \ + --replace 'shell which ccache' 'shell true' \ + --replace -Werror "" + + substituteInPlace ./Makefile \ + --replace libstdc++_pic libstdc++ + + substituteInPlace ./build/link-validate.sh \ + --replace 'exit 1' '#exit 1' + + patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "6.0") '' + substituteInPlace ./Makefile \ + --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \ + --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' + ''; + + separateDebugInfo = true; + enableParallelBuilding = true; + + makeFlags = [ "all" "fdb_java" "fdb_python" ] + # Don't compile FDBLibTLS if we don't need it in 6.0 or later; + # it gets statically linked in + ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] + # Needed environment overrides + ++ [ "KVRELEASE=1" + "NOSTRIP=1" + ] ++ lib.optional officialRelease [ "RELEASE=true" ]; + + # on 6.0 and later, we can specify all this information manually + configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' + export SOURCE_CONTROL=GIT + export SCBRANCH="${branch}" + export VERSION_ID="${rev}" + ''; + + installPhase = '' + mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb + + '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' + # we only copy the TLS library on < 6.0, since it's compiled-in otherwise + cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + '' + '' + + # C API + cp -v ./lib/libfdb_c.so $lib/lib + cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb + cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + cp -v ./fdbclient/vexillographer/fdb.options $dev/include/foundationdb + + # java + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar + + # python + cp LICENSE ./bindings/python + substitute ./bindings/python/setup.py.in ./bindings/python/setup.py \ + --replace 'VERSION' "${version}" + rm -f ./bindings/python/setup.py.in + rm -f ./bindings/python/fdb/*.pth # remove useless files + rm -f ./bindings/python/*.rst ./bindings/python/*.mk + + cp -R ./bindings/python/ tmp-pythonsrc/ + tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ + + # binaries + for x in fdbbackup fdbcli fdbserver fdbmonitor; do + cp -v "./bin/$x" $out/bin; + done + + ln -sfv $out/bin/fdbbackup $out/bin/dr_agent + ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore + ln -sfv $out/bin/fdbbackup $out/bin/fdbdr + + ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent + ''; + + outputs = [ "out" "lib" "dev" "pythonsrc" ]; + + meta = with stdenv.lib; { + description = "Open source, distributed, transactional key-value store"; + homepage = https://www.foundationdb.org; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; + }; +in makeFdb From a13a0c8de447cd77e9b922ee12e700824b855ce0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 12 May 2019 13:21:41 -0500 Subject: [PATCH 164/637] foundationdb: refactor vsmake patch application Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 39 +++++++++++++++++-- .../{ => patches}/fix-scm-version.patch | 0 .../{ => patches}/ldflags-5.1.patch | 0 .../{ => patches}/ldflags-5.2.patch | 0 .../{ => patches}/ldflags-6.0.patch | 0 pkgs/servers/foundationdb/vsmake.nix | 32 ++------------- 6 files changed, 39 insertions(+), 32 deletions(-) rename pkgs/servers/foundationdb/{ => patches}/fix-scm-version.patch (100%) rename pkgs/servers/foundationdb/{ => patches}/ldflags-5.1.patch (100%) rename pkgs/servers/foundationdb/{ => patches}/ldflags-5.2.patch (100%) rename pkgs/servers/foundationdb/{ => patches}/ldflags-6.0.patch (100%) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index f6a6329adb5..b9b091f8476 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -6,23 +6,54 @@ }@args: let - vsmake = import ./vsmake.nix args; + vsmakeBuild = import ./vsmake.nix args; + + python3-six-patch = fetchpatch { + name = "update-python-six.patch"; + url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch"; + sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85"; + }; + + python3-print-patch = fetchpatch { + name = "import-for-python-print.patch"; + url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch"; + sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an"; + }; + in with builtins; { - foundationdb51 = vsmake rec { + foundationdb51 = vsmakeBuild rec { version = "5.1.7"; branch = "release-5.1"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + + patches = [ + ./patches/ldflags-5.1.patch + ./patches/fix-scm-version.patch + python3-six-patch + python3-print-patch + ]; }; - foundationdb52 = vsmake rec { + foundationdb52 = vsmakeBuild rec { version = "5.2.8"; branch = "release-5.2"; sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; + + patches = [ + ./patches/ldflags-5.2.patch + ./patches/fix-scm-version.patch + python3-six-patch + python3-print-patch + ]; }; - foundationdb60 = vsmake rec { + foundationdb60 = vsmakeBuild rec { version = "6.0.18"; branch = "release-6.0"; sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p"; + + patches = [ + ./patches/ldflags-6.0.patch + ]; }; } diff --git a/pkgs/servers/foundationdb/fix-scm-version.patch b/pkgs/servers/foundationdb/patches/fix-scm-version.patch similarity index 100% rename from pkgs/servers/foundationdb/fix-scm-version.patch rename to pkgs/servers/foundationdb/patches/fix-scm-version.patch diff --git a/pkgs/servers/foundationdb/ldflags-5.1.patch b/pkgs/servers/foundationdb/patches/ldflags-5.1.patch similarity index 100% rename from pkgs/servers/foundationdb/ldflags-5.1.patch rename to pkgs/servers/foundationdb/patches/ldflags-5.1.patch diff --git a/pkgs/servers/foundationdb/ldflags-5.2.patch b/pkgs/servers/foundationdb/patches/ldflags-5.2.patch similarity index 100% rename from pkgs/servers/foundationdb/ldflags-5.2.patch rename to pkgs/servers/foundationdb/patches/ldflags-5.2.patch diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/patches/ldflags-6.0.patch similarity index 100% rename from pkgs/servers/foundationdb/ldflags-6.0.patch rename to pkgs/servers/foundationdb/patches/ldflags-6.0.patch diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index c782e0e9831..a834f04a086 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -1,8 +1,7 @@ # This builder is for FoundationDB's original, somewhat strange visual studio + # make build system. In FoundationDB 6.1 and later, there's a new CMake system # (which will eventually become the default version.) -{ stdenv49 -, lib, fetchurl, fetchpatch, fetchFromGitHub +{ stdenv49, lib, fetchurl, fetchFromGitHub , which, findutils, m4, gawk , python, openjdk, mono, libressl @@ -43,6 +42,8 @@ let # if an release is unofficial/a prerelease, then make sure this is set , officialRelease ? true + + , patches ? [] }: stdenv.mkDerivation rec { name = "foundationdb-${version}"; inherit version; @@ -56,32 +57,7 @@ let nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; buildInputs = [ libressl boost ]; - patches = - [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags - (if lib.versionAtLeast version "5.2" - then (if lib.versionAtLeast version "6.0" - then ./ldflags-6.0.patch - else ./ldflags-5.2.patch) - else ./ldflags-5.1.patch) - ] - # for 6.0+, we do NOT need to apply this version fix, since we can specify - # it ourselves. see configurePhase - ++ (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch) - # Versions less than 6.0 have a busted Python 3 build due to an outdated - # use of 'print'. Also apply an update to the six module with many bugfixes, - # which is in 6.0+ as well - ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { - name = "update-python-six.patch"; - url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch"; - sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85"; - })) - ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { - name = "import-for-python-print.patch"; - url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch"; - sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an"; - })) - ; - + inherit patches; postPatch = '' # note: this does not do anything for 6.0+ substituteInPlace ./build/scver.mk \ From 3f1c6801a2d30552c06079c97d3e427854f7029a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 May 2019 21:44:11 -0500 Subject: [PATCH 165/637] foundationdb: init 6.1.6pre4898_26fbbbf, cmake build This adds a new build of FoundationDB 6.1, using the new, much improved with CMake build system with fewer patches and rough edges. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/cmake.nix | 129 ++++++++++++++++++ pkgs/servers/foundationdb/default.nix | 31 ++++- .../foundationdb/patches/clang-libcxx.patch | 52 +++++++ .../patches/suppress-clang-warnings.patch | 34 +++++ pkgs/servers/foundationdb/test-list.txt | 80 +++++++++++ pkgs/servers/foundationdb/vsmake.nix | 1 + pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 1 + 8 files changed, 328 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/foundationdb/cmake.nix create mode 100644 pkgs/servers/foundationdb/patches/clang-libcxx.patch create mode 100644 pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch create mode 100644 pkgs/servers/foundationdb/test-list.txt diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix new file mode 100644 index 00000000000..ae693a49027 --- /dev/null +++ b/pkgs/servers/foundationdb/cmake.nix @@ -0,0 +1,129 @@ +# This builder is for FoundationDB CMake build system. + +{ lib, fetchurl, fetchpatch, fetchFromGitHub +, cmake, ninja, boost, python3, openjdk, mono, libressl + +, gccStdenv, llvmPackages +, useClang ? true +, ... +}: + +let + stdenv = if useClang then llvmPackages.libcxxStdenv else gccStdenv; + + tests = with builtins; + builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt); + + makeFdb = + { version + , branch + , sha256 + , rev ? "refs/tags/${version}" + , officialRelease ? true + , patches ? [] + }: stdenv.mkDerivation rec { + name = "foundationdb-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + inherit rev sha256; + }; + + buildInputs = [ libressl boost ]; + nativeBuildInputs = [ cmake ninja python3 openjdk mono ] + ++ lib.optional useClang [ llvmPackages.lld ]; + + separateDebugInfo = true; + enableParallelBuilding = true; + dontFixCmake = true; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBRESSL_USE_STATIC_LIBS=FALSE" + + # CMake can't find these easily for some reason? + "-DLIBRESSL_INCLUDE_DIR=${libressl.dev}" + "-DLIBRESSL_CRYPTO_LIBRARY=${libressl.out}/lib/libcrypto.so" + "-DLIBRESSL_SSL_LIBRARY=${libressl.out}/lib/libssl.so" + "-DLIBRESSL_TLS_LIBRARY=${libressl.out}/lib/libtls.so" + + # LTO brings up overall build time, but results in much smaller + # binaries for all users and the cache. + # + # TODO FIXME: bugs :( + (lib.optionalString (!useClang) "-DUSE_LTO=ON") + + # Gold helps alleviate the link time, especially when LTO is + # enabled. But even then, it still takes a majority of the time. + # Same with LLD when Clang is available. + (lib.optionalString useClang "-DUSE_LD=LLD") + (lib.optionalString (!useClang) "-DUSE_LD=GOLD") + ] + ++ lib.optional officialRelease [ "FDB_RELEASE=1" ]; + + inherit patches; + postPatch = '' + for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do + substituteInPlace $x --replace 'fdb_install' 'install' + done + ''; + + # the install phase for cmake is pretty wonky right now since it's not designed to + # coherently install packages as most linux distros expect -- it's designed to build + # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to + # cmake upstream to fix this, and if we do, i think most of this can go away. + postInstall = '' + mv $out/sbin/fdbserver $out/bin/fdbserver + rm -rf \ + $out/lib/systemd $out/Library $out/usr $out/sbin \ + $out/var $out/log $out/etc + + mv $out/fdbmonitor/fdbmonitor $out/bin/fdbmonitor && rm -rf $out/fdbmonitor + + rm -rf $out/lib/foundationdb/ + mkdir $out/libexec && ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent + + mkdir $out/include/foundationdb && \ + mv $out/include/*.h $out/include/*.options $out/include/foundationdb + + # move results into multi outputs + mkdir -p $dev $lib + mv $out/include $dev/include + mv $out/lib $lib/lib + + # python bindings + # NB: use the original setup.py.in, so we can substitute VERSION correctly + cp ../LICENSE ./bindings/python + substitute ../bindings/python/setup.py.in ./bindings/python/setup.py \ + --replace 'VERSION' "${version}" + rm -f ./bindings/python/setup.py.* ./bindings/python/CMakeLists.txt + rm -f ./bindings/python/fdb/*.pth # remove useless files + rm -f ./bindings/python/*.rst ./bindings/python/*.mk + + cp -R ./bindings/python/ tmp-pythonsrc/ + tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ + + # java bindings + mkdir -p $lib/share/java + mv lib/fdb-java-*.jar $lib/share/java/fdb-java.jar + + # include the tests + mkdir -p $out/share/test + (cd ../tests && for x in ${tests}; do + cp --parents $x $out/share/test + done) + ''; + + outputs = [ "out" "dev" "lib" "pythonsrc" ]; + + meta = with stdenv.lib; { + description = "Open source, distributed, transactional key-value store"; + homepage = https://www.foundationdb.org; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; + }; +in makeFdb diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b9b091f8476..790959f0a0d 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,12 +1,16 @@ -{ stdenv49 +{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8 , lib, fetchurl, fetchpatch, fetchFromGitHub -, which, findutils, m4, gawk -, python, openjdk, mono, libressl +, cmake, ninja, which, findutils, m4, gawk +, python, python3, openjdk, mono, libressl, boost }@args: let vsmakeBuild = import ./vsmake.nix args; + cmakeBuild = import ./cmake.nix (args // { + gccStdenv = gcc9Stdenv; + llvmPackages = llvmPackages_8; + }); python3-six-patch = fetchpatch { name = "update-python-six.patch"; @@ -21,6 +25,10 @@ let }; in with builtins; { + + # Older versions use the bespoke 'vsmake' build system + # ------------------------------------------------------ + foundationdb51 = vsmakeBuild rec { version = "5.1.7"; branch = "release-5.1"; @@ -56,4 +64,21 @@ in with builtins; { ./patches/ldflags-6.0.patch ]; }; + + # 6.1 and later versions should always use CMake + # ------------------------------------------------------ + + foundationdb61 = cmakeBuild rec { + version = "6.1.6pre4898_${substring 0 7 rev}"; + branch = "release-6.1"; + rev = "26fbbbf798971b2b9ecb882a8af766fa36734f53"; + sha256 = "1q1a1j8h0qlh67khcds0dg416myvjbp6gfm6s4sk8d60zfzny7wb"; + officialRelease = false; + + patches = [ + ./patches/clang-libcxx.patch + ./patches/suppress-clang-warnings.patch + ]; + }; + } diff --git a/pkgs/servers/foundationdb/patches/clang-libcxx.patch b/pkgs/servers/foundationdb/patches/clang-libcxx.patch new file mode 100644 index 00000000000..ebbacdf871e --- /dev/null +++ b/pkgs/servers/foundationdb/patches/clang-libcxx.patch @@ -0,0 +1,52 @@ +commit 7ed4745a092a203f92fc37ab5894e92117db0c94 +Author: Austin Seipp +Date: Sat May 4 15:23:35 2019 -0500 + + flow: fix a build failure with Clang/libcxx on Linux + + 11bd7d7da introduced a hack on Linux to work around a missing symbol in + libstdc++'s _pic library on Ubuntu. Unfortunately, this causes the build + to fail when using Clang, as it doesn't believe this symbol is part of + its headers in c++11 mode. + + Unfortunately there's no good way to distinguish libcxx from libstdc++ + with the preprocessor, so we merely gate it by only checking for clang, + iff we are on Linux. + + With this change, Clang 8.x can build FoundationDB on Linux using libcxx + as the standard C++ library. + + Signed-off-by: Austin Seipp + +diff --git a/flow/Platform.cpp b/flow/Platform.cpp +index 3d3f1ac0..9f21dfd4 100644 +--- a/flow/Platform.cpp ++++ b/flow/Platform.cpp +@@ -2841,13 +2841,26 @@ void setupSlowTaskProfiler() { + #endif + } + +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__clang__) + // There's no good place to put this, so it's here. + // Ubuntu's packaging of libstdc++_pic offers different symbols than libstdc++. Go figure. + // Notably, it's missing a definition of std::istream::ignore(long), which causes compilation errors + // in the bindings. Thus, we provide weak versions of their definitions, so that if the + // linked-against libstdc++ is missing their definitions, we'll be able to use the provided + // ignore(long, int) version. ++// ++// Note that this hack is DISABLED when we use Clang. It is only needed when we statically link ++// to the _pic libraries, but only official FDB Linux binaries are built this way using GCC. If we ++// don't use the _pic libraries, then this hack is entirely unneeded -- likely the case when using ++// Clang on Linux. ++// ++// Doing this allows us to use LLVM's libc++ with Clang on Linux -- otherwise, providing ++// a weak symbol definition for an internal (non-public) class member fails (due to that member ++// being non-existant on libc++.) See upstream GitHub issue #1533 for more information. ++// ++// TODO FIXME: Obliterate this when the official build environment is upgraded beyond Ubuntu 14.04. ++// (This problem should be fixed in later LTS releases.) ++ + #include + namespace std { + typedef basic_istream> char_basic_istream; diff --git a/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch b/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch new file mode 100644 index 00000000000..9d1ae992efc --- /dev/null +++ b/pkgs/servers/foundationdb/patches/suppress-clang-warnings.patch @@ -0,0 +1,34 @@ +commit 8076537a52bb026941f13f5542395aac69ef0825 +Author: Austin Seipp +Date: Sat May 4 17:34:51 2019 -0500 + + cmake: add workarounds for NixOS-specific deficiencies [NixOS] + + The NixOS debug builder hook adds '-Wa,--compress-debug-sections' to the + link flags (it actually adds it to the compiler flags, but the compiler + is used for linking, so...). This makes the compiler angry when -Werror + is passed, because it's unused at link-time (-Wa applies to the + assembler). Suppress this warning with -Wno-unused-command-line-argument + + NB: we *could* use -Wno-error=unused-command-line-argument, but that + still results in warnings anyway, just not fatal ones. We'd like to + remove them all for the sake of the build output. + + Signed-off-by: Austin Seipp + +diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake +index 03af9c10..7d059375 100644 +--- a/cmake/ConfigureCompiler.cmake ++++ b/cmake/ConfigureCompiler.cmake +@@ -119,6 +119,11 @@ else() + else() + add_compile_options(-Werror) + endif() ++ if (CLANG) ++ # aseipp: NixOS hack ++ add_compile_options(-Wno-unused-command-line-argument) ++ add_link_options(-Wno-unused-command-line-argument) ++ endif() + add_compile_options($<$:-Wno-pragmas>) + add_compile_options(-Wno-error=format + -Wunused-variable diff --git a/pkgs/servers/foundationdb/test-list.txt b/pkgs/servers/foundationdb/test-list.txt new file mode 100644 index 00000000000..3e9ce1428ad --- /dev/null +++ b/pkgs/servers/foundationdb/test-list.txt @@ -0,0 +1,80 @@ +fast/AtomicBackupCorrectness.txt +fast/AtomicBackupToDBCorrectness.txt +fast/AtomicOps.txt +fast/AtomicOpsApiCorrectness.txt +fast/BackupCorrectness.txt +fast/BackupCorrectnessClean.txt +fast/BackupToDBCorrectness.txt +fast/BackupToDBCorrectnessClean.txt +fast/CloggedSideband.txt +fast/ConstrainedRandomSelector.txt +fast/CycleAndLock.txt +fast/CycleTest.txt +fast/FuzzApiCorrectness.txt +fast/FuzzApiCorrectnessClean.txt +fast/IncrementTest.txt +fast/InventoryTestAlmostReadOnly.txt +fast/InventoryTestSomeWrites.txt +fast/KillRegionCycle.txt +fast/LongStackWriteDuringRead.txt +fast/LowLatency.txt +fast/MemoryLifetime.txt +fast/MoveKeysCycle.txt +fast/RandomSelector.txt +fast/RandomUnitTests.txt +fast/SelectorCorrectness.txt +fast/Sideband.txt +fast/SidebandWithStatus.txt +fast/SwizzledRollbackSideband.txt +fast/SystemRebootTestCycle.txt +fast/TaskBucketCorrectness.txt +fast/TimeKeeperCorrectness.txt +fast/Unreadable.txt +fast/VersionStamp.txt +fast/Watches.txt +fast/WriteDuringRead.txt +fast/WriteDuringReadClean.txt +rare/CheckRelocation.txt +rare/ClogUnclog.txt +rare/CloggedCycleWithKills.txt +rare/ConflictRangeCheck.txt +rare/ConflictRangeRYOWCheck.txt +rare/CycleRollbackClogged.txt +rare/CycleWithKills.txt +rare/FuzzTest.txt +rare/InventoryTestHeavyWrites.txt +rare/LargeApiCorrectness.txt +rare/LargeApiCorrectnessStatus.txt +rare/RYWDisable.txt +rare/RandomReadWriteTest.txt +rare/SwizzledLargeApiCorrectness.txt +slow/ApiCorrectness.txt +slow/ApiCorrectnessAtomicRestore.txt +slow/ApiCorrectnessSwitchover.txt +slow/ClogWithRollbacks.txt +slow/CloggedCycleTest.txt +slow/CloggedStorefront.txt +slow/CommitBug.txt +slow/ConfigureTest.txt +slow/CycleRollbackPlain.txt +slow/DDBalanceAndRemove.txt +slow/DDBalanceAndRemoveStatus.txt +slow/FastTriggeredWatches.txt +slow/LowLatencyWithFailures.txt +slow/MoveKeysClean.txt +slow/MoveKeysSideband.txt +slow/RyowCorrectness.txt +slow/Serializability.txt +slow/SharedBackupCorrectness.txt +slow/SharedBackupToDBCorrectness.txt +slow/StorefrontTest.txt +slow/SwizzledApiCorrectness.txt +slow/SwizzledCycleTest.txt +slow/SwizzledDdBalance.txt +slow/SwizzledRollbackTimeLapse.txt +slow/SwizzledRollbackTimeLapseIncrement.txt +slow/VersionStampBackupToDB.txt +slow/VersionStampSwitchover.txt +slow/WriteDuringReadAtomicRestore.txt +slow/WriteDuringReadSwitchover.txt +slow/ddbalance.txt diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index a834f04a086..9871afb0de6 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -5,6 +5,7 @@ , which, findutils, m4, gawk , python, openjdk, mono, libressl +, ... }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2dab6fdba3..c923ff2d9b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3026,7 +3026,9 @@ in inherit (fdbPackages) foundationdb51 foundationdb52 - foundationdb60; + foundationdb60 + foundationdb61 + ; foundationdb = foundationdb60; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a32ce674fbf..a70f5309d4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5528,6 +5528,7 @@ in { foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; + foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; From c55b9236f0f208a8689e400ddbea52858c923372 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 01:48:16 -0500 Subject: [PATCH 166/637] nixos: add services.foundationdb.traceFormat option This allows us to specify JSON trace logging, which is useful for tooling to injest/transform logs. Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index ad24f9f4b0f..1505f92e751 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -35,6 +35,7 @@ let ${optionalString (cfg.class != null) "class = ${cfg.class}"} memory = ${cfg.memory} storage_memory = ${cfg.storageMemory} + trace_format = ${cfg.traceFormat} ${optionalString (cfg.tls != null) '' tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so @@ -317,6 +318,12 @@ in default = "/run/foundationdb.pid"; description = "Path to pidfile for fdbmonitor."; }; + + traceFormat = mkOption { + type = types.enum [ "xml" "json" ]; + default = "xml"; + description = "Trace logging format."; + }; }; config = mkIf cfg.enable { From 427f1e58a47509406ef23c58dcd607aa0d8f11cd Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 17:54:33 -0500 Subject: [PATCH 167/637] nixos/foundationdb: chmod 0770 for logs/data files Slight oversight: this allows members of the FoundationDB group to read logs. Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 1505f92e751..0c7a9d02432 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -389,7 +389,7 @@ in chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile} for x in "${cfg.logDir}" "${cfg.dataDir}"; do - [ ! -d "$x" ] && mkdir -m 0700 -vp "$x"; + [ ! -d "$x" ] && mkdir -m 0770 -vp "$x"; chown -R ${cfg.user}:${cfg.group} "$x"; done From 2525b88c80cb5d3ea568ebde0b3a241033fbd2ef Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 14 May 2019 17:55:19 -0500 Subject: [PATCH 168/637] nixos/foundationdb: default to ssd storage engine Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 0c7a9d02432..169ed37b348 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -411,7 +411,7 @@ in postStart = '' if [ -e "${cfg.dataDir}/.first_startup" ]; then - fdbcli --exec "configure new single memory" + fdbcli --exec "configure new single ssd" rm -f "${cfg.dataDir}/.first_startup"; fi ''; From befad4b32d472789b2bf3d202d92b5f045436c2c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 13 May 2019 15:19:49 +0300 Subject: [PATCH 169/637] phpPackages.pinba: init at 1.1.1 --- pkgs/top-level/php-packages.nix | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2cbdd0aee5c..1cc57ad833b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -380,6 +380,50 @@ let }; }; + pinba = if isPhp73 then pinba73 else pinba7; + + pinba7 = assert !isPhp73; buildPecl rec { + version = "1.1.1"; + pname = "pinba"; + + src = pkgs.fetchFromGitHub { + owner = "tony2001"; + repo = "pinba_extension"; + rev = "RELEASE_1_1_1"; + sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + }; + + meta = with pkgs.lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + }; + }; + + pinba73 = assert isPhp73; buildPecl rec { + version = "1.1.2-dev"; + pname = "pinba"; + + src = pkgs.fetchFromGitHub { + owner = "tony2001"; + repo = "pinba_extension"; + rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; + sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + }; + + meta = with pkgs.lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + }; + }; + psysh = mkDerivation rec { version = "0.9.9"; pname = "psysh"; From 91872f537caaec7118fe4c66209045ae211fa2dc Mon Sep 17 00:00:00 2001 From: Rostyslav Kurylo Date: Sat, 12 Jan 2019 15:35:10 +0200 Subject: [PATCH 170/637] saleae-logic: 1.2.10 -> 1.2.28 The older 1.2.10 version does not support new Saleae devices well. i686 platform was removed because Saleae stopped providing 32-bit builds since 1.2.11. --- .../tools/misc/saleae-logic/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 18ffc238f0d..779f6c76fef 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig, runtimeShell +, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL }: let @@ -17,30 +17,23 @@ let libPath = stdenv.lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib + dbus libGL ]; in +assert stdenv.hostPlatform.system == "x86_64-linux"; + stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.10"; + version = "1.2.28"; name = "${pname}-${version}"; - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - name = "saleae-logic-${version}-32bit.zip"; - url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; - sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - name = "saleae-logic-${version}-64bit.zip"; - url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; - } - else - throw "Saleae Logic software requires i686-linux or x86_64-linux"; + src = fetchurl { + name = "saleae-logic-${version}-64bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; + sha256 = "0apq8hmn39k0ads4xy8iyy9rp8bvia60mh7a944rk1gjpqv227g5"; + }; desktopItem = makeDesktopItem { name = "saleae-logic"; @@ -61,7 +54,15 @@ stdenv.mkDerivation rec { # Patch it patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" + for bin in "$out/Logic" \ + "$out/libQt5Widgets.so.5" \ + "$out/libQt5Gui.so.5" \ + "$out/libQt5Core.so.5" \ + "$out/libQt5Network.so.5" ; do + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" + done + + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } From 63a304b234d05c3ef4ac5d9db2621348e1040086 Mon Sep 17 00:00:00 2001 From: Daniel Fabian Date: Sun, 14 Apr 2019 01:39:28 +0100 Subject: [PATCH 171/637] browsh: 1.4.13 -> 1.5.0 --- pkgs/applications/networking/browsers/browsh/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index a910f1d14bd..430642d8349 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let - version = "1.4.13"; + version = "1.5.0"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "11477z7mva8lwfxsrfxckvgqkxrjhc80czra8cqhpakf0fih1a4g"; + sha256 = "063m6rcdyf2zcrswkm56k8h3w15124bw5iykklzm60q5jk4ywn3f"; }; in buildGoPackage rec { @@ -18,18 +18,19 @@ in buildGoPackage rec { goPackagePath = "browsh"; + # further go package dependencies are defined in deps.nix, see line below. src = fetchFromGitHub { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "0lvb20zziknlbgy509ccpvlc21sqjc53xar26blmb6sdl6yqkj0w"; + sha256 = "14addyb1zdk1b9mizfxdagyzlkd9nf5gawnbrs44j5a3ggnl14ln"; }; buildInputs = [ go-bindata ]; # embed the web extension in a go file and place it where it's supposed to # be. See - # https://github.com/browsh-org/browsh/blob/9abc3aaa3f575ca6ec9a483408d9fdfcf76300fa/interfacer/contrib/xpi2bin.sh + # https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh preBuild = '' xpiprefix="$(mktemp -d)" cp "${webext}" "$xpiprefix/browsh.xpi" From 582fd549fb2d1e31134ce76e1e1f1c9b7cac5725 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Tue, 14 May 2019 22:26:33 +0200 Subject: [PATCH 172/637] winstone: drop package and service Close #56294 Upstream package is unmaintained for years and nixpkgs provides alternatives --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../modules/services/web-servers/winstone.nix | 129 ------------------ pkgs/servers/http/winstone/default.nix | 26 ---- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 nixos/modules/services/web-servers/winstone.nix delete mode 100644 pkgs/servers/http/winstone/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a66747f0384..434cb69868c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -793,7 +793,6 @@ ./services/web-servers/traefik.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix - ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix ./services/x11/colord.nix ./services/x11/compton.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aa3d120c97f..b2c030fb779 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -210,6 +210,7 @@ with lib; (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix deleted file mode 100644 index 064ead5ce4b..00000000000 --- a/nixos/modules/services/web-servers/winstone.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.winstone; - - winstoneOpts = { name, ... }: { - options = { - name = mkOption { - default = name; - internal = true; - }; - - serviceName = mkOption { - type = types.str; - description = '' - The name of the systemd service. By default, it is - derived from the winstone instance name. - ''; - }; - - warFile = mkOption { - type = types.str; - description = '' - The WAR file that Winstone should serve. - ''; - }; - - javaPackage = mkOption { - type = types.package; - default = pkgs.jre; - defaultText = "pkgs.jre"; - description = '' - Which Java derivation to use for running Winstone. - ''; - }; - - user = mkOption { - type = types.str; - description = '' - The user that should run this Winstone process and - own the working directory. - ''; - }; - - group = mkOption { - type = types.str; - description = '' - The group that will own the working directory. - ''; - }; - - workDir = mkOption { - type = types.str; - description = '' - The working directory for this Winstone instance. Will - contain extracted webapps etc. The directory will be - created if it doesn't exist. - ''; - }; - - extraJavaOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the java process running - Winstone. - ''; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the Winstone process. - ''; - }; - }; - - config = { - workDir = mkDefault "/run/winstone/${name}"; - serviceName = mkDefault "winstone-${name}"; - }; - }; - - mkService = cfg: let - opts = concatStringsSep " " (cfg.extraOptions ++ [ - "--warfile ${cfg.warFile}" - ]); - - javaOpts = concatStringsSep " " (cfg.extraJavaOptions ++ [ - "-Djava.io.tmpdir=${cfg.workDir}" - "-jar ${pkgs.winstone}/lib/winstone.jar" - ]); - in { - wantedBy = [ "multi-user.target" ]; - description = "winstone service for ${cfg.name}"; - preStart = '' - mkdir -p "${cfg.workDir}" - chown ${cfg.user}:${cfg.group} "${cfg.workDir}" - ''; - serviceConfig = { - ExecStart = "${cfg.javaPackage}/bin/java ${javaOpts} ${opts}"; - User = cfg.user; - PermissionsStartOnly = true; - }; - }; - -in { - - options = { - services.winstone = mkOption { - default = {}; - type = with types; attrsOf (submodule winstoneOpts); - description = '' - Defines independent Winstone services, each serving one WAR-file. - ''; - }; - }; - - config = mkIf (cfg != {}) { - - systemd.services = mapAttrs' (n: c: nameValuePair c.serviceName (mkService c)) cfg; - - }; - -} diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix deleted file mode 100644 index 6a92c0a228a..00000000000 --- a/pkgs/servers/http/winstone/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "winstone-${version}"; - version = "0.9.10"; - - src = fetchurl { - url = "mirror://sourceforge/winstone/${name}.jar"; - sha256 = "17xvq3yk95335c6ag1bmbmxlvh7gqq35ifi64r2l6rnvrf6pqyan"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib - cp $src $out/lib/winstone.jar - ''; - - meta = { - homepage = http://winstone.sourceforge.net/; - description = "A simple Java Servlet container"; - license = stdenv.lib.licenses.cddl; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..805118ff3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4885,7 +4885,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -14726,7 +14726,7 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = callPackage ../servers/http/winstone { }; + winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; xinetd = callPackage ../servers/xinetd { }; From aba46ce1443ba4b5be71585f2ca12020b9a6d342 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 May 2019 11:53:46 -0700 Subject: [PATCH 173/637] cocoapods: 1.6.1 -> 1.6.2 --- pkgs/development/mobile/cocoapods/Gemfile.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9145ca18188..37915b87431 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.1) + cocoapods (1.6.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.1) + cocoapods-core (= 1.6.2) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.1, < 2.0) - cocoapods-core (1.6.1) + cocoapods-core (1.6.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.2) + xcodeproj (1.9.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index de6c524633f..6ef71592bb5 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37"; + sha256 = "1f2xdcar9yk3x4v18pjh3rnn489h252wh3llxx39ig18pcijwzmg"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh"; + sha256 = "052fwscc9k3pvka6y8c2mh8i7wm6a6jk44b236krj33jyzk0z2vw"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; + sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.0"; }; } \ No newline at end of file From 655e9dcfd8c7a350b36c8bfdc10bcd108f3edded Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 12 May 2019 02:08:16 -0400 Subject: [PATCH 174/637] g2o: init at 2019-04-07 --- pkgs/development/libraries/g2o/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/g2o/default.nix diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix new file mode 100644 index 00000000000..1486b5bfc55 --- /dev/null +++ b/pkgs/development/libraries/g2o/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }: + +stdenv.mkDerivation rec { + pname = "g2o"; + version = "unstable-2019-04-07"; + + src = fetchFromGitHub { + owner = "RainerKuemmerle"; + repo = pname; + rev = "9b41a4ea5ade8e1250b9c1b279f3a9c098811b5a"; + sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen suitesparse ]; + + meta = { + description = "A General Framework for Graph Optimization"; + homepage = "https://github.com/RainerKuemmerle/g2o"; + license = with lib.licenses; [ bsd3 lgpl3 gpl3 ]; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bca0461518..037d3e87ab3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,6 +1525,8 @@ in fzy = callPackage ../tools/misc/fzy { }; + g2o = callPackage ../development/libraries/g2o { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; gdrivefs = python27Packages.gdrivefs; From f61bb1b7ed585cd2a2ffe086f74b212f96af34b8 Mon Sep 17 00:00:00 2001 From: elseym Date: Wed, 15 May 2019 21:44:38 +0200 Subject: [PATCH 175/637] documize-community: 2.4.1 -> 2.5.0 --- pkgs/servers/documize-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 2df90546311..06db6dec50d 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1spj8awyv37gmrm49py3wz7590r7rz63qizgifdzjbvacadavm0c"; + sha256 = "14v66jwxg6akllbz8lsqplxalr73jff5453nigcnb4vzwwkz2wq3"; }; goPackagePath = "github.com/documize/community"; From 0ff5e227afedd5142f93f2d7c162ec33f642e459 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 May 2019 12:46:29 -0700 Subject: [PATCH 176/637] gegl_0_4: 0.4.14 -> 0.4.16 (#61292) * gegl_0_4: 0.4.14 -> 0.4.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gegl/versions * gegl_0_4: drop Darwin patches They were merged upstream and shipped with v0.4.16 --- pkgs/development/libraries/gegl/4.0.nix | 32 +++---------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index da20438fb4b..4215f0ebc30 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,45 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which +{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw , gexiv2, libwebp, gnome3, libintl }: stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.14"; + version = "0.4.16"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac"; + sha256 = "0njydcr6qdmfzh4fxx544681qxdpf7y6b2f47jcypn810dlxy4h1"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ - # Make the Darwin patches below apply cleanly - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch; - sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch; - sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch; - sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b"; - }) - # Fix build on Darwin - # https://gitlab.gnome.org/GNOME/gegl/merge_requests/28 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch; - sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch; - sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2"; - }) - ]; - enableParallelBuilding = true; doCheck = true; From ffd371164fc9042ea360fb196f88d2c71301332b Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 May 2019 13:02:02 -0700 Subject: [PATCH 177/637] cocoapods-beta: 1.7.0.rc.1 -> 1.7.0.rc.2 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 6 +++--- pkgs/development/mobile/cocoapods/gemset-beta.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 64eb87294a4..c9b27c36678 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.0.rc.1) + cocoapods (1.7.0.rc.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.0.rc.1) + cocoapods-core (= 1.7.0.rc.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.0.rc.1) + cocoapods-core (1.7.0.rc.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index e5841c4d2d3..643760a91c0 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdy3kjlz121i6b0njq09xz6wvw6l6pkwabgswbmk5b8m74q97ml"; + sha256 = "0s9kqrmlvmgyd9aqrv89lg1ccspbk9hw2qx3fpb56xff1zk69gwf"; type = "gem"; }; - version = "1.7.0.rc.1"; + version = "1.7.0.rc.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7zb0afy49hb24mfg8ypdsbk6j1sr9m8bwqm8p11w4113wbv95w"; + sha256 = "0x940n7ifn8fpr9siicqassryarg13sxh6nmi3cgbbdmnd1ic8b1"; type = "gem"; }; - version = "1.7.0.rc.1"; + version = "1.7.0.rc.2"; }; cocoapods-deintegrate = { groups = ["default"]; From 0ef2bbfd0ba2b2c0db6f5f4e01f8d8c2e556b329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 12 May 2019 23:55:19 +0200 Subject: [PATCH 178/637] haskell: servant: Don't hardcode $doc. Until now this broke on `enableSeparateDocOutput = false`, as then `$doc` was not defined so it tried to copy stuff to `/share/doc/servant`. Fixes regression introduced in commit be63b1994d75e826eb2ba2b9e319f1f25be8b725. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1ab376ab103..ba1e461feab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -765,7 +765,7 @@ self: super: { }; in overrideCabal super.servant (old: { postInstall = old.postInstall or "" + '' - ln -s ${docs} $doc/share/doc/servant + ln -s ${docs} ''${!outputDoc}/share/doc/servant ''; }); From 6dc34b838472429d4179d0c6fc298a234b81dce6 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 May 2019 14:46:56 -0700 Subject: [PATCH 179/637] bat: 0.10.0 -> 0.11.0 Also add myself as a maintainer, and set platforms to `all`. --- pkgs/tools/misc/bat/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 9fc84504f53..205bc196811 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -3,18 +3,18 @@ }: rustPlatform.buildRustPackage rec { - name = "bat-${version}"; - version = "0.10.0"; + pname = "bat"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sharkdp"; - repo = "bat"; + repo = pname; rev = "v${version}"; - sha256 = "1q22lbyrwh58vhznpjpkiaa8v4qv6a3a8lrxzaypd8wg78p9dca6"; + sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw"; fetchSubmodules = true; }; - cargoSha256 = "0npj2rf4vr45gq3qwqq6kqnv9dh58v5lpx0gsmy2qrq44dxb75rq"; + cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517"; nativeBuildInputs = [ cmake pkgconfig zlib ]; @@ -22,13 +22,14 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 + install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish ''; meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = https://github.com/sharkdp/bat; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ dywedir lilyball ]; + platforms = platforms.all; }; } From 1ec1bdd4c969486c5110ce74123f02b48a082212 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Apr 2019 17:14:47 -0500 Subject: [PATCH 180/637] libertinus: 6.6 -> 6.8 Notes: https://github.com/libertinus-fonts/libertinus/releases/tag/v6.8 https://github.com/libertinus-fonts/libertinus/releases/tag/v6.7 * update repo "owner", moved * don't try to build since we don't mean to :) * update for font cleanup PR (thanks!) --- pkgs/data/fonts/libertinus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 246d4a91a96..23c233b5893 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub }: let - version = "6.6"; + version = "6.8"; in fetchFromGitHub rec { name = "libertinus-${version}"; - owner = "khaledhosny"; + owner = "libertinus-fonts"; repo = "libertinus"; rev = "v${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype *.otf install -m444 -Dt $out/share/doc/${name} *.txt ''; - sha256 = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m"; + sha256 = "0iwbw3sw8rcsifpzw72g3cz0a960scv7cib8mwrw53282waqq2gc"; meta = with lib; { description = "A fork of the Linux Libertine and Linux Biolinum fonts"; @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/khaledhosny/libertinus; + homepage = https://github.com/libertinus-fonts/libertinus; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; From 2cd3768d5473e04c3ac66f234b22f70763a80735 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 13 May 2019 15:05:00 -0500 Subject: [PATCH 181/637] nodejs-12_x: 12.1.0 -> 12.2.0 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index d087e7dea99..66133b432ee 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.1.0"; - sha256 = "1efb792c689fed2e028025e1398e84193281f329427a17a62b0bffee8e771395"; + version = "12.2.0"; + sha256 = "10vr8yqrvdmcaszg7l7cjchzzik709vcygcnpkjf2sjhz929glf5"; } From 51202e96fab4f8f93115d33351f9c5b0044be6f0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 16:59:26 -0500 Subject: [PATCH 182/637] nasc: 0.5.2 -> 0.5.4 https://github.com/parnold-x/nasc/releases/tag/0.5.4 https://github.com/parnold-x/nasc/releases/tag/0.5.3 --- pkgs/applications/science/math/nasc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index beed2de9759..c2f8ba1d55e 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nasc"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "parnold-x"; repo = pname; rev = version; - sha256 = "009xmlsgl7r6wp6sczbdp8sjqqd6k2mychx5b4zn7wnrl7435y5y"; + sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; }; nativeBuildInputs = [ From 30a938644406becd8a0101886b4dad0cae09d73b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 17:05:31 -0500 Subject: [PATCH 183/637] horst: 5.0 -> 5.1, cleanup a bit 5.1 from back in 2017, unrelated to kernel number these days :). --- pkgs/tools/networking/horst/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index c7d06274bea..ba76c37a4bb 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { name = "horst-${version}"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "br101"; repo = "horst"; - rev = "version-${version}"; - sha256 = "0m7gc6dj816z8wyq5bdkqj7fw6rmxaah84s34ncsaispz2llva1x"; + rev = "v${version}"; + sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses libnl ]; - installPhase = '' - mkdir -p $out/bin - mv horst $out/bin - - mkdir -p $out/man/man1 - cp horst.1 $out/man/man1 - ''; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; From 9e90275466667fb866bf3d1e57d3213a581efb80 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 14:00:06 -0500 Subject: [PATCH 184/637] dbeaver: 6.0.3 -> 6.0.4 --- 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 2552cf18f07..fc0c39b13cc 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 = "6.0.3"; + version = "6.0.4"; 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 = "0pcf8p9nmbj6kf32zrjjrfyxb07x37h56zm3s5gdf1jk2hvrarvl"; + sha256 = "1b3yv91bvwrkln63asn6ybkdhzb8pibz55rr99rv0z8rbmwnbjpn"; }; installPhase = '' From 6863ef2c80c87b3670d63ac5c909b5290da66478 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 03:56:35 -0500 Subject: [PATCH 185/637] vte: 0.56.2 -> 0.56.3 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 33262325674..273072e9323 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.56.2"; + version = "0.56.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dyj2dqbzap37dvjax6vy2kwfqsw9d1hrc4ji33lha3mk1q3b5bf"; + sha256 = "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p"; }; passthru = { From e9568d3b01fd35fdd60f12f07338efc92bc09e22 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 03:19:45 -0500 Subject: [PATCH 186/637] git-lfs: 2.5.2 -> 2.7.2 --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 67c07072d41..92ba5738250 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.5.2"; + version = "2.7.2"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck"; + sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc"; }; preBuild = '' From cb1cf0959d0c42a274581064959bf23d33291db8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 6 May 2019 08:44:40 -0500 Subject: [PATCH 187/637] discount: 2.2.4 -> 2.2.6, tests Now using the GitHub source. https://github.com/Orc/discount/releases/tag/v2.2.5 https://github.com/Orc/discount/releases/tag/v2.2.6 --- pkgs/tools/text/discount/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 69fce7a109c..34e1c3b0ace 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.4"; - name = "discount-${version}"; + version = "2.2.6"; + pname = "discount"; - src = fetchurl { - url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; - sha256 = "199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl"; + src = fetchFromGitHub { + owner = "Orc"; + repo = pname; + rev = "v${version}"; + sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w"; }; patches = ./fix-configure-path.patch; @@ -19,6 +21,8 @@ stdenv.mkDerivation rec { "--with-fenced-code" ]; + doCheck = true; + meta = with stdenv.lib; { description = "Implementation of Markdown markup language in C"; homepage = http://www.pell.portland.or.us/~orc/Code/discount/; From 11a7e02e583c919897996e6cabb3e25a9322ec6c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 18:38:01 -0500 Subject: [PATCH 188/637] termite: 14 -> 15 --- pkgs/applications/misc/termite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 22f669f0329..1a02d4837fe 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "thestinger"; repo = "termite"; rev = "v${version}"; - sha256 = "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x"; + sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k"; fetchSubmodules = true; }; From 0c9f0c8823000067eb80ad3139378291b8572f24 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:06:55 -0400 Subject: [PATCH 189/637] gnome3.evolution: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/evolution/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a423dd85887..83202a75c26 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq"; + sha256 = "1sb60zhdawza33zlp0n3hbd7mq43a4y09jmkphpnxdifypfkar55"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; From 5a12e68b0d0e32a9a0964034446622e5daad548c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:07:35 -0400 Subject: [PATCH 190/637] gnome3.gedit: 3.32.0 -> 3.32.2 https://gitlab.gnome.org/GNOME/gedit/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index f767e309a65..532e8dcb0f0 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; + sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; nativeBuildInputs = [ From 6377960911c67744695e6354a6abc345b618c432 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:08:33 -0400 Subject: [PATCH 191/637] gnome3.gnome-boxes: 3.32.0.2 -> 3.32.1 https://gitlab.gnome.org/GNOME/gnome-boxes/blob/v3.32.1/NEWS --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index a983c59d192..3b68bec7585 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.32.0.2"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk"; + sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; doCheck = true; From 977c921e0e1311271226d701af17451160f13077 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:09:04 -0400 Subject: [PATCH 192/637] gnome3.gnome-calendar: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-calendar/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 3244fa639c2..03619f38c9b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wip968nvp1yj34hbpc3wjbrmrgjm1f82ag5ngv90z38953vi9vl"; + sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k"; }; passthru = { From 5cd950982ec43a6d888088f655a467efdd7de3fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:09:43 -0400 Subject: [PATCH 193/637] gnome3.gnome-maps: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b3b9fb0dddd..a059ec3ac3c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0"; + sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx"; }; doCheck = true; From f82dd09e928def459a401d203bfb53a9a451956d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:10:13 -0400 Subject: [PATCH 194/637] gnome3.gnome-music: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-music/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 4e601849a35..1f1bfafb595 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.32.1"; + version = "3.32.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4"; + sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From 9ac96f7a53a7cc6b5557937107c769db25084767 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:11:06 -0400 Subject: [PATCH 195/637] gnome3.gnome-software: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-software/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index f71df437d11..ab4b360221e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0xxhvyqfwlcyvlqc36rpcili00dpwy8b5c5klaqccn5qrc87rl38"; + sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx"; }; patches = [ From dfdc2553a3e257b04effa50f38a70559e35bf573 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:12:05 -0400 Subject: [PATCH 196/637] gnome3.gnome-terminal: 3.32.1 -> 3.32.2 --- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 9b25ae9218d..77a630261fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x"; + sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; buildInputs = [ From a83155c9df7eb77eac8c4d49b480c391624f26c8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:12:57 -0400 Subject: [PATCH 197/637] gnome3.gnome-user-docs: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-user-docs/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 02bcb52b387..d9f93862143 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw"; + sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c"; }; passthru = { From 9dfeb1e5769266a8e85432f41b40c2e858237e0e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:14:28 -0400 Subject: [PATCH 198/637] gnome3.nautilus: 3.32.0 -> 3.32.1 Fixes CVE-2019-11461 https://gitlab.gnome.org/GNOME/nautilus/blob/3.32.1/NEWS --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 688e8cc9365..2eeb77db0c6 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -7,13 +7,13 @@ let pname = "nautilus"; - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2"; + sha256 = "0vmrvimv4183l3ij4kv0ir2c9rfzk7gh3xc2pa4wkqq9kn7h6m7s"; }; nativeBuildInputs = [ From 51636785c1c710e123a15d66f3a2d2f31ed6db6f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:15:25 -0400 Subject: [PATCH 199/637] gnome3.simple-scan: 3.32.2 -> 3.32.2.1 Just translations. https://gitlab.gnome.org/GNOME/simple-scan/blob/3.32.2.1/NEWS --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ad2ac5d6e69..047e79e14e5 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.32.2"; + version = "3.32.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k"; + sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; buildInputs = [ From acd125c0f18dd1856e4a01934b901220a2997aea Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:16:31 -0400 Subject: [PATCH 200/637] gnome3.yelp: 3.32.1 -> 3.32.2 Just translations. https://gitlab.gnome.org/GNOME/yelp/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index ecbb7b277ff..24a49413960 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r"; + sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; From 386fb53a26dad61b43d80747e753249f439dde5d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:16:58 -0400 Subject: [PATCH 201/637] gnome3.yelp-tools: 3.32.0 -> 3.32.1 https://gitlab.gnome.org/GNOME/yelp-tools/blob/3.32.1/NEWS --- pkgs/desktops/gnome-3/core/yelp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 41120a74b08..d6ed0c22e4b 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz"; + sha256 = "1qrn8ss3wc601w8j0ziicgmgic0yh01az6611n3jgd7wll9c79wr"; }; passthru = { From dcaf2ef73f56559ff0786cd06bc388a14481c704 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:17:32 -0400 Subject: [PATCH 202/637] gnome3.gnome-mines: 3.32.0 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-mines/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 9ceb65f8308..b2c8e99e823 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj"; + sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; # gobject-introspection for finding vapi files From 743df678c2c711f2685b4e13433c0ddd861fb944 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:22:07 -0400 Subject: [PATCH 203/637] gnome3.gjs: 1.56.1 -> 1.56.2 https://gitlab.gnome.org/GNOME/gjs/blob/1.56.2/NEWS --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 25c3cef3f6a..ef4de369915 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.56.1"; + version = "1.56.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937"; + sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; passthru = { From 166bb809f393194277d7c0e175242d041ceb0c5f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:26:40 -0400 Subject: [PATCH 204/637] gnome3.metacity: 3.30.1 -> 3.32.0 https://gitlab.gnome.org/GNOME/metacity/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index c42356aa16a..8b1d2b05df1 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -16,13 +16,13 @@ let pname = "metacity"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12kr472gblx7jxh9rvnamy09bkg29ms2pgc0c3373piqmavi24qg"; + sha256 = "177dmb1smizfgkddk49n2kr90graj9r6xw5hg3aq0y2qqg6v4rcg"; }; patches = [ From 6ec263488ae18f42b658d85ac22f31322404635c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:28:15 -0400 Subject: [PATCH 205/637] gnome3.gnome-applets: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-applets/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index de0d70ae42f..7bb162b7b8b 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -26,13 +26,13 @@ let pname = "gnome-applets"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cvl32486kqw301wy40l1a1sdhanra7bx4smq0a3lmnl3x01zg43"; + sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { doCheck = true; configureFlags = [ - "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets" + "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets" ]; passthru = { From 4757f0e7cf8484927b65ffa9fe751efffa9c8959 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 18:45:08 -0500 Subject: [PATCH 206/637] termite: pick upstream fix for off-by-one w/newer vte --- pkgs/applications/misc/termite/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 1a02d4837fe..674b228746d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -14,7 +14,13 @@ stdenv.mkDerivation rec { # https://github.com/thestinger/termite/pull/516 patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + # Fix off-by-one in select_text() on libvte >= 0.55.0 + # Expected to be included in next release (16). + (fetchpatch { + url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; + sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; From c1756a0628f494952be09501af14e3e03fc08c33 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 11 May 2019 10:50:30 +0800 Subject: [PATCH 207/637] cargo-make: init at 0.19.1 --- .../tools/rust/cargo-make/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/cargo-make/default.nix diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix new file mode 100644 index 00000000000..056ecd0ca68 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-make"; + version = "0.19.1"; + + src = + let + source = fetchFromGitHub { + owner = "sagiegurari"; + repo = pname; + rev = version; + sha256 = "1bv5gv5zd9h0yw7wb28r0c4z9wqa6n7ac4ipd855apwz1v7sm9n3"; + }; + cargo-lock = fetchurl { + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8a12a07cafeff4ef4a01983f5243dd8c95d10c48/cargo-make-0.19.1-Cargo.lock"; + sha256 = "0v2hygkpsyjcpzrgyzl5mah0y8gmprfbnz7kn4hh6zfhz2lhqqwm"; + }; + in + runCommand "cargo-make-src" {} '' + cp -R ${source} $out + chmod +w $out + cp ${cargo-lock} $out/Cargo.lock + ''; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "0j7gyg6l428gypjpfgdz082vz8m86cx1wy2r47az3sc3skl6dhkq"; + + # Some tests fail because they need network access. + # However, Travis ensures a proper build. + # See also: + # https://travis-ci.org/sagiegurari/cargo-make + doCheck = false; + + meta = with stdenv.lib; { + description = "A Rust task runner and build tool"; + homepage = https://github.com/sagiegurari/cargo-make; + license = licenses.asl20; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00fc451b035..fd3cc0fe4d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4889,7 +4889,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -7943,6 +7943,9 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + cargo-make = callPackage ../development/tools/rust/cargo-make { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; From 4b917336f4858963e718e120bb555859e9d7c70b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 15 May 2019 20:51:35 -0700 Subject: [PATCH 208/637] analog: 6.0.13 -> 6.0.15 * Updates src so it can be auto updated. * Changes output paths to be only the pname, which seems more consistent with other packages in nixpkgs * minor cleanups --- pkgs/tools/admin/analog/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index c6135e8d143..d0731c1f599 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -1,38 +1,38 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { + pname = "analog"; + version = "6.0.15"; - name = "analog-6.0.13"; - - buildInputs = [ unzip ]; - - src = fetchurl { - url = "http://www.c-amie.co.uk/static/analog/6013/analog-src-6013ce.zip"; - sha256 = "1njfsclmxk8sn1i07k3qfk8fmsnz7qw9kmydk3bil7qjf4ngmzc6"; + src = fetchFromGitHub { + owner = "c-amie"; + repo = "analog-ce"; + rev = version; + sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; }; configurePhase = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${name}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" ''; installPhase = '' - mkdir -p $out/bin $out/etc $out/share/doc/${name} $out/share/man/man1 $out/share/${name} + mkdir -p $out/bin $out/etc $out/share/doc/$pname $out/share/man/man1 $out/share/$pname mv analog $out/bin/ cp examples/big.cfg $out/etc/analog.cfg mv analog.man $out/share/man/man1/analog.1 - mv docs $out/share/doc/${name}/manual - mv how-to $out/share/doc/${name}/ - mv lang images examples $out/share/${name}/ + mv docs $out/share/doc/$pname/manual + mv how-to $out/share/doc/$pname/ + mv lang images examples $out/share/$pname/ ''; meta = { - homepage = https://www.c-amie.co.uk/software/analog/; - license = stdenv.lib.licenses.gpl2; + homepage = "https://www.c-amie.co.uk/software/analog/"; + license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; }; } From de5638080b295cfcd2daa36edea94d8f56b31f98 Mon Sep 17 00:00:00 2001 From: tbenst Date: Sun, 12 May 2019 01:14:41 -0700 Subject: [PATCH 209/637] doc/stdenv: document default build scripts filename --- doc/stdenv.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 63e6450860a..e8171a78dcc 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -747,7 +747,8 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] latter is convenient from a build script. However, typically one only wants to add some commands to a phase, e.g. by defining postInstall or preFixup, as skipping - some of the default actions may have unexpected consequences. + some of the default actions may have unexpected consequences. The default + script for each phase is defined in the file pkgs/stdenv/generic/setup.sh.
From ab1ac905b43a1dc64a00cacd0ccf31a6d0bc572c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 May 2019 22:39:22 +0200 Subject: [PATCH 210/637] libjpeg-turbo: 2.0.1 -> 2.0.2 --- .../libraries/libjpeg-turbo/default.nix | 19 +++---------------- .../djpeg-rgb-islow-icc-cmp.patch | 11 ----------- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index ebcf51dfd03..23fa2f44b46 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -2,29 +2,16 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"; + sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"; }; patches = stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch - ++ [ - ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 - (fetchpatch { - name = "cve-2018-19664.diff"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; - sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; - }) - (fetchpatch { - name = "CVE-2018-20330.patch"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; - sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; - }) - ]; + ./mingw-boolean.patch; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch deleted file mode 100644 index c0f7fef4493..00000000000 --- a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) - - add_test(djpeg-${libtype}-rgb-islow-icc-cmp - ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) -+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES -+ DEPENDS djpeg-${libtype}-rgb-islow) - - add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" - testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) From 9ade471e67eab09d34bcafed81dae28003982335 Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 16 May 2019 10:02:28 +0200 Subject: [PATCH 211/637] racket: 7.2 -> 7.3 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 9d65997ffe5..c2147fb5f6a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.2"; # always change at once with ./minimal.nix + version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4"; + sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 0710c4e2d2a..a3d4a7a3c4f 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx"; + sha256 = "1byvg1vy8hn1j64d5gjiwzfbghdp7lhja9xwz9x8iicwfldkjybj"; }; meta = oldAttrs.meta // { From 8f277d1c106cb9172a4cab12226a90bbb247da6f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 04:55:36 -0500 Subject: [PATCH 212/637] libertinus: update github owner, libertinus-fonts is now a redirect --- pkgs/data/fonts/libertinus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 23c233b5893..578550bbe45 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -5,7 +5,7 @@ let in fetchFromGitHub rec { name = "libertinus-${version}"; - owner = "libertinus-fonts"; + owner = "alif-type"; repo = "libertinus"; rev = "v${version}"; @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/libertinus-fonts/libertinus; + homepage = https://github.com/alif-type/libertinus; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; From 9e2a22ae87390065cd59a46ecb4f4a02e140c5e1 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Thu, 16 May 2019 12:20:18 +0200 Subject: [PATCH 213/637] pioneer: update to 20190203 --- pkgs/games/pioneer/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index ffe0841184b..b6035918af7 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,33 +1,30 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig -, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +{ fetchFromGitHub, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 +, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +, glew }: stdenv.mkDerivation rec { - name = "pioneer-${version}"; - version = "20180203"; + pname = "pioneer"; + version = "20190203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; + sha256 = "1g34wvgyvz793dhm1k64kl82ib0cavkbg0f2p3fp05b457ycljff"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp libGLU_combined ]; - - NIX_CFLAGS_COMPILE = [ - "-I${SDL2}/include/SDL2" + buildInputs = [ + curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng + assimp libGLU_combined glew ]; preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ./bootstrap + export PIONEER_DATA_DIR="$out/share/pioneer/data"; ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = https://pioneerspacesim.net; From b8a6775227222b4c6b0c4394d4c47f523658fcb6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 16 May 2019 11:59:10 +0200 Subject: [PATCH 214/637] neovim: use lua on aarch64 --- pkgs/applications/editors/neovim/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a53c499fe5c..5d623cdfc6d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -80,6 +80,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" + ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; # triggers on buffer overflow bug while running tests @@ -122,8 +123,5 @@ in license = with licenses; [ asl20 vim ]; maintainers = with maintainers; [ manveru garbas rvolosatovs ]; platforms = platforms.unix; - # `lua: bad light userdata pointer` - # https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv - broken = stdenv.isAarch64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd3cc0fe4d2..f0880f66de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20458,7 +20458,10 @@ in wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = luajit; + lua = + # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 + if stdenv.isAarch64 then lua5_1 else + luajit; }; neovim = wrapNeovim neovim-unwrapped { }; From 9ee1763cb6162c70846e197205154da69d5a3578 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 14:41:48 +0200 Subject: [PATCH 215/637] pythonPackages.httpretty: disable 2 flaky tests intermittently failing on all platforms --- pkgs/development/python-modules/httpretty/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 0f61fd6d516..7d8f25ca954 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -34,7 +34,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - NOSE_EXCLUDE = stdenv.lib.optionalString (stdenv.isAarch64) "tests.functional.test_httplib2.test_callback_response"; + # Those flaky tests are failing intermittently on all platforms + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "tests.functional.test_httplib2.test_callback_response" + "tests.functional.test_requests.test_streaming_responses" + ]; meta = with stdenv.lib; { homepage = "https://httpretty.readthedocs.org/"; From f38fbe0d4949209d1dee9194d14718defcf9aece Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 09:36:20 -0400 Subject: [PATCH 216/637] vivaldi: 2.5.1525.41-1 -> 2.5.1525.43-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c1764aa3d5f..39351512a6a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.41-1"; + version = "2.5.1525.43-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0hdyk2f0jwp9rgzkqidksrmbri6lgihlgny6hpksfz132m00lv0b"; + sha256 = "0mmyl32fz6p43gz8vzkhh0z1wcb3l5cckxl8vkz53lb9k2mckjqi"; }; unpackPhase = '' From b6769b6876fd030e09fdee69a25f8782233158dd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 16 May 2019 21:38:43 +0800 Subject: [PATCH 217/637] cargo-sweep: fix cargoSha256 --- pkgs/development/tools/rust/cargo-sweep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 52198665e9f..a6068a96dc7 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zp0x0jy5bjqbxawlwvpj6vb3y602mnh19p48rw70kdx6vripbvj"; }; - cargoSha256 = "06hx8mlqarjnqrprwdp80cmanmacg3xz62r1bbn27pn60xv719hn"; + cargoSha256 = "1j5i4gp5mspgb8l6a25lqlyr5c16pchbh3g3yn8h1qlxj8g2vgnh"; meta = with stdenv.lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; From 636042d2658197ccbac27cff8707ea3b83e2d6b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 May 2019 17:57:37 +0200 Subject: [PATCH 218/637] yandex-disk: update i386 hash for 0.1.5.1010 --- pkgs/tools/filesystems/yandex-disk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 15c61513d9a..3b9e4a02108 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -9,7 +9,7 @@ let else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; + sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; }; in stdenv.mkDerivation rec { From 927da26d344fbc94f7f516b687706d9f970416f1 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 19:28:58 +0200 Subject: [PATCH 219/637] mergerfs: 2.26.0 -> 2.26.1 Changes: https://github.com/trapexit/mergerfs/releases/tag/2.26.1 --- pkgs/tools/filesystems/mergerfs/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index a0981de42b0..4d28869d160 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { - name = "mergerfs-${version}"; - version = "2.26.0"; + pname = "mergerfs"; + version = "2.26.1"; src = fetchFromGitHub { owner = "trapexit"; - repo = "mergerfs"; + repo = pname; rev = version; - sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9"; + sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3"; }; nativeBuildInputs = [ @@ -17,21 +17,20 @@ stdenv.mkDerivation rec { buildInputs = [ attr libiconv ]; preConfigure = '' - cat > src/version.hpp < VERSION ''; - makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + enableParallelBuilding = true; postFixup = '' - ln -s $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.mergerfs ''; meta = { description = "A FUSE based union filesystem"; - homepage = https://github.com/trapexit/mergerfs; + homepage = "https://github.com/trapexit/mergerfs"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; From 42aafcedf4aa06459c4a8bd2953e52df2d55cd4b Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 19:50:51 +0200 Subject: [PATCH 220/637] mergerfs-tools: 20171221 -> 20190411 --- pkgs/tools/filesystems/mergerfs/tools.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 01f0de25a90..44337cf1161 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -2,14 +2,14 @@ , rsync, python3, pythonPackages }: stdenv.mkDerivation rec { - name = "mergerfs-tools-${version}"; - version = "20171221"; + pname = "mergerfs-tools"; + version = "20190411"; src = fetchFromGitHub { owner = "trapexit"; - repo = "mergerfs-tools"; - rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; - sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; + repo = pname; + rev = "6e41fc5848c7cc4408caea86f3991c8cc2ac85a1"; + sha256 = "0izswg6bya13scvb37l3gkl7mvi8q7l11p4hp4phdlcwh9jvdzcj"; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL=${coreutils}/bin/install" - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; postInstall = with stdenv.lib; '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional tools to help manage data in a mergerfs pool"; - homepage = https://github.com/trapexit/mergerfs-tools; + homepage = "https://github.com/trapexit/mergerfs-tools"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; From 08aae882b6ad774146dcd6ed4023a566a3140785 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:02 -0400 Subject: [PATCH 221/637] linux: 4.14.119 -> 4.14.120 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0a8b8cd4042..c10b2b8a6d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.119"; + version = "4.14.120"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z1vmpbjkn9vqf380dgdcdmi2a22cymjs0spm9708x4x709vf5an"; + sha256 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x"; }; } // (args.argsOverride or {})) From e9ec2f1f2953ea4abca53ad6ada41d7672031d32 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:05 -0400 Subject: [PATCH 222/637] linux: 4.19.43 -> 4.19.44 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2119c11dee4..bd5f2fe347d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.43"; + version = "4.19.44"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0myzsbajwvskiqdlqsahw87f0ppj9gj7kh05vbs8ndmjzahij5hi"; + sha256 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh"; }; } // (args.argsOverride or {})) From b5c73e967c8a909e8bcede646a8597aa7e6990d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:08 -0400 Subject: [PATCH 223/637] linux: 4.4.179 -> 4.4.180 --- 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 7ffe5dc88f1..dc6998410cf 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.179"; + version = "4.4.180"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1l979wmxridq9psjlhmgkax3bi769pvmmvdgf0j2y67gclkrssic"; + sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s"; }; } // (args.argsOverride or {})) From e289798ec86d63b46d01d17d1980c3efc203ecd8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:11 -0400 Subject: [PATCH 224/637] linux: 4.9.176 -> 4.9.177 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 2f2ff1f929e..ca30427a883 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.176"; + version = "4.9.177"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y5i0picww914ljynqjdpv7cld7380y9lrlgnza02zvkq04d151a"; + sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7"; }; } // (args.argsOverride or {})) From 327bfaf1a71bb846e73a21cdcc0e54c19abf97c1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:14 -0400 Subject: [PATCH 225/637] linux: 5.0.16 -> 5.0.17 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 4571a570d4d..28ea81e8795 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.16"; + version = "5.0.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1b7wz577mdn2cdpn8mm8bl5kgxvm3rq7fzy0nc8cxl2j1wwwx9sw"; + sha256 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb"; }; } // (args.argsOverride or {})) From 37d17ec48553e6775a1a33fafaa02590bb37291a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:17 -0400 Subject: [PATCH 226/637] linux: 5.1.2 -> 5.1.3 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index e06cdd26fdd..5db24b34ec9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.2"; + version = "5.1.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0nzgkg4si0378pz6cv3hwj7qmmi5wdz1qvml0198b61n89xdcypc"; + sha256 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh"; }; } // (args.argsOverride or {})) From 357239577f7e9e01af50d848f3c73b37b62e422c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 13:44:01 -0500 Subject: [PATCH 227/637] buku: 4.1 -> 4.2 (#61564) * buku: 4.1 -> 4.2 * buku: fix install tests --- pkgs/applications/misc/buku/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index bde8fab8144..9822a187b9e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "4.1"; + version = "4.2"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "166l1fmpqn4hys4l0ssc4yd590mmav1w62vm9l5ijhjhmlnrzfax"; + sha256 = "1ipvhd9wa4iq0763b9h4f3xa6x31bssi6m0595w97mdhh9n6bgxg"; }; checkInputs = [ @@ -18,6 +18,7 @@ with python3.pkgs; buildPythonApplication rec { pylint flake8 pyyaml + mypy_extensions ]; propagatedBuildInputs = [ From 3e2d174d3b23e34f55fb5ce8fd947594502141ac Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 May 2019 20:43:30 +0200 Subject: [PATCH 228/637] android-studio: 3.4.0.18 -> 3.4.1.0 --- 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 8af0a647561..d53ccb1fdbd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.4.0.18"; # "Android Studio 3.4.0" - build = "183.5452501"; - sha256Hash = "0i8wz9v6nxzr27a07cv2330i84v94pcl13gjwvpglp55hyzd8axd"; + version = "3.4.1.0"; # "Android Studio 3.4.1" + build = "183.5522156"; + sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; betaVersion = latestVersion; latestVersion = { # canary & dev From ef14821cc1813952b73ee1ddb2a893606a483637 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 14:51:23 -0400 Subject: [PATCH 229/637] pythonPackages.anytree: init at 2.6.0 --- .../python-modules/anytree/default.nix | 63 +++++++++++++++++++ .../python-modules/anytree/graphviz.patch | 13 ++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/anytree/default.nix create mode 100644 pkgs/development/python-modules/anytree/graphviz.patch diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix new file mode 100644 index 00000000000..3821fea2446 --- /dev/null +++ b/pkgs/development/python-modules/anytree/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, fetchpatch +, nose +, six +, graphviz +, fontconfig +}: + +buildPythonPackage rec { + pname = "anytree"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "c0fec0de"; + repo = pname; + rev = version; + sha256 = "1k3yj9h3ssjlz57r4g1qzxvprxjp7n92vms9fv0d46pigylxm5i3"; + }; + + patches = [ + (substituteAll { + src = ./graphviz.patch; + inherit graphviz; + }) + # Fix tests python3.7 + # See: https://github.com/c0fec0de/anytree/pull/85 + (fetchpatch { + url = "https://github.com/c0fec0de/anytree/commit/dd1b3d325546fef7436711e4cfea9a5fb61daaf8.patch"; + sha256 = "1dpa2jh2kakfaapnqrz03frb67q5fwxzc8c70i6nv1b01i9xw0bn"; + }) + ]; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + six + ]; + + # Fontconfig error: Cannot load default config file + preCheck = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + checkPhase = '' + runHook preCheck + + nosetests + + runHook postCheck + ''; + + meta = with lib; { + description = "Powerful and Lightweight Python Tree Data Structure"; + homepage = https://github.com/c0fec0de/anytree; + license = licenses.asl20; + maintainers = [ maintainers.worldofpeace ]; + }; +} diff --git a/pkgs/development/python-modules/anytree/graphviz.patch b/pkgs/development/python-modules/anytree/graphviz.patch new file mode 100644 index 00000000000..583b60444e3 --- /dev/null +++ b/pkgs/development/python-modules/anytree/graphviz.patch @@ -0,0 +1,13 @@ +diff --git a/anytree/exporter/dotexporter.py b/anytree/exporter/dotexporter.py +index 9c10a68..209a952 100644 +--- a/anytree/exporter/dotexporter.py ++++ b/anytree/exporter/dotexporter.py +@@ -228,7 +228,7 @@ class DotExporter(object): + for line in self: + dotfile.write(("%s\n" % line).encode("utf-8")) + dotfile.flush() +- cmd = ["dot", dotfilename, "-T", fileformat, "-o", filename] ++ cmd = ["@graphviz@/bin/dot", dotfilename, "-T", fileformat, "-o", filename] + check_call(cmd) + try: + remove(dotfilename) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a70f5309d4d..7dae4ff91af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -181,6 +181,10 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + anytree = callPackage ../development/python-modules/anytree { + inherit (pkgs) graphviz; + }; + aplpy = callPackage ../development/python-modules/aplpy { }; argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; From 1a84bfc0a2ccc3d6119ed714be84568c48289cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 13 Apr 2019 16:05:59 +0200 Subject: [PATCH 230/637] mxisd: 1.2.0 -> 1.4.3 --- nixos/modules/services/networking/mxisd.nix | 10 +--------- pkgs/servers/mxisd/0001-gradle.patch | 14 +++++++------- pkgs/servers/mxisd/default.nix | 14 +++++++------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/networking/mxisd.nix b/nixos/modules/services/networking/mxisd.nix index 0b9824f29fd..02e89f441b3 100644 --- a/nixos/modules/services/networking/mxisd.nix +++ b/nixos/modules/services/networking/mxisd.nix @@ -103,20 +103,12 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - # mxisd / spring.boot needs the configuration to be named "application.yaml" - preStart = '' - config=${cfg.dataDir}/application.yaml - cp ${configFile} $config - chmod 444 $config - ''; - serviceConfig = { Type = "simple"; User = "mxisd"; Group = "mxisd"; - ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom"; + ExecStart = "${cfg.package}/bin/mxisd -c ${configFile}"; WorkingDirectory = cfg.dataDir; - SuccessExitStatus = 143; Restart = "on-failure"; }; }; diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/pkgs/servers/mxisd/0001-gradle.patch index 55ff6ead22d..8a9f5a81180 100644 --- a/pkgs/servers/mxisd/0001-gradle.patch +++ b/pkgs/servers/mxisd/0001-gradle.patch @@ -1,19 +1,19 @@ ---- a/build.gradle 2018-11-16 15:15:29.021469758 +0100 -+++ b/build.gradle 2018-11-16 15:16:50.982289782 +0100 -@@ -64,7 +64,7 @@ +--- a/build.gradle 2019-05-16 21:09:08.373112953 +0200 ++++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200 +@@ -72,7 +72,7 @@ buildscript { repositories { -- mavenCentral() -+ REPLACE +- jcenter() ++REPLACE } dependencies { -@@ -73,9 +73,7 @@ +@@ -81,9 +81,7 @@ } repositories { -- mavenCentral() +- jcenter() - maven { url "https://kamax.io/maven/releases/" } - maven { url "https://kamax.io/maven/snapshots/" } +REPLACE diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index 0d3bc4f3e08..9d26ecb6ab1 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_2_5, perl, makeWrapper, writeText }: +{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_4_10, perl, makeWrapper, writeText }: let name = "mxisd-${version}"; - version = "1.2.0"; - rev = "8c4ddd2e6526c1d2b284ba88cce3c2b926d99c62"; + version = "1.4.3"; + rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16"; src = fetchFromGitHub { inherit rev; owner = "kamax-matrix"; repo = "mxisd"; - sha256 = "083plqg0rxsqwzyskin78wkmylhb7cqz37lpsa1zy56sxpdw1a3l"; + sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69"; }; deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle_2_5 perl git ]; + nativeBuildInputs = [ gradle_4_10 perl git ]; buildPhase = '' export MXISD_BUILD_VERSION=${rev} @@ -35,13 +35,13 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0shshn05nzv23shry1xpcgvqg59gx929n0qngpfjhbq0kp7px68m"; + outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv"; }; in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; buildInputs = [ jre ]; patches = [ ./0001-gradle.patch ]; From e2bbc6fb469a43384b593f3018920a0f2a090a5e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 16 May 2019 15:05:32 -0500 Subject: [PATCH 231/637] nixos: fix services.foundationdb.traceFormat for older server versions This was a testing oversight that came from #61009 -- I forgot to test the new traceFormat option with older server versions while I was working on FDB 6.1. Since trace_format is only available in 6.1+, emitting it unconditionally caused older versions of the database fail to start, reporting an error. We simply gate it behind a version check instead, and assert the format is always XML on older versions. This avoids the case where the user has an old version, changes traceFormat willingly, and then is confused by why it didn't work. As reported by @TimothyKlim in the comments on commit c55b9236f0f208a8689e400ddbea52858c923372. See https://github.com/NixOS/nixpkgs/commit/c55b9236f0f208a8689e400ddbea52858c923372#r33566132 Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 169ed37b348..490c5e9d005 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -35,7 +35,10 @@ let ${optionalString (cfg.class != null) "class = ${cfg.class}"} memory = ${cfg.memory} storage_memory = ${cfg.storageMemory} + + ${optionalString (lib.versionAtLeast cfg.package.version "6.1") '' trace_format = ${cfg.traceFormat} + ''} ${optionalString (cfg.tls != null) '' tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so @@ -327,6 +330,15 @@ in }; config = mkIf cfg.enable { + assertions = [ + { assertion = lib.versionOlder cfg.package.version "6.1" -> cfg.traceFormat == "xml"; + message = '' + Versions of FoundationDB before 6.1 do not support configurable trace formats (only XML is supported). + This option has no effect for version '' + cfg.package.version + '', and enabling it is an error. + ''; + } + ]; + environment.systemPackages = [ pkg ]; users.users = optionalAttrs (cfg.user == "foundationdb") (singleton From 44d9383483883904231333b6d35368f1d5e8ae5e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 15:31:33 -0500 Subject: [PATCH 232/637] electrum: 3.3.5 -> 3.3.6 https://github.com/spesmilo/electrum/blob/3.3.6/RELEASE-NOTES --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 9cabd6dda7c..6e69665da2b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let - version = "3.3.5"; + version = "3.3.6"; # Not provided in official source releases, which are what upstream signs. tests = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "11rzzrv5xxqazcb7q1ig93d6cisqmd1x0jrgvfgzysbzvi51gg11"; + sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3"; extraPostFetch = '' mv $out ./all @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1"; + sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz"; }; postUnpack = '' From 71fdb6931436e98259dcb65dbcd1f656c1b2d194 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 16 May 2019 23:42:02 +0200 Subject: [PATCH 233/637] nixos: add test for tinydns --- nixos/tests/all-tests.nix | 1 + nixos/tests/tinydns.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 nixos/tests/tinydns.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d495b2fa633..7ac6aba4ab3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -236,6 +236,7 @@ in pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; + tinydns = handleTest ./tinydns.nix {}; tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix new file mode 100644 index 00000000000..cb7ee0c5fb5 --- /dev/null +++ b/nixos/tests/tinydns.nix @@ -0,0 +1,26 @@ +import ./make-test.nix ({ lib, ...} : { + name = "tinydns"; + meta = { + maintainers = with lib.maintainers; [ basvandijk ]; + }; + nodes = { + nameserver = { config, lib, ... } : let + ip = (lib.head config.networking.interfaces.eth1.ipv4.addresses).address; + in { + networking.nameservers = [ ip ]; + services.tinydns = { + enable = true; + inherit ip; + data = '' + .foo.bar:${ip} + +.bla.foo.bar:1.2.3.4:300 + ''; + }; + }; + }; + testScript = '' + $nameserver->start; + $nameserver->waitForUnit("tinydns.service"); + $nameserver->succeed("host bla.foo.bar | grep '1\.2\.3\.4'"); + ''; +}) From 2d93f57db58f2631017714c4e28bf72c2c52c036 Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Thu, 2 May 2019 00:08:56 +0200 Subject: [PATCH 234/637] nixos/geoclue2: make configurable, can whitelist applications All options within geoclue.conf[0] have been made configurable. Additonally, we can now specify whether or not GeoClue should ask the agent to authorize an application like so: ``` services.geoclue2.appConfig."redshift" = { isAllowed = true; isSystem = true; }; ``` [0]: https://gitlab.freedesktop.org/geoclue/geoclue/blob/2.5.2/data/geoclue.conf.in Co-authored-by: worldofpeace --- nixos/modules/services/desktops/geoclue2.nix | 188 ++++++++++++++++++- 1 file changed, 183 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 840aa5294ed..a16dbc04a5f 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -7,6 +7,56 @@ with lib; let # the demo agent isn't built by default, but we need it here package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; }; + + cfg = config.services.geoclue2; + + defaultWhitelist = [ "gnome-shell" "io.elementary.desktop.agent-geoclue2" ]; + + appConfigModule = types.submodule ({ name, ... }: { + options = { + desktopID = mkOption { + type = types.str; + description = "Desktop ID of the application."; + }; + + isAllowed = mkOption { + type = types.bool; + default = null; + description = '' + Whether the application will be allowed access to location information. + ''; + }; + + isSystem = mkOption { + type = types.bool; + default = null; + description = '' + Whether the application is a system component or not. + ''; + }; + + users = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of UIDs of all users for which this application is allowed location + info access, Defaults to an empty string to allow it for all users. + ''; + }; + }; + + config.desktopID = mkDefault name; + }); + + appConfigToINICompatible = _: { desktopID, isAllowed, isSystem, users, ... }: { + name = desktopID; + value = { + allowed = isAllowed; + system = isSystem; + users = concatStringsSep ";" users; + }; + }; + in { @@ -35,23 +85,117 @@ in ''; }; + enableNmea = mkOption { + type = types.bool; + default = true; + description = '' + Whether to fetch location from NMEA sources on local network. + ''; + }; + + enable3G = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable 3G source. + ''; + }; + + enableCDMA = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable CDMA source. + ''; + }; + + enableModemGPS = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Modem-GPS source. + ''; + }; + + enableWifi = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable WiFi source. + ''; + }; + + geoProviderUrl = mkOption { + type = types.str; + default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue"; + example = "https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY"; + description = '' + The url to the wifi GeoLocation Service. + ''; + }; + + submitData = mkOption { + type = types.bool; + default = false; + description = '' + Whether to submit data to a GeoLocation Service. + ''; + }; + + submissionUrl = mkOption { + type = types.str; + default = "https://location.services.mozilla.com/v1/submit?key=geoclue"; + description = '' + The url to submit data to a GeoLocation Service. + ''; + }; + + submissionNick = mkOption { + type = types.str; + default = "geoclue"; + description = '' + A nickname to submit network data with. + Must be 2-32 characters long. + ''; + }; + + appConfig = mkOption { + type = types.loaOf appConfigModule; + default = {}; + example = literalExample '' + "com.github.app" = { + isAllowed = true; + isSystem = true; + users = [ "300" ]; + }; + ''; + description = '' + Specify extra settings per application. + ''; + }; + }; }; ###### implementation - config = mkIf config.services.geoclue2.enable { + config = mkIf cfg.enable { environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; systemd.packages = [ package ]; - + + # restart geoclue service when the configuration changes + systemd.services."geoclue".restartTriggers = [ + config.environment.etc."geoclue/geoclue.conf".source + ]; + # this needs to run as a user service, since it's associated with the # user who is making the requests - systemd.user.services = mkIf config.services.geoclue2.enableDemoAgent { + systemd.user.services = mkIf cfg.enableDemoAgent { "geoclue-agent" = { description = "Geoclue agent"; script = "${package}/libexec/geoclue-2.0/demos/agent"; @@ -62,7 +206,41 @@ in }; }; - environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf"; - }; + services.geoclue2.appConfig."epiphany" = { + isAllowed = true; + isSystem = false; + }; + services.geoclue2.appConfig."firefox" = { + isAllowed = true; + isSystem = false; + }; + + environment.etc."geoclue/geoclue.conf".text = + generators.toINI {} ({ + agent = { + whitelist = concatStringsSep ";" + (optional cfg.enableDemoAgent "geoclue-demo-agent" ++ defaultWhitelist); + }; + network-nmea = { + enable = cfg.enableNmea; + }; + "3g" = { + enable = cfg.enable3G; + }; + cdma = { + enable = cfg.enableCDMA; + }; + modem-gps = { + enable = cfg.enableModemGPS; + }; + wifi = { + enable = cfg.enableWifi; + url = cfg.geoProviderUrl; + submit-data = boolToString cfg.submitData; + submission-url = cfg.submissionUrl; + submission-nick = cfg.submissionNick; + }; + } // mapAttrs' appConfigToINICompatible cfg.appConfig); + }; } From 00d8fc1cdef7cc60f044160b87bc673ef4885d1b Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Wed, 15 May 2019 19:53:01 +0200 Subject: [PATCH 235/637] nixos/gnome3: add geoclue application configuration Co-authored-by: worldofpeace --- .../services/x11/desktop-managers/gnome3.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7b65f1b85c6..ef6820d3326 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -120,9 +120,6 @@ in { security.polkit.enable = true; services.udisks2.enable = true; services.accounts-daemon.enable = true; - services.geoclue2.enable = mkDefault true; - # GNOME should have its own geoclue agent - services.geoclue2.enableDemoAgent = false; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; @@ -191,6 +188,24 @@ in { '') cfg.sessionPath} ''; + + services.geoclue2.enable = mkDefault true; + # GNOME should have its own geoclue agent + services.geoclue2.enableDemoAgent = false; + + services.geoclue2.appConfig."gnome-datetime-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."gnome-color-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."org.gnome.Shell" = { + isAllowed = true; + isSystem = true; + }; + environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; # Override default mimeapps From efcdac63fee4280cdc276362199503b6acb75df2 Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Thu, 16 May 2019 23:35:37 +0200 Subject: [PATCH 236/637] nixos/pantheon: add geoclue application configuration Co-authored-by: worldofpeace --- .../services/x11/desktop-managers/pantheon.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e1eeb32aa1a..9a0f77a856a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -118,9 +118,6 @@ in (mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) ]; services.pantheon.contractor.enable = mkDefault true; - services.geoclue2.enable = mkDefault true; - # pantheon has pantheon-agent-geoclue2 - services.geoclue2.enableDemoAgent = false; services.gnome3.at-spi2-core.enable = true; services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; @@ -140,6 +137,14 @@ in services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; + services.geoclue2.enable = mkDefault true; + # pantheon has pantheon-agent-geoclue2 + services.geoclue2.enableDemoAgent = false; + services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = { + isAllowed = true; + isSystem = true; + }; + networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; From 632591818a26065c378b3acafb9b275fbe9ce66a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 18:53:45 -0400 Subject: [PATCH 237/637] pantheon.elementary-photos: 2.6.3 -> 2.6.4 Patch in tree is removed because it's included upstream. https://github.com/elementary/photos/releases/tag/2.6.4 --- .../apps/elementary-photos/default.nix | 10 ++------- .../elementary-photos/fix-missing-line.patch | 21 ------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 493e7a97805..4ee2aef1760 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "photos"; - version = "2.6.3"; + version = "2.6.4"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg"; + sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1"; }; passthru = { @@ -66,12 +66,6 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; - patches = [ - # https://github.com/elementary/photos/pull/505 - # Unrelated line got dropped in https://github.com/elementary/photos/pull/498 - ./fix-missing-line.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch deleted file mode 100644 index ae859d9dff9..00000000000 --- a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Tue, 16 Apr 2019 16:12:47 +0200 -Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498 - ---- - src/photos/PhotoMetadata.vala | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala -index f0a4a73b..34dcbb55 100644 ---- a/src/photos/PhotoMetadata.vala -+++ b/src/photos/PhotoMetadata.vala -@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata { - #else - exiv2.from_app1_segment (buffer, length); - #endif -+ exif = Exif.Data.new_from_data (buffer, length); - source_name = "".printf (length); - } - From 4ce159c41df1148f14b8f057b338a7c5c6022ffd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 19:08:21 -0400 Subject: [PATCH 238/637] pantheon.wingpanel-applications-menu: 2.4.2 -> 2.4.3 Now finally builds with Meson, where it was available since last release but needed several fixes to be release quality IMHO. Also dropped xdg patch since because meson [0]. https://github.com/elementary/applications-menu/releases/tag/2.4.3 [0]: https://github.com/elementary/applications-menu/commit/58cd96a4cc5c98bbf379f119cd2e92d0142a80d9 --- .../applications-menu/default.nix | 26 ++++++++++++------- .../applications-menu/xdg.patch | 13 ---------- 2 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 2461ea4875e..e905ce9d854 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus , json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 -, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }: +, zeitgeist, bc }: stdenv.mkDerivation rec { pname = "applications-menu"; - version = "2.4.2"; + version = "2.4.3"; name = "wingpanel-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x"; + sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd"; }; passthru = { @@ -25,18 +25,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream - cmake - ninja gettext - gobject-introspection + meson + ninja pkgconfig + python3 vala - wrapGAppsHook ]; buildInputs = [ bamf - elementary-icon-theme gnome-menus granite gtk3 @@ -51,6 +49,10 @@ stdenv.mkDerivation rec { zeitgeist ]; + mesonFlags = [ + "--sysconfdir=${placeholder ''out''}/etc" + ]; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; @@ -59,9 +61,13 @@ stdenv.mkDerivation rec { src = ./bc.patch; exec = "${bc}/bin/bc"; }) - ./xdg.patch ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = https://github.com/elementary/applications-menu; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch deleted file mode 100644 index f17e2581e07..00000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 928976a..7f0ea58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS}) - - # Installation - install (TARGETS ${APPNAME} RUNTIME DESTINATION bin) --install (FILES ${applications_menu} DESTINATION /etc/xdg/menus) -+install (FILES ${applications_menu} DESTINATION etc/xdg/menus) - file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*") - - # Settings schema From 24c7e2a15cc500794756064c752160412bd6f67b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 21:24:40 -0400 Subject: [PATCH 239/637] graphene: init at 1.8.6 --- ...-options-for-tests-installation-dirs.patch | 79 +++++++++++++++++++ .../libraries/graphene/default.nix | 62 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 143 insertions(+) create mode 100644 pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch create mode 100644 pkgs/development/libraries/graphene/default.nix diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch new file mode 100644 index 00000000000..d6a441e1577 --- /dev/null +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -0,0 +1,79 @@ +From c550bf4a41e9f86351b0a65ea3d6c9ab616e27c0 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Thu, 16 May 2019 21:15:15 -0400 +Subject: [PATCH] meson: add options for tests installation dirs + +--- + meson_options.txt | 6 ++++++ + src/tests/meson.build | 19 ++++++++++++++----- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index c938805..c1e9e95 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -19,6 +19,12 @@ option('arm_neon', type: 'boolean', + option('tests', type: 'boolean', + value: true, + description: 'Build the test suite (requires GObject)') ++option('installed_test_datadir', type: 'string', ++ value: '', ++ description: 'Installation directory for data files in tests') ++option('installed_test_bindir', type: 'string', ++ value: '', ++ description: 'Installation directory for binary files in tests') + option('benchmarks', type: 'boolean', + value: true, + description: 'Build the benchmarks suite (requires GObject)') +diff --git a/src/tests/meson.build b/src/tests/meson.build +index 62129c6..0186400 100644 +--- a/src/tests/meson.build ++++ b/src/tests/meson.build +@@ -22,8 +22,17 @@ unit_tests = [ + python = python3.find_python() + gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') + +-installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) +-installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) ++test_suffix = join_paths('installed-tests', graphene_api_path) ++ ++test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix) ++if test_datadir == '' ++ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix) ++endif ++ ++test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix) ++if test_bindir == '' ++ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix) ++endif + + foreach unit: unit_tests + wrapper = '@0@.test'.format(unit) +@@ -32,13 +41,13 @@ foreach unit: unit_tests + command: [ + python, + gen_installed_test, +- '--testdir=@0@'.format(installed_test_bindir), ++ '--testdir=@0@'.format(test_bindir), + '--testname=@0@'.format(unit), + '--outdir=@OUTDIR@', + '--outfile=@0@'.format(wrapper), + ], + install: true, +- install_dir: installed_test_datadir) ++ install_dir: test_datadir) + + exe = executable(unit, unit + '.c', + dependencies: graphene_dep, +@@ -50,7 +59,7 @@ foreach unit: unit_tests + '-DGLIB_DISABLE_DEPRECATION_WARNINGS', + ], + install: true, +- install_dir: installed_test_bindir) ++ install_dir: test_bindir) + + test(unit, exe, args: [ '--tap', '-k' ]) + endforeach +-- +2.21.0 + diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix new file mode 100644 index 00000000000..253fce4ea0d --- /dev/null +++ b/pkgs/development/libraries/graphene/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, python3 +, glib +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "graphene"; + version = "1.8.6"; + + outputs = [ "out" "devdoc" "installedTests" ]; + + src = fetchFromGitHub { + owner = "ebassi"; + repo = pname; + rev = version; + sha256 = "1hdbdzcz86jrvsq5h954ph9q62m8jr2a5s5acklxhdkfqn5bkbv8"; + }; + + patches = [ + ./0001-meson-add-options-for-tests-installation-dirs.patch + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share" + "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec" + ]; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gtk-doc + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + gobject-introspection + ]; + + checkInputs = [ + glib + ]; + + meta = with stdenv.lib; { + description = "A thin layer of graphic data types"; + homepage = "https://ebassi.github.com/graphene"; + license = licenses.mit; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0162bb1863c..955d4d6d40f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9202,6 +9202,8 @@ in graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; + graphene = callPackage ../development/libraries/graphene { }; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; From cc7c76f2061e3f8cf0c0573340b8fa3444aa582d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 21:29:17 -0400 Subject: [PATCH 240/637] nixosTests.graphene: init --- nixos/tests/all-tests.nix | 3 ++- nixos/tests/graphene.nix | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/graphene.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d495b2fa633..eb465501236 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -89,11 +89,12 @@ in gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gjs = handleTest ./gjs.nix {}; - google-oslogin = handleTest ./google-oslogin {}; gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64 gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64 gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; + google-oslogin = handleTest ./google-oslogin {}; + graphene = handleTest ./graphene.nix {}; grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; diff --git a/nixos/tests/graphene.nix b/nixos/tests/graphene.nix new file mode 100644 index 00000000000..5591bcc30c0 --- /dev/null +++ b/nixos/tests/graphene.nix @@ -0,0 +1,18 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "graphene"; + + meta = { + maintainers = pkgs.graphene.meta.maintainers; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.graphene.installedTests}/share'"); + ''; +}) From fb4ec8f688d9064924100cf695b32474cfb1a968 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 22:45:38 -0400 Subject: [PATCH 241/637] geoclue: 2.5.2 -> 2.5.3 Updated patch as needed. https://gitlab.freedesktop.org/geoclue/geoclue/tags/2.5.3 --- ...d-option-for-installation-sysconfdir.patch | 23 +++++++++++++------ .../development/libraries/geoclue/default.nix | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch index feb46021f8c..9eb53acebb0 100644 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index f826864..8b8a25e 100644 +index c189753..12c10cb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ if get_option('enable-backend') @@ -11,7 +11,16 @@ index f826864..8b8a25e 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -26,7 +26,7 @@ if get_option('enable-backend') +@@ -16,7 +16,7 @@ if get_option('enable-backend') + conf = configuration_data() + conf.set('libexecdir', libexecdir) + conf.set('dbus_srv_user', get_option('dbus-srv-user')) +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + service_dir = join_paths(datadir, 'dbus-1', 'system-services') + configure_file(output: 'org.freedesktop.GeoClue2.service', +@@ -33,7 +33,7 @@ if get_option('enable-backend') # DBus Service policy file dbus_service_dir = get_option('dbus-sys-dir') if dbus_service_dir == '' @@ -21,10 +30,10 @@ index f826864..8b8a25e 100644 configure_file(output: 'org.freedesktop.GeoClue2.conf', input: 'org.freedesktop.GeoClue2.conf.in', diff --git a/demo/meson.build b/demo/meson.build -index 99c094f..a29ca96 100644 +index 1427fbe..2623f16 100644 --- a/demo/meson.build +++ b/demo/meson.build -@@ -56,7 +56,7 @@ if get_option('demo-agent') +@@ -54,7 +54,7 @@ if get_option('demo-agent') install_dir: desktop_dir) # Also install in the autostart directory. @@ -34,7 +43,7 @@ index 99c094f..a29ca96 100644 desktop_file.full_path(), autostart_dir) diff --git a/meson.build b/meson.build -index d738ef6..c794a1d 100644 +index fde6fa3..39b7b0a 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,11 @@ gclue_api_version='2.0' @@ -50,8 +59,8 @@ index d738ef6..c794a1d 100644 localedir = join_paths(datadir, 'locale') header_dir = 'libgeoclue-' + gclue_api_version -@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'http://www.freedesktop.org/wiki/Software/GeoClue - conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugs.freedesktop.org/enter_bug.cgi?product=GeoClue') +@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w + conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/') conf.set_quoted('LOCALEDIR', localedir) -conf.set_quoted('SYSCONFDIR', sysconfdir) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 5b8951cb3e0..70319c9151f 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = version; - sha256 = "1zk6n28q030a9v03whad928b9zwq16d30ch369qv2c0994axdr5p"; + sha256 = "1wbpi74dw3p7izxwd57irz2i1g55r7wzl5h2yf0ns0hgq2njdfsg"; }; patches = [ From d494c6c9b42e3682acfa57f740a8e0016698d8ab Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 13:57:51 -0500 Subject: [PATCH 242/637] libnice: 0.1.15 -> 0.1.16 https://gitlab.freedesktop.org/libnice/libnice/blob/0.1.16/NEWS --- pkgs/development/libraries/libnice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index e71bcd0e368..08718c99092 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { - name = "libnice-0.1.15"; + name = "libnice-0.1.16"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p"; + sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6"; }; patches = [ From 79e492e7fdb652fc500c08b73c6091d40e013483 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 14:08:04 -0500 Subject: [PATCH 243/637] libnice: drop included patches --- pkgs/development/libraries/libnice/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 08718c99092..d6bb8ec5046 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -18,19 +18,6 @@ stdenv.mkDerivation rec { url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; }) - - # Fix test-different-number-streams - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36 - (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch; - sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z"; - }) - # Fix test-gstreamer - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35 - (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch; - sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0"; - }) ]; nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; From d54ea3e42b7553f9a880615c02dc5b8acec7db1a Mon Sep 17 00:00:00 2001 From: xbreak Date: Thu, 16 May 2019 14:15:40 +0000 Subject: [PATCH 244/637] sloccount: Wrap shell scripts This fixes the issue that when `sloccount` is invoked it would fail due to missing PATH to companion scripts. --- pkgs/development/tools/misc/sloccount/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 28500ee08ee..965f0ed096c 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; # Make sure the Flex-generated files are newer than the `.l' files, so that @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc" ''; + postInstall = '' + for w in "$out/bin"/*; do + isScript "$w" || continue + wrapProgram "$w" --prefix PATH : "$out/bin" + done + ''; + meta = { description = "Set of tools for counting physical Source Lines of Code (SLOC)"; From fd5e76e1f464889420428e0369ceffe3e06233c3 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Apr 2019 20:51:40 +0200 Subject: [PATCH 245/637] kde_applications: 18.12.03 -> 19.04.0 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1720 ++++++++++++++++---------------- 2 files changed, 861 insertions(+), 861 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index e06c7f0d14a..c81ea2398b0 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.04.0/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 416273d719f..7780e74e7e1 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz"; - sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658"; - name = "akonadi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-19.04.0.tar.xz"; + sha256 = "c0a2c4259b51293d21487cfe2295df6e8dcfb7ab50eb1a698f531dc7d3253e9a"; + name = "akonadi-19.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz"; - sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee"; - name = "akonadi-calendar-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-calendar-19.04.0.tar.xz"; + sha256 = "5a2897a1e96897159a3e2980f407c4c225434efd45167ad699a14aaa2ec445fd"; + name = "akonadi-calendar-19.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz"; - sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed"; - name = "akonadi-calendar-tools-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-calendar-tools-19.04.0.tar.xz"; + sha256 = "f9869574d880c53bfb87319348d75d8169ffb38bfdeb3b6066f25074409321ef"; + name = "akonadi-calendar-tools-19.04.0.tar.xz"; }; }; akonadiconsole = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz"; - sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0"; - name = "akonadiconsole-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadiconsole-19.04.0.tar.xz"; + sha256 = "5118720b6e0ecdf689c7b7f005f732386d0b7a6258cc11fb44fcaac5cc9518a8"; + name = "akonadiconsole-19.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz"; - sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc"; - name = "akonadi-contacts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-contacts-19.04.0.tar.xz"; + sha256 = "65dd20c467daf8d6107a1856c7f112eb937438b5884fe62a09a1763214a7442a"; + name = "akonadi-contacts-19.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz"; - sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104"; - name = "akonadi-import-wizard-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-import-wizard-19.04.0.tar.xz"; + sha256 = "541b858278d56a5d41858bfa644656d4f04bf6e5a52ce8014d207d64812d6d22"; + name = "akonadi-import-wizard-19.04.0.tar.xz"; }; }; akonadi-mime = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz"; - sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4"; - name = "akonadi-mime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-mime-19.04.0.tar.xz"; + sha256 = "b06ca4140b10548b9aecd188bd9b72405af2f4097c80e9b4e9aa3e863750b6da"; + name = "akonadi-mime-19.04.0.tar.xz"; }; }; akonadi-notes = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz"; - sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60"; - name = "akonadi-notes-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-notes-19.04.0.tar.xz"; + sha256 = "a9aa05ca2b5f846fed51e4c32907eedc6893a40ab3b9d4832e11bab118664e5f"; + name = "akonadi-notes-19.04.0.tar.xz"; }; }; akonadi-search = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz"; - sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346"; - name = "akonadi-search-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akonadi-search-19.04.0.tar.xz"; + sha256 = "6046a540ace526cbb8c0909762ad333426266afbf58a59ecc71cb923298e84bb"; + name = "akonadi-search-19.04.0.tar.xz"; }; }; akregator = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz"; - sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1"; - name = "akregator-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/akregator-19.04.0.tar.xz"; + sha256 = "5104b0b66ac3917c7cb78f4a6cca952f7e4360cfcd0aa7ce1575d0551470fcee"; + name = "akregator-19.04.0.tar.xz"; }; }; analitza = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz"; - sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"; - name = "analitza-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/analitza-19.04.0.tar.xz"; + sha256 = "ac8bf7d66f8a2fc7198238f23d82efd1021943ffe8bd5915808e31b800a802f6"; + name = "analitza-19.04.0.tar.xz"; }; }; ark = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz"; - sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"; - name = "ark-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ark-19.04.0.tar.xz"; + sha256 = "35e8e516a8554e086264d9a9a4fa66c2b47fa227eb9e512a1d0d24172cd07a84"; + name = "ark-19.04.0.tar.xz"; }; }; artikulate = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz"; - sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278"; - name = "artikulate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/artikulate-19.04.0.tar.xz"; + sha256 = "527ebdb2db6eab3e05810c5e56d53611d80bd23508563457b459e4e32a68ef08"; + name = "artikulate-19.04.0.tar.xz"; }; }; audiocd-kio = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz"; - sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8"; - name = "audiocd-kio-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/audiocd-kio-19.04.0.tar.xz"; + sha256 = "0f347be9c873eb75144d2b8f3f2e28d2e52be4c1a0f59a19be99edd867f17371"; + name = "audiocd-kio-19.04.0.tar.xz"; }; }; baloo-widgets = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz"; - sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"; - name = "baloo-widgets-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/baloo-widgets-19.04.0.tar.xz"; + sha256 = "ab3d83bb1f2007620273d1a3eb580d821e0655aaf7e3efd2dc81087a24d1c275"; + name = "baloo-widgets-19.04.0.tar.xz"; }; }; blinken = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz"; - sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579"; - name = "blinken-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/blinken-19.04.0.tar.xz"; + sha256 = "5d470c7f0d232ea01c99fbe1ed08e103291e80c3cfe74e245aba1c2009573eed"; + name = "blinken-19.04.0.tar.xz"; }; }; bomber = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz"; - sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771"; - name = "bomber-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/bomber-19.04.0.tar.xz"; + sha256 = "4f82f3f42aff36de837f7c9ddc5986f6c73cb50de122b46320dba0a0b03f9a7d"; + name = "bomber-19.04.0.tar.xz"; }; }; bovo = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz"; - sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"; - name = "bovo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/bovo-19.04.0.tar.xz"; + sha256 = "2cfccb09087a32d8a75f6dd763168e2ef5928f55b58505a542bc36fdac8e141e"; + name = "bovo-19.04.0.tar.xz"; }; }; calendarsupport = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz"; - sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5"; - name = "calendarsupport-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/calendarsupport-19.04.0.tar.xz"; + sha256 = "d767f077a9d41a9c6d266c4b5fe7bedd6f4eb7b71824e7544cf3a1df11ce362f"; + name = "calendarsupport-19.04.0.tar.xz"; }; }; cantor = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz"; - sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398"; - name = "cantor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/cantor-19.04.0.tar.xz"; + sha256 = "ef0381a65cd2f3a3bb68a7211140077fc1a9bf31ed5302fa368fd874c8441bf4"; + name = "cantor-19.04.0.tar.xz"; }; }; cervisia = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz"; - sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85"; - name = "cervisia-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/cervisia-19.04.0.tar.xz"; + sha256 = "011d9b38a82508ae73328dc56723af11fa8403c0dcf5b7d7703118d79f2ad8f4"; + name = "cervisia-19.04.0.tar.xz"; }; }; dolphin = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz"; - sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"; - name = "dolphin-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/dolphin-19.04.0.tar.xz"; + sha256 = "f3f45b9048c283252067eebfad8c6e1efc6bc64d43fcba78b933850ea4762375"; + name = "dolphin-19.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz"; - sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"; - name = "dolphin-plugins-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/dolphin-plugins-19.04.0.tar.xz"; + sha256 = "c2898e0a64d5a9eab2a4bd661694b75805adfd0a925f1a21f894892264f96469"; + name = "dolphin-plugins-19.04.0.tar.xz"; }; }; dragon = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz"; - sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"; - name = "dragon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/dragon-19.04.0.tar.xz"; + sha256 = "42bde9f6a4f3dfe7a6b2bfa35502474c2866e2649695302d602a97f00842fcf2"; + name = "dragon-19.04.0.tar.xz"; }; }; eventviews = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz"; - sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0"; - name = "eventviews-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/eventviews-19.04.0.tar.xz"; + sha256 = "ed34f228012ad2d45b0f07da469633118f35c28b1ddc7157149f4a5ab999500c"; + name = "eventviews-19.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz"; - sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338"; - name = "ffmpegthumbs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ffmpegthumbs-19.04.0.tar.xz"; + sha256 = "6b96cea0c142651cb586eb40d88792329f8da9a777d9a457ba76d0e94ddf4995"; + name = "ffmpegthumbs-19.04.0.tar.xz"; }; }; filelight = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz"; - sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"; - name = "filelight-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/filelight-19.04.0.tar.xz"; + sha256 = "22eaa8f0e9e69652240554687b2cecb55449e67caac6055c2d868f3089d835ad"; + name = "filelight-19.04.0.tar.xz"; }; }; granatier = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz"; - sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"; - name = "granatier-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/granatier-19.04.0.tar.xz"; + sha256 = "d83e91a5056e4caf1e522921025cb79355c0c2d53b7f0e98444d37291d80d63a"; + name = "granatier-19.04.0.tar.xz"; }; }; grantlee-editor = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz"; - sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c"; - name = "grantlee-editor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/grantlee-editor-19.04.0.tar.xz"; + sha256 = "ac888f2f2ccd4b289deac1d2df4415124e14bf183db1ff1088e88fa782f9f342"; + name = "grantlee-editor-19.04.0.tar.xz"; }; }; grantleetheme = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz"; - sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402"; - name = "grantleetheme-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/grantleetheme-19.04.0.tar.xz"; + sha256 = "6896a7e1db662bea03b6bdd9f92214b5fa50dfbebbbaa7b3156ddb87ccd55a3e"; + name = "grantleetheme-19.04.0.tar.xz"; }; }; gwenview = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz"; - sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"; - name = "gwenview-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/gwenview-19.04.0.tar.xz"; + sha256 = "c7d422bddf031fa9d5a23459c65ea6dbb5919e964cc194178a864ee98912b46d"; + name = "gwenview-19.04.0.tar.xz"; }; }; incidenceeditor = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz"; - sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02"; - name = "incidenceeditor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/incidenceeditor-19.04.0.tar.xz"; + sha256 = "c34fd55acd2f92705e43628fd0c9c4a550c73d45f30beba71dc75698143cbd5f"; + name = "incidenceeditor-19.04.0.tar.xz"; }; }; juk = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz"; - sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca"; - name = "juk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/juk-19.04.0.tar.xz"; + sha256 = "952366e14526701109e83c1979c2a7b3dfdf3c054ecb86c9b5a6cf9825196f60"; + name = "juk-19.04.0.tar.xz"; }; }; k3b = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz"; - sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e"; - name = "k3b-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/k3b-19.04.0.tar.xz"; + sha256 = "ab0293d0dab2048dcacd4fc54ee2e12d2f55adcecde7cd02e4c31ffd5917ee39"; + name = "k3b-19.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz"; - sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce"; - name = "kaccounts-integration-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kaccounts-integration-19.04.0.tar.xz"; + sha256 = "d7b257f6b7278361690b2c1d948c92bdb8b14f741ce96ef35f37c8eea3feb687"; + name = "kaccounts-integration-19.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz"; - sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6"; - name = "kaccounts-providers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kaccounts-providers-19.04.0.tar.xz"; + sha256 = "4eb74ef042c30ea44f5391f8798d9ceca44d46bf46480355160af61bcb6236d7"; + name = "kaccounts-providers-19.04.0.tar.xz"; }; }; kaddressbook = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz"; - sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28"; - name = "kaddressbook-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kaddressbook-19.04.0.tar.xz"; + sha256 = "821708c0a33063de050682c7768faeb51a467de9c4314901761449c09a8a3265"; + name = "kaddressbook-19.04.0.tar.xz"; }; }; kajongg = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz"; - sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9"; - name = "kajongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kajongg-19.04.0.tar.xz"; + sha256 = "832e76252321900f3bb3d3a96bb9f9a93235260803621c06d112b7cc48bd1555"; + name = "kajongg-19.04.0.tar.xz"; }; }; kalarm = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz"; - sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3"; - name = "kalarm-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kalarm-19.04.0.tar.xz"; + sha256 = "ed8f656e4aebb78d78f068ccde605489090ed0467452629784472b685fae331a"; + name = "kalarm-19.04.0.tar.xz"; }; }; kalarmcal = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz"; - sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8"; - name = "kalarmcal-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kalarmcal-19.04.0.tar.xz"; + sha256 = "ec0790d2b04bcd3a37a221bdbf4a10f94ff7dd8ac0228e773ce9fac14bbebf6e"; + name = "kalarmcal-19.04.0.tar.xz"; }; }; kalgebra = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz"; - sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"; - name = "kalgebra-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kalgebra-19.04.0.tar.xz"; + sha256 = "a46c4fc2b0891183d0a3b859182eef8d49206b81cbf6d2c6ed6d5448f2663a4a"; + name = "kalgebra-19.04.0.tar.xz"; }; }; kalzium = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz"; - sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef"; - name = "kalzium-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kalzium-19.04.0.tar.xz"; + sha256 = "16fe2873dfad5de78b9a07a4c528e8ac747a54eced9feaa65f1c9fccc23b0d03"; + name = "kalzium-19.04.0.tar.xz"; }; }; kamera = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz"; - sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f"; - name = "kamera-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kamera-19.04.0.tar.xz"; + sha256 = "b6b5891e886f543140d1ea6775ec1f1f4575e698d34af04fd65acbafa7e42392"; + name = "kamera-19.04.0.tar.xz"; }; }; kamoso = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz"; - sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3"; - name = "kamoso-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kamoso-19.04.0.tar.xz"; + sha256 = "200c805ba80a89026edcd02d4cd6d058eff1d537eb3da28807cb2162cc014765"; + name = "kamoso-19.04.0.tar.xz"; }; }; kanagram = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz"; - sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204"; - name = "kanagram-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kanagram-19.04.0.tar.xz"; + sha256 = "dda3ce8211957e016521597a923de92d261e32c31ebf84faa697bd26cf16647c"; + name = "kanagram-19.04.0.tar.xz"; }; }; kapman = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz"; - sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"; - name = "kapman-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kapman-19.04.0.tar.xz"; + sha256 = "f77dd3210bcdfb2d424f7a919848e25a4b4ae994d74b59111f352e41c2086324"; + name = "kapman-19.04.0.tar.xz"; }; }; kapptemplate = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz"; - sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f"; - name = "kapptemplate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kapptemplate-19.04.0.tar.xz"; + sha256 = "7983c4576c6168731958790851d732f8bd4f4313d2cd00a8bf4dd37a4b6a4bb4"; + name = "kapptemplate-19.04.0.tar.xz"; }; }; kate = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz"; - sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"; - name = "kate-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kate-19.04.0.tar.xz"; + sha256 = "64c3c312a69d45624e3619309b86de796f67d30a864433a5c24aeb4e299bacc9"; + name = "kate-19.04.0.tar.xz"; }; }; katomic = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz"; - sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"; - name = "katomic-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/katomic-19.04.0.tar.xz"; + sha256 = "ea6e6642e16f985653caf2cd9dd61248e7038fb0246e9af4d4daec20401537a2"; + name = "katomic-19.04.0.tar.xz"; }; }; kbackup = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz"; - sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf"; - name = "kbackup-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kbackup-19.04.0.tar.xz"; + sha256 = "84b8f7b05a1812deb128a85aa2d6f1010fb7b2f8cb51aa3771077ef20fd4b4ce"; + name = "kbackup-19.04.0.tar.xz"; }; }; kblackbox = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz"; - sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b"; - name = "kblackbox-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kblackbox-19.04.0.tar.xz"; + sha256 = "9363167664b6b4e54325f9691333df912eefa1e19d387c9a2780626914b813f9"; + name = "kblackbox-19.04.0.tar.xz"; }; }; kblocks = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz"; - sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"; - name = "kblocks-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kblocks-19.04.0.tar.xz"; + sha256 = "c70a60f3a2e4c8f7756a1f9b1e025f8f91ec83c4f54feedf0ba05eea36b0037e"; + name = "kblocks-19.04.0.tar.xz"; }; }; kblog = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz"; - sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc"; - name = "kblog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kblog-19.04.0.tar.xz"; + sha256 = "719c6ce92c006231869dcad84b14e3db7c8b71eff60e234a94353e2ef580d577"; + name = "kblog-19.04.0.tar.xz"; }; }; kbounce = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz"; - sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"; - name = "kbounce-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kbounce-19.04.0.tar.xz"; + sha256 = "cd28d777db8ff1dc1437fb6456c2fdfe8b9005c0cea3ce05337fbf425803834f"; + name = "kbounce-19.04.0.tar.xz"; }; }; kbreakout = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz"; - sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"; - name = "kbreakout-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kbreakout-19.04.0.tar.xz"; + sha256 = "c4aa847def701be288e53ceb27c8c63c34aa527f8e64c91fb007d053b1119db8"; + name = "kbreakout-19.04.0.tar.xz"; }; }; kbruch = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz"; - sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d"; - name = "kbruch-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kbruch-19.04.0.tar.xz"; + sha256 = "7762c233529b75859ab264bcfd9847acc06889b0ff96183a1af63effd40f3f38"; + name = "kbruch-19.04.0.tar.xz"; }; }; kcachegrind = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz"; - sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"; - name = "kcachegrind-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcachegrind-19.04.0.tar.xz"; + sha256 = "7021ac1b133e86692dad92ff8de6a0467c2b488d7e5c2977ee4880c166e088ca"; + name = "kcachegrind-19.04.0.tar.xz"; }; }; kcalc = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz"; - sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"; - name = "kcalc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcalc-19.04.0.tar.xz"; + sha256 = "0384ebf83c62e74a2412f71f648bad112f91ef3ec6aa64fe55e63fd88a156593"; + name = "kcalc-19.04.0.tar.xz"; }; }; kcalcore = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz"; - sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452"; - name = "kcalcore-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcalcore-19.04.0.tar.xz"; + sha256 = "0cdcfebabb9af96650b71ba6361a4557df35144f0b1041f004bff7510c6334b2"; + name = "kcalcore-19.04.0.tar.xz"; }; }; kcalutils = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz"; - sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9"; - name = "kcalutils-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcalutils-19.04.0.tar.xz"; + sha256 = "2841291555bf5ab85390e56b1c6c231bb6f1f5c9cbd12a634491781c3cfd83c8"; + name = "kcalutils-19.04.0.tar.xz"; }; }; kcharselect = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz"; - sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb"; - name = "kcharselect-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcharselect-19.04.0.tar.xz"; + sha256 = "788e6e97bb53216b4777fb19602d823a8e62f9ea25082f545e970a561fb3a78f"; + name = "kcharselect-19.04.0.tar.xz"; }; }; kcolorchooser = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz"; - sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"; - name = "kcolorchooser-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcolorchooser-19.04.0.tar.xz"; + sha256 = "8f338ba51349cb056f25266d884ca318d3fd3933288ec96f9f17df6c842bc839"; + name = "kcolorchooser-19.04.0.tar.xz"; }; }; kcontacts = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz"; - sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3"; - name = "kcontacts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcontacts-19.04.0.tar.xz"; + sha256 = "81ad5b3eada7c91b4b7ed09a0a17a146e87b3075925caa3d23b82c2a6f67f5b4"; + name = "kcontacts-19.04.0.tar.xz"; }; }; kcron = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz"; - sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3"; - name = "kcron-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kcron-19.04.0.tar.xz"; + sha256 = "58a84503da74d7c0e26ab14c95f92f57f0a9f0c5e1ce0fa4be30276728c8be35"; + name = "kcron-19.04.0.tar.xz"; }; }; kdav = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz"; - sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23"; - name = "kdav-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdav-19.04.0.tar.xz"; + sha256 = "dce315916a993dbff7f7748538da91944b20df3cb6fc042e0d145d53904ff5d9"; + name = "kdav-19.04.0.tar.xz"; }; }; kdebugsettings = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz"; - sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7"; - name = "kdebugsettings-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdebugsettings-19.04.0.tar.xz"; + sha256 = "7c06b1c5b1f14c3a67d34fda52494a8d47495b3473ecd9fe03e97cb1c88012c5"; + name = "kdebugsettings-19.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz"; - sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4"; - name = "kde-dev-scripts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kde-dev-scripts-19.04.0.tar.xz"; + sha256 = "23b777143c9402bf089cd2f84c5ac363183b74dcf81be8c08d74d5d099e898e5"; + name = "kde-dev-scripts-19.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz"; - sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6"; - name = "kde-dev-utils-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kde-dev-utils-19.04.0.tar.xz"; + sha256 = "ec2df1ab8b73f19ffc8ec7abeba0577b42d15bc372a19b456a2a04ebb4691031"; + name = "kde-dev-utils-19.04.0.tar.xz"; }; }; kdeedu-data = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz"; - sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999"; - name = "kdeedu-data-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdeedu-data-19.04.0.tar.xz"; + sha256 = "ddba1b8f78b1614ac8b43b605a9021d611765dea6152e0997c84d4f9b17d9be6"; + name = "kdeedu-data-19.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz"; - sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52"; - name = "kdegraphics-mobipocket-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdegraphics-mobipocket-19.04.0.tar.xz"; + sha256 = "37db302ed0d70766cf75e052f27150553b875428b68c886fe4d16452edd18939"; + name = "kdegraphics-mobipocket-19.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz"; - sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0"; - name = "kdegraphics-thumbnailers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdegraphics-thumbnailers-19.04.0.tar.xz"; + sha256 = "7af5fb986c493649a1eec9ba881f8b9c06c5d7459f0acc59e7ee7d185bc7ee70"; + name = "kdegraphics-thumbnailers-19.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz"; - sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503"; - name = "kdenetwork-filesharing-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdenetwork-filesharing-19.04.0.tar.xz"; + sha256 = "a88277659bc1dd5ddfea9dd63c3764a1f31d06235aa07c528c12a63a7605c943"; + name = "kdenetwork-filesharing-19.04.0.tar.xz"; }; }; kdenlive = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz"; - sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"; - name = "kdenlive-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdenlive-19.04.0.tar.xz"; + sha256 = "274ae17b4376258ef83d810cb33677ca3224e205ea8b69982dd0fc4e5ee5878a"; + name = "kdenlive-19.04.0.tar.xz"; }; }; kdepim-addons = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz"; - sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5"; - name = "kdepim-addons-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdepim-addons-19.04.0.tar.xz"; + sha256 = "778e946e74f36d368f484226ccc6f9cbd548d1cb2b0c3536e87d9374c64ddd88"; + name = "kdepim-addons-19.04.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz"; - sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164"; - name = "kdepim-apps-libs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdepim-apps-libs-19.04.0.tar.xz"; + sha256 = "f335f736d854b56bab89814db44761c7e49b35e5266dddee78d22c6465e305c1"; + name = "kdepim-apps-libs-19.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz"; - sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3"; - name = "kdepim-runtime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdepim-runtime-19.04.0.tar.xz"; + sha256 = "944e956d260ba5a735b3c94c6c075f207a9c38bf977ed19507b4dd0f3eaa4993"; + name = "kdepim-runtime-19.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz"; - sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad"; - name = "kdesdk-kioslaves-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdesdk-kioslaves-19.04.0.tar.xz"; + sha256 = "8765a03f1a6930f28f053b920839e673dbc19bd1947900d84324be963147381a"; + name = "kdesdk-kioslaves-19.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz"; - sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b"; - name = "kdesdk-thumbnailers-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdesdk-thumbnailers-19.04.0.tar.xz"; + sha256 = "195f539bec6e19de83e07dce117f7cd656f77199c2863a6a5738112d53843243"; + name = "kdesdk-thumbnailers-19.04.0.tar.xz"; }; }; kdf = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz"; - sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"; - name = "kdf-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdf-19.04.0.tar.xz"; + sha256 = "f1204fddefe5492c860a77ff2c343f9b885625b321a37673763d73510dd469fd"; + name = "kdf-19.04.0.tar.xz"; }; }; kdialog = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz"; - sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212"; - name = "kdialog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdialog-19.04.0.tar.xz"; + sha256 = "2cdd5a65046cfc09246bd1fbc8be818db486e35437f00e20e372d58988f04ace"; + name = "kdialog-19.04.0.tar.xz"; }; }; kdiamond = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz"; - sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"; - name = "kdiamond-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kdiamond-19.04.0.tar.xz"; + sha256 = "121ef36611bf7fe9a7d1d4700622a4cc8a349fe262b7c568026a4da55dfd4b26"; + name = "kdiamond-19.04.0.tar.xz"; }; }; keditbookmarks = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz"; - sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d"; - name = "keditbookmarks-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/keditbookmarks-19.04.0.tar.xz"; + sha256 = "23770a42aa72eb275b2b5a21f8e2f0959eec112ab048c6d89999ee156cd2ef65"; + name = "keditbookmarks-19.04.0.tar.xz"; }; }; kfind = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz"; - sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"; - name = "kfind-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kfind-19.04.0.tar.xz"; + sha256 = "7eec5b096738bb28264bf870bdd85e24f97c62677be2d2a061f6c426ecfc3a47"; + name = "kfind-19.04.0.tar.xz"; }; }; kfloppy = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz"; - sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363"; - name = "kfloppy-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kfloppy-19.04.0.tar.xz"; + sha256 = "fafa66fddf5fe938b5666ef94ea4a1f41487cb3cc815fa6bc65332ee7574f7e1"; + name = "kfloppy-19.04.0.tar.xz"; }; }; kfourinline = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz"; - sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce"; - name = "kfourinline-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kfourinline-19.04.0.tar.xz"; + sha256 = "458bc34c169df064c8d974d6f27e18e3cc5f3e9fb069358817d00a590f2e200a"; + name = "kfourinline-19.04.0.tar.xz"; }; }; kgeography = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz"; - sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9"; - name = "kgeography-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kgeography-19.04.0.tar.xz"; + sha256 = "ee126fc91ba164e0c095e7cef231a1389a4e1423256773c4e7d4b7306077eb41"; + name = "kgeography-19.04.0.tar.xz"; }; }; kget = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz"; - sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86"; - name = "kget-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kget-19.04.0.tar.xz"; + sha256 = "e1ec10f36f8b451c2cfc02108e00c6ab3e1115719342b9fa1f1f5829746fbeb9"; + name = "kget-19.04.0.tar.xz"; }; }; kgoldrunner = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz"; - sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6"; - name = "kgoldrunner-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kgoldrunner-19.04.0.tar.xz"; + sha256 = "3d2eb37695328065ee5cf4c4ba4ee707ce514b4c7aab84c93cd3bef8d329b8ba"; + name = "kgoldrunner-19.04.0.tar.xz"; }; }; kgpg = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz"; - sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8"; - name = "kgpg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kgpg-19.04.0.tar.xz"; + sha256 = "2fb47d9d08cfca94dce1c4d19bce5d2955c3cd3ceec6265a8b537de612a53128"; + name = "kgpg-19.04.0.tar.xz"; }; }; khangman = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz"; - sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013"; - name = "khangman-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/khangman-19.04.0.tar.xz"; + sha256 = "2a7120f7a54848dc017efdb86c22a964626029d9ca300d8e1488d385f10dc61c"; + name = "khangman-19.04.0.tar.xz"; }; }; khelpcenter = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz"; - sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"; - name = "khelpcenter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/khelpcenter-19.04.0.tar.xz"; + sha256 = "5fc4f9553e8575055edf259baa3d0b0c663db5caf67dc392db9e519d6b85699f"; + name = "khelpcenter-19.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz"; - sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662"; - name = "kidentitymanagement-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kidentitymanagement-19.04.0.tar.xz"; + sha256 = "1ddce9330947fdfd970f07b60d6e9ff012e21a673262796ccb29e56e277b55a3"; + name = "kidentitymanagement-19.04.0.tar.xz"; }; }; kig = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz"; - sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2"; - name = "kig-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kig-19.04.0.tar.xz"; + sha256 = "781243a23a94d7a9882bd69ddfcd74a5b9df0ce28cd45488e62dcf54e3633234"; + name = "kig-19.04.0.tar.xz"; }; }; kigo = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz"; - sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484"; - name = "kigo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kigo-19.04.0.tar.xz"; + sha256 = "30f12515ec4d22d39c6c90690545e1975a3ba9917180503ef42cba40ffbd874c"; + name = "kigo-19.04.0.tar.xz"; }; }; killbots = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz"; - sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9"; - name = "killbots-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/killbots-19.04.0.tar.xz"; + sha256 = "0cc928a1956b72bc207feed237598b445b5a7d7d26a266ec88080c1510870359"; + name = "killbots-19.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz"; - sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6"; - name = "kimagemapeditor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kimagemapeditor-19.04.0.tar.xz"; + sha256 = "8d3ff906926fe8f82b21cf19d784dbddfcda15de9513feaa9defa6e4ff3b1869"; + name = "kimagemapeditor-19.04.0.tar.xz"; }; }; kimap = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz"; - sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992"; - name = "kimap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kimap-19.04.0.tar.xz"; + sha256 = "cda62c81c47011ad2adbf78222eab4528a62116487531ce1aa98f6100706d2fd"; + name = "kimap-19.04.0.tar.xz"; }; }; kio-extras = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz"; - sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"; - name = "kio-extras-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kio-extras-19.04.0.tar.xz"; + sha256 = "0f3f2eaf40512cf4a61b09b94ca365d7d05c7b1a75f4e8afd047143a8e962d85"; + name = "kio-extras-19.04.0.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz"; - sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39"; - name = "kirigami-gallery-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kirigami-gallery-19.04.0.tar.xz"; + sha256 = "c0ac9e9a07072d1a538d2535fd21dede86cc4ee9287c7b1ca3d6b8f8726a7155"; + name = "kirigami-gallery-19.04.0.tar.xz"; }; }; kiriki = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz"; - sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac"; - name = "kiriki-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kiriki-19.04.0.tar.xz"; + sha256 = "feb7b4fce0e6b1749bddd254a46a5d34bf5584a3d60aef460816380141ad630e"; + name = "kiriki-19.04.0.tar.xz"; }; }; kiten = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz"; - sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf"; - name = "kiten-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kiten-19.04.0.tar.xz"; + sha256 = "53f5e4ef48b18989084858ab5c96b7dedf357cecf4dba3b2d2a967b4b4b8a742"; + name = "kiten-19.04.0.tar.xz"; }; }; kitinerary = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz"; - sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35"; - name = "kitinerary-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kitinerary-19.04.0.tar.xz"; + sha256 = "b56c93b7114cad54313471e6ab4cebde461a2b39859b47e9b8f7f146d3471889"; + name = "kitinerary-19.04.0.tar.xz"; }; }; kjumpingcube = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz"; - sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993"; - name = "kjumpingcube-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kjumpingcube-19.04.0.tar.xz"; + sha256 = "28fabf01d0a2481c54018d00985254acb107579c5afa93bbec7b3795c2a3f143"; + name = "kjumpingcube-19.04.0.tar.xz"; }; }; kldap = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz"; - sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e"; - name = "kldap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kldap-19.04.0.tar.xz"; + sha256 = "2cddadf995a10b854b28e34c18db14c32ad985c18af466edde6a1b2a9a2d8a23"; + name = "kldap-19.04.0.tar.xz"; }; }; kleopatra = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz"; - sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b"; - name = "kleopatra-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kleopatra-19.04.0.tar.xz"; + sha256 = "8ad7ec0b99efabdbc270559098dfca64e39ddd30a64b13915c04988a9c8b8b70"; + name = "kleopatra-19.04.0.tar.xz"; }; }; klettres = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz"; - sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93"; - name = "klettres-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/klettres-19.04.0.tar.xz"; + sha256 = "c8a5596638ea7bbe7e26c246c5904840bf544e632e5649430bb32159aedefd60"; + name = "klettres-19.04.0.tar.xz"; }; }; klickety = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz"; - sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5"; - name = "klickety-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/klickety-19.04.0.tar.xz"; + sha256 = "2ad160e3ea0a6f11c828f3b4bcea8f75db4121dda6d6e498fa1fc095e82e80e5"; + name = "klickety-19.04.0.tar.xz"; }; }; klines = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz"; - sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80"; - name = "klines-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/klines-19.04.0.tar.xz"; + sha256 = "139c0a4da7186e6e57228fcbe8666aa40e52ae01f328fea4d53ed8611ed54a96"; + name = "klines-19.04.0.tar.xz"; }; }; kmag = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz"; - sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"; - name = "kmag-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmag-19.04.0.tar.xz"; + sha256 = "c6725654846e83b383ff6c624683e4132538f2e812d8131cadefd6926316520e"; + name = "kmag-19.04.0.tar.xz"; }; }; kmahjongg = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz"; - sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"; - name = "kmahjongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmahjongg-19.04.0.tar.xz"; + sha256 = "519bf6bb0bc098f74467d3ec9b49c82d22241dfd518d004163565e86dbc21a36"; + name = "kmahjongg-19.04.0.tar.xz"; }; }; kmail = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz"; - sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76"; - name = "kmail-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmail-19.04.0.tar.xz"; + sha256 = "c191057769513d51d6604e0f51e441e54770ac07a982175a5be29b7797d6f486"; + name = "kmail-19.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz"; - sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df"; - name = "kmail-account-wizard-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmail-account-wizard-19.04.0.tar.xz"; + sha256 = "640d63ceca23644e2f358c7117eb54daa0fffc669628398f7930fe273d7944a9"; + name = "kmail-account-wizard-19.04.0.tar.xz"; }; }; kmailtransport = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz"; - sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1"; - name = "kmailtransport-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmailtransport-19.04.0.tar.xz"; + sha256 = "35104e661fd501bd5848006dfd907f8cd1dfe88609ed4f9fbc4ce599a2f20c8f"; + name = "kmailtransport-19.04.0.tar.xz"; }; }; kmbox = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz"; - sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841"; - name = "kmbox-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmbox-19.04.0.tar.xz"; + sha256 = "cd37b698e4ad12317a6d1f7df786345f5df7112ea3d21c2c23545e48a67e8544"; + name = "kmbox-19.04.0.tar.xz"; }; }; kmime = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz"; - sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274"; - name = "kmime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmime-19.04.0.tar.xz"; + sha256 = "2081adec0e6972e513206bee69c0e165904670b7bcf34c52e7da07323537d513"; + name = "kmime-19.04.0.tar.xz"; }; }; kmines = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz"; - sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"; - name = "kmines-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmines-19.04.0.tar.xz"; + sha256 = "56452ab18c74f2863efc99200a5facd53827382c06fc8534d095bffaca497566"; + name = "kmines-19.04.0.tar.xz"; }; }; kmix = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz"; - sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"; - name = "kmix-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmix-19.04.0.tar.xz"; + sha256 = "f372d50ccdb496a3bb7a3f68c84c921c12d3d535a792400e701ed7c640e45f2a"; + name = "kmix-19.04.0.tar.xz"; }; }; kmousetool = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz"; - sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8"; - name = "kmousetool-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmousetool-19.04.0.tar.xz"; + sha256 = "89e383a395ec5f1c7d25cc5fb45ecb73a3a0931919a2be533634d77c01cb3fa9"; + name = "kmousetool-19.04.0.tar.xz"; }; }; kmouth = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz"; - sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486"; - name = "kmouth-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmouth-19.04.0.tar.xz"; + sha256 = "32666760ed76dd2dc816df52c990cb3b8487346ac37bf065e4b109fb6661ebc3"; + name = "kmouth-19.04.0.tar.xz"; }; }; kmplot = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz"; - sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"; - name = "kmplot-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kmplot-19.04.0.tar.xz"; + sha256 = "fb981354dd6fea18e83003df957f65a9580d458b377adde88a838d4db9a97ee6"; + name = "kmplot-19.04.0.tar.xz"; }; }; knavalbattle = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz"; - sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3"; - name = "knavalbattle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/knavalbattle-19.04.0.tar.xz"; + sha256 = "1e6fbd202092230017c268cd825438debf766e3cc810244b63dc8690b5a69585"; + name = "knavalbattle-19.04.0.tar.xz"; }; }; knetwalk = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz"; - sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f"; - name = "knetwalk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/knetwalk-19.04.0.tar.xz"; + sha256 = "84b03a6b7c3ff6634402b016089a54ed0116ace221fdfb04ad3d2a8997f68b4b"; + name = "knetwalk-19.04.0.tar.xz"; }; }; knights = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz"; - sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990"; - name = "knights-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/knights-19.04.0.tar.xz"; + sha256 = "53eb3214550fc104755ffe076c970cf5499c9553b543d83df42a3b5f5d8d309a"; + name = "knights-19.04.0.tar.xz"; }; }; knotes = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz"; - sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578"; - name = "knotes-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/knotes-19.04.0.tar.xz"; + sha256 = "e2f98d029105d18c5c14b774782287e281e2367eebeb84d52727a5156abe4092"; + name = "knotes-19.04.0.tar.xz"; }; }; kolf = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz"; - sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f"; - name = "kolf-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kolf-19.04.0.tar.xz"; + sha256 = "431b31dc6290214be5f5df1d3c6a8eb4a910b4f72135840d4ec3fa6945319c81"; + name = "kolf-19.04.0.tar.xz"; }; }; kollision = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz"; - sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856"; - name = "kollision-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kollision-19.04.0.tar.xz"; + sha256 = "f218ef5691235155911b4d03cd301ee6caa0bde6eb324cd55117e722002b0927"; + name = "kollision-19.04.0.tar.xz"; }; }; kolourpaint = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz"; - sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"; - name = "kolourpaint-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kolourpaint-19.04.0.tar.xz"; + sha256 = "d6cd087ba34a1a8fec9349dea06c1b71a70f6e8455adb41d4820a376eb2ed141"; + name = "kolourpaint-19.04.0.tar.xz"; }; }; kompare = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz"; - sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285"; - name = "kompare-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kompare-19.04.0.tar.xz"; + sha256 = "49453b90e21d3b2acd766aac244f579e2dc446ec8abf854ceb2faf34fc3e647f"; + name = "kompare-19.04.0.tar.xz"; }; }; konqueror = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz"; - sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a"; - name = "konqueror-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/konqueror-19.04.0.tar.xz"; + sha256 = "8da6fdd7de037bed79b6341e670a7491d371d084c59fdbefb4ffae0d2da82e4c"; + name = "konqueror-19.04.0.tar.xz"; }; }; konquest = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz"; - sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172"; - name = "konquest-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/konquest-19.04.0.tar.xz"; + sha256 = "5361a865fefc0dac19e166d282188b732cfbe4389afe095c38c8d30b56f7ff6f"; + name = "konquest-19.04.0.tar.xz"; }; }; konsole = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz"; - sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"; - name = "konsole-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/konsole-19.04.0.tar.xz"; + sha256 = "62d53840f6cac4686feafa7f75d641bb56867b7dfc12e6ce95afa7e796e37cef"; + name = "konsole-19.04.0.tar.xz"; }; }; kontact = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz"; - sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315"; - name = "kontact-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kontact-19.04.0.tar.xz"; + sha256 = "710d72ba01afa2aea89efca61f6c25245c0db04dc675b8871f7109a42a945cca"; + name = "kontact-19.04.0.tar.xz"; }; }; kontactinterface = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz"; - sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41"; - name = "kontactinterface-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kontactinterface-19.04.0.tar.xz"; + sha256 = "268005d61e97dab34f200b0e7a461afddb32a88ccc7c553b6c967865a6915392"; + name = "kontactinterface-19.04.0.tar.xz"; }; }; kopete = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz"; - sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b"; - name = "kopete-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kopete-19.04.0.tar.xz"; + sha256 = "88068ceb8735e1b7ecaac9a9e4c36d40629b53d514c987823c987cfac6dc99df"; + name = "kopete-19.04.0.tar.xz"; }; }; korganizer = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz"; - sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c"; - name = "korganizer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/korganizer-19.04.0.tar.xz"; + sha256 = "3e8c69db9f504e3ec80307d1552af21440621c0e480abf874a5a73482800bcaf"; + name = "korganizer-19.04.0.tar.xz"; }; }; kpat = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz"; - sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"; - name = "kpat-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kpat-19.04.0.tar.xz"; + sha256 = "bcd295a3df422b5cfa8258bb3cd0be7e4405f44604681d98589f2982c44414a1"; + name = "kpat-19.04.0.tar.xz"; }; }; kpimtextedit = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz"; - sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d"; - name = "kpimtextedit-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kpimtextedit-19.04.0.tar.xz"; + sha256 = "b4c640ee8ae5c4356bc26819763721580ca87477eb39258c1eaacdffbfc5311a"; + name = "kpimtextedit-19.04.0.tar.xz"; }; }; kpkpass = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz"; - sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f"; - name = "kpkpass-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kpkpass-19.04.0.tar.xz"; + sha256 = "0121e03af506451a39b34a2f0ca063228454a40f71d9706dea3cee644a4c8f28"; + name = "kpkpass-19.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz"; - sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe"; - name = "kqtquickcharts-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kqtquickcharts-19.04.0.tar.xz"; + sha256 = "c8a270932f11fc5ee9270c77205b1a93edfe73c2e629a602940acb15d853803f"; + name = "kqtquickcharts-19.04.0.tar.xz"; }; }; krdc = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz"; - sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666"; - name = "krdc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/krdc-19.04.0.tar.xz"; + sha256 = "2a1ac548992eaaff82cafe386eef0a611b96f06ce3887a363b25d6ca17c6eacc"; + name = "krdc-19.04.0.tar.xz"; }; }; kreversi = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz"; - sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"; - name = "kreversi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kreversi-19.04.0.tar.xz"; + sha256 = "a715d068eaf381a26e1f432f2d6b3f3ffffb388282b484cd8ad0833acf429d82"; + name = "kreversi-19.04.0.tar.xz"; }; }; krfb = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz"; - sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b"; - name = "krfb-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/krfb-19.04.0.tar.xz"; + sha256 = "321b1b296dfbd69e64048fbf991aec1a9d8c251e9f0084a396081f62287c6b40"; + name = "krfb-19.04.0.tar.xz"; }; }; kross-interpreters = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz"; - sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c"; - name = "kross-interpreters-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kross-interpreters-19.04.0.tar.xz"; + sha256 = "e910e76e58603077177b7835bed2b9562b266e2fc0ab78c8b2642edc752ccd27"; + name = "kross-interpreters-19.04.0.tar.xz"; }; }; kruler = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz"; - sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33"; - name = "kruler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kruler-19.04.0.tar.xz"; + sha256 = "7d29eac1d7f4e39f7d754ebb9d68aba70ab3dc12e8241007de750572ce761d73"; + name = "kruler-19.04.0.tar.xz"; }; }; kshisen = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz"; - sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f"; - name = "kshisen-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kshisen-19.04.0.tar.xz"; + sha256 = "c7d2799105c71d5d0077383c9b24a52ae85705c39977c8dc167a2594651c17eb"; + name = "kshisen-19.04.0.tar.xz"; }; }; ksirk = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz"; - sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a"; - name = "ksirk-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksirk-19.04.0.tar.xz"; + sha256 = "3dcd578050807aa37652e5e589ddff7a5aec46c82309db85aab588bd3060d5a0"; + name = "ksirk-19.04.0.tar.xz"; }; }; ksmtp = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz"; - sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74"; - name = "ksmtp-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksmtp-19.04.0.tar.xz"; + sha256 = "c92b8b6b9de60bca7b9bb7befdd519041625188a955e55b63860d9de4b3e0bab"; + name = "ksmtp-19.04.0.tar.xz"; }; }; ksnakeduel = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz"; - sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36"; - name = "ksnakeduel-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksnakeduel-19.04.0.tar.xz"; + sha256 = "e9ca727c7e7cef21e9bedbb1504b2023baac9ab5ba0b624dc91e1bf716eb8335"; + name = "ksnakeduel-19.04.0.tar.xz"; }; }; kspaceduel = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz"; - sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11"; - name = "kspaceduel-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kspaceduel-19.04.0.tar.xz"; + sha256 = "486b8d84f3070b7795456ec5847d7b5a9bb3c2b5d3e1c4bcdfedff18b8d735a7"; + name = "kspaceduel-19.04.0.tar.xz"; }; }; ksquares = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz"; - sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d"; - name = "ksquares-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksquares-19.04.0.tar.xz"; + sha256 = "c5a7dc34619f1ee4d621c3371b65bdcd46cf3433c183b4bc85c8a7586b6e85b4"; + name = "ksquares-19.04.0.tar.xz"; }; }; ksudoku = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz"; - sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"; - name = "ksudoku-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksudoku-19.04.0.tar.xz"; + sha256 = "4f5cff274741326bff02108fef4996f289c56ff026fd6e2921e4a2bf492a14cb"; + name = "ksudoku-19.04.0.tar.xz"; }; }; ksystemlog = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz"; - sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"; - name = "ksystemlog-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ksystemlog-19.04.0.tar.xz"; + sha256 = "6a9f389b04fac92b0e2955e86e4a45aa73494f6dd24c9a6704826b469414fb5d"; + name = "ksystemlog-19.04.0.tar.xz"; }; }; kteatime = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz"; - sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d"; - name = "kteatime-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kteatime-19.04.0.tar.xz"; + sha256 = "8672fa70912e9bf4488d5258258a14babbf65ee160dc537ab665ff2136a0c490"; + name = "kteatime-19.04.0.tar.xz"; }; }; ktimer = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz"; - sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e"; - name = "ktimer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktimer-19.04.0.tar.xz"; + sha256 = "d772292fa447aec07ff763d7bdfc351fbf2fd7d09160a574ec36ff2905ea5b79"; + name = "ktimer-19.04.0.tar.xz"; }; }; ktnef = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz"; - sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec"; - name = "ktnef-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktnef-19.04.0.tar.xz"; + sha256 = "bc3e826bc831ffac5b3b92cef14fca3f4b077d30652ce2ebdcffa07dafd58c56"; + name = "ktnef-19.04.0.tar.xz"; }; }; ktouch = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz"; - sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6"; - name = "ktouch-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktouch-19.04.0.tar.xz"; + sha256 = "707fca9ee9d0d217683e2bb562f5f8f984ddbd0ed7274b022a43bdc176898390"; + name = "ktouch-19.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz"; - sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb"; - name = "ktp-accounts-kcm-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-accounts-kcm-19.04.0.tar.xz"; + sha256 = "e7c11f4310dd4cb119336fb569cc9799dbdd3d7f4b87af9e265f8fc4439ec7f8"; + name = "ktp-accounts-kcm-19.04.0.tar.xz"; }; }; ktp-approver = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz"; - sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6"; - name = "ktp-approver-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-approver-19.04.0.tar.xz"; + sha256 = "ec273b9eabcedd47c97fa60c68a3037115b9b06a91892d32871e8ded4c04cdfe"; + name = "ktp-approver-19.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz"; - sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be"; - name = "ktp-auth-handler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-auth-handler-19.04.0.tar.xz"; + sha256 = "db459ed02c5ed37ce41ec9728d931ca1ab987c43d1b48f501d38b40e1e4f19e9"; + name = "ktp-auth-handler-19.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz"; - sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571"; - name = "ktp-call-ui-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-call-ui-19.04.0.tar.xz"; + sha256 = "b63ef1f0bcaed631f9106a355dd60e48edb6e7e39bb6bd0603b504fc33949427"; + name = "ktp-call-ui-19.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz"; - sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740"; - name = "ktp-common-internals-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-common-internals-19.04.0.tar.xz"; + sha256 = "12e3e0733eef78a649fa1e55f2f3d228b581fb1a0ba401e154dd57d4eb286eaa"; + name = "ktp-common-internals-19.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz"; - sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1"; - name = "ktp-contact-list-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-contact-list-19.04.0.tar.xz"; + sha256 = "745a1b403e3e1bfd0604521709f44634ab15a053b45f5c390d9a8e80fa405668"; + name = "ktp-contact-list-19.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz"; - sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9"; - name = "ktp-contact-runner-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-contact-runner-19.04.0.tar.xz"; + sha256 = "12d9e3cf2a230e590c9e3e17462b8e061641a70840492971434b131c15594773"; + name = "ktp-contact-runner-19.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz"; - sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4"; - name = "ktp-desktop-applets-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-desktop-applets-19.04.0.tar.xz"; + sha256 = "ba5d0422156e0ea38db1abeb317310266fd96b2b259a40df4233880d15037d8c"; + name = "ktp-desktop-applets-19.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz"; - sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231"; - name = "ktp-filetransfer-handler-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-filetransfer-handler-19.04.0.tar.xz"; + sha256 = "3088b79a79b35fc52f38ae2941e9f1ca8a80a1eed1c3bcdfd489b2e069febcfd"; + name = "ktp-filetransfer-handler-19.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz"; - sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854"; - name = "ktp-kded-module-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-kded-module-19.04.0.tar.xz"; + sha256 = "3409e3ec270f0ba2f558b6e6a84e9948936c128cc536fc6c16c4dd5bd8a3c94b"; + name = "ktp-kded-module-19.04.0.tar.xz"; }; }; ktp-send-file = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz"; - sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2"; - name = "ktp-send-file-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-send-file-19.04.0.tar.xz"; + sha256 = "f0be593d3101cbc5027e7dcc23a767d2e3e753d140afe97d5790db20eea07226"; + name = "ktp-send-file-19.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz"; - sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e"; - name = "ktp-text-ui-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktp-text-ui-19.04.0.tar.xz"; + sha256 = "78ac51d23e54d6044b70083db8d2c6972643a207a7f475cde15292e08b6b6469"; + name = "ktp-text-ui-19.04.0.tar.xz"; }; }; ktuberling = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz"; - sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04"; - name = "ktuberling-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/ktuberling-19.04.0.tar.xz"; + sha256 = "984c29562bd20f93117e7d79aa120dd906e6d4490ae5d2b52ad03f7bbfb85ace"; + name = "ktuberling-19.04.0.tar.xz"; }; }; kturtle = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz"; - sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253"; - name = "kturtle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kturtle-19.04.0.tar.xz"; + sha256 = "89e836a2737c98caf1ceb16b7ac648262d6a6770ac5bb5b0d9fbfed4abeeda7d"; + name = "kturtle-19.04.0.tar.xz"; }; }; kubrick = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz"; - sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3"; - name = "kubrick-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kubrick-19.04.0.tar.xz"; + sha256 = "72adc4e07df6062dd444c4bb9571429acf9c2ee68e273bc42c7925b1c06aad5e"; + name = "kubrick-19.04.0.tar.xz"; }; }; kwalletmanager = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz"; - sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"; - name = "kwalletmanager-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kwalletmanager-19.04.0.tar.xz"; + sha256 = "5cc25daaa8511694b01ba4b0a7ca39f8f2eef9fce10e99411ae287013fc27734"; + name = "kwalletmanager-19.04.0.tar.xz"; }; }; kwave = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz"; - sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"; - name = "kwave-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kwave-19.04.0.tar.xz"; + sha256 = "510b99740c87ade2e644b8b62ece9ac46721e636aeb83f253939d4d191d03a52"; + name = "kwave-19.04.0.tar.xz"; }; }; kwordquiz = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz"; - sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc"; - name = "kwordquiz-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/kwordquiz-19.04.0.tar.xz"; + sha256 = "a6433b5a2497398ed790965ef5469b53e406882f93b5a05e574d05cb193ef866"; + name = "kwordquiz-19.04.0.tar.xz"; }; }; libgravatar = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz"; - sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee"; - name = "libgravatar-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libgravatar-19.04.0.tar.xz"; + sha256 = "ee62597fffa534b45f89056028d1d9ff871c7da7093d11a128a6decfb5312d12"; + name = "libgravatar-19.04.0.tar.xz"; }; }; libkcddb = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz"; - sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29"; - name = "libkcddb-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkcddb-19.04.0.tar.xz"; + sha256 = "d15cef6fe986daba5ea051fda7146c784d993e83ca495faf58fad586ca370c32"; + name = "libkcddb-19.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz"; - sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926"; - name = "libkcompactdisc-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkcompactdisc-19.04.0.tar.xz"; + sha256 = "7236af70872c7b20070d9c096a8d4da45cdf62874d6d1314b183edf8b0d701d6"; + name = "libkcompactdisc-19.04.0.tar.xz"; }; }; libkdcraw = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz"; - sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"; - name = "libkdcraw-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkdcraw-19.04.0.tar.xz"; + sha256 = "30df02047c0f1b97a7c90c8eb5f7a3c5d322f13e0158395d3f9798ff21ed529e"; + name = "libkdcraw-19.04.0.tar.xz"; }; }; libkdegames = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz"; - sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"; - name = "libkdegames-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkdegames-19.04.0.tar.xz"; + sha256 = "2965e4a313609f6408becb13e54e26bfe14b37b58e7737e051129896f6e8bcd3"; + name = "libkdegames-19.04.0.tar.xz"; }; }; libkdepim = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz"; - sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640"; - name = "libkdepim-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkdepim-19.04.0.tar.xz"; + sha256 = "099c7bd90e540c6996f333393afa4831c94b6fbe65f7800bde712ebae4ba8a8e"; + name = "libkdepim-19.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz"; - sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4"; - name = "libkeduvocdocument-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkeduvocdocument-19.04.0.tar.xz"; + sha256 = "bb0300ca6a89c7174714b005032380b81e6e7bfdf3a3bab82b6f42fc0693045e"; + name = "libkeduvocdocument-19.04.0.tar.xz"; }; }; libkexiv2 = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz"; - sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"; - name = "libkexiv2-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkexiv2-19.04.0.tar.xz"; + sha256 = "9fcafa932631429af1693642415d2f202ad29338b63949b5e8661135eb69dc19"; + name = "libkexiv2-19.04.0.tar.xz"; }; }; libkgapi = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz"; - sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924"; - name = "libkgapi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkgapi-19.04.0.tar.xz"; + sha256 = "014084b04ee76939a318f711259bbb540037b45fe57a25b200ed4095b74970dc"; + name = "libkgapi-19.04.0.tar.xz"; }; }; libkgeomap = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz"; - sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b"; - name = "libkgeomap-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkgeomap-19.04.0.tar.xz"; + sha256 = "12cf73da1d406b8f6efe88c1d1bc56ecf3260bbe41759c4dec061df627e990e9"; + name = "libkgeomap-19.04.0.tar.xz"; }; }; libkipi = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz"; - sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31"; - name = "libkipi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkipi-19.04.0.tar.xz"; + sha256 = "6fc176e72e829dafe19e17a1d97b032f464d837621989751efe38cdd03d7d285"; + name = "libkipi-19.04.0.tar.xz"; }; }; libkleo = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz"; - sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69"; - name = "libkleo-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkleo-19.04.0.tar.xz"; + sha256 = "fbd97ae860c0361fca8bfa8a80a2d19e96779eb8d436a9a32c10cfe9767d8981"; + name = "libkleo-19.04.0.tar.xz"; }; }; libkmahjongg = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz"; - sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"; - name = "libkmahjongg-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkmahjongg-19.04.0.tar.xz"; + sha256 = "1ab4461ba92de0cc56bd349a859d5c647f816b20923692237e7f3098ba9dd76e"; + name = "libkmahjongg-19.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz"; - sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c"; - name = "libkomparediff2-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libkomparediff2-19.04.0.tar.xz"; + sha256 = "ffb3370aa869831f86dc009353abd72a5f0c7a7d1c570d5fecf9747131247464"; + name = "libkomparediff2-19.04.0.tar.xz"; }; }; libksane = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz"; - sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034"; - name = "libksane-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libksane-19.04.0.tar.xz"; + sha256 = "15a4f14ddb26e7e0ed54926c54941b29eebba1fabb2e75ad9f5cd48b9b673f58"; + name = "libksane-19.04.0.tar.xz"; }; }; libksieve = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz"; - sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754"; - name = "libksieve-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/libksieve-19.04.0.tar.xz"; + sha256 = "451d71d6c6e8cdfe0ef540cbcca94dae57260563e1e435b41f7070ecb86f6312"; + name = "libksieve-19.04.0.tar.xz"; }; }; lokalize = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz"; - sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"; - name = "lokalize-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/lokalize-19.04.0.tar.xz"; + sha256 = "e2e8cd6f9bb0e59ffd4b88e5513b757df3b63892ce90e7000c872e896ef74266"; + name = "lokalize-19.04.0.tar.xz"; }; }; lskat = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz"; - sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2"; - name = "lskat-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/lskat-19.04.0.tar.xz"; + sha256 = "c3358e62eb8a0c428c32f1ac759f5ead15d4ab552b1ae5b273e6927d14bb0ad1"; + name = "lskat-19.04.0.tar.xz"; }; }; mailcommon = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz"; - sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1"; - name = "mailcommon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/mailcommon-19.04.0.tar.xz"; + sha256 = "cd599079d290f540c83919182eab7e2d236a939a3405d1f882385822fc5d3682"; + name = "mailcommon-19.04.0.tar.xz"; }; }; mailimporter = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz"; - sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3"; - name = "mailimporter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/mailimporter-19.04.0.tar.xz"; + sha256 = "d5649d24aca659fbb00284a70aef868e31a56a9c688a0457945ec0d31c7a22ed"; + name = "mailimporter-19.04.0.tar.xz"; }; }; marble = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz"; - sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"; - name = "marble-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/marble-19.04.0.tar.xz"; + sha256 = "7405c76970d6ec500e5dc99ea2926cc11571e69f29c2e79f025f0f3ec4048960"; + name = "marble-19.04.0.tar.xz"; }; }; mbox-importer = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz"; - sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201"; - name = "mbox-importer-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/mbox-importer-19.04.0.tar.xz"; + sha256 = "0fba78f2feee2ec7c11e64511195546b9c34695c091632494c1d77c2555eb888"; + name = "mbox-importer-19.04.0.tar.xz"; }; }; messagelib = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz"; - sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8"; - name = "messagelib-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/messagelib-19.04.0.tar.xz"; + sha256 = "1fb76bcd7aa9792095519c585dbb93552726e3cfe514446eb52edf5ed1517a1a"; + name = "messagelib-19.04.0.tar.xz"; }; }; minuet = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz"; - sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"; - name = "minuet-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/minuet-19.04.0.tar.xz"; + sha256 = "3bdf5470a154b2be4bfcd97db7374ef81ca8eefba3bb12030dd6d39f1466cc78"; + name = "minuet-19.04.0.tar.xz"; }; }; okular = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz"; - sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"; - name = "okular-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/okular-19.04.0.tar.xz"; + sha256 = "1947b394dfd8da9c7cc4234e308e2476ffa44dc58542d246eafc8397d8991b6e"; + name = "okular-19.04.0.tar.xz"; }; }; palapeli = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz"; - sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593"; - name = "palapeli-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/palapeli-19.04.0.tar.xz"; + sha256 = "21f8b6b109d6cc61acbb0ee01aa31982bb6e27e8894e4f00407f52904d177a2b"; + name = "palapeli-19.04.0.tar.xz"; }; }; parley = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz"; - sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75"; - name = "parley-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/parley-19.04.0.tar.xz"; + sha256 = "243f7f1a89bb603c059b0610a9bb7f51627540d439b4026d736062b693879ed2"; + name = "parley-19.04.0.tar.xz"; }; }; picmi = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz"; - sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49"; - name = "picmi-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/picmi-19.04.0.tar.xz"; + sha256 = "edb10bc29d6817dffeb51762c5fa793ee8de3b3a70c2c6616012f5a043799d86"; + name = "picmi-19.04.0.tar.xz"; }; }; pimcommon = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz"; - sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e"; - name = "pimcommon-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/pimcommon-19.04.0.tar.xz"; + sha256 = "b25d10571e55ab11b758ad6b1040ef2d148b4b5b913f41665c355df25bceb12e"; + name = "pimcommon-19.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz"; - sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941"; - name = "pim-data-exporter-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/pim-data-exporter-19.04.0.tar.xz"; + sha256 = "ae1c3bbfffebb85533b0bbf4b0f8b54c06e29fcdf7284295c89ab43d196a6ac3"; + name = "pim-data-exporter-19.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz"; - sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5"; - name = "pim-sieve-editor-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/pim-sieve-editor-19.04.0.tar.xz"; + sha256 = "0843df57695ca4dc359d048a7e3bf2b6bb66bd10d861714d316baa8ecb387dd1"; + name = "pim-sieve-editor-19.04.0.tar.xz"; }; }; poxml = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz"; - sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7"; - name = "poxml-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/poxml-19.04.0.tar.xz"; + sha256 = "c0a24557cc7e243790c5273fb2a4ff585a3e89cc994772a52979015d2e57a985"; + name = "poxml-19.04.0.tar.xz"; }; }; print-manager = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz"; - sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d"; - name = "print-manager-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/print-manager-19.04.0.tar.xz"; + sha256 = "f9dfe61ba341013ae59892cd6715b7c00ee6777ca4d2e81deeda1cf2d283f6ba"; + name = "print-manager-19.04.0.tar.xz"; }; }; rocs = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz"; - sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11"; - name = "rocs-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/rocs-19.04.0.tar.xz"; + sha256 = "65557205a86ddc682c9f9378731b1cf0dacd170742a5bdf110eeeef8ae4b26c8"; + name = "rocs-19.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz"; - sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f"; - name = "signon-kwallet-extension-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/signon-kwallet-extension-19.04.0.tar.xz"; + sha256 = "eb93120d2acfbac4b823bc301b3724d250dc7e7041eef347c1337c7df84c0c40"; + name = "signon-kwallet-extension-19.04.0.tar.xz"; }; }; spectacle = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz"; - sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"; - name = "spectacle-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/spectacle-19.04.0.tar.xz"; + sha256 = "2c4d891d5850e13d912ad0885086170f45178ed5fb4d0ccfef7b22a9a76c35a8"; + name = "spectacle-19.04.0.tar.xz"; }; }; step = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz"; - sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755"; - name = "step-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/step-19.04.0.tar.xz"; + sha256 = "c37cbd4a7179d796dd4458dbdd98e48d59c5f0278f19026a4f5cc2b50e140319"; + name = "step-19.04.0.tar.xz"; }; }; svgpart = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz"; - sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef"; - name = "svgpart-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/svgpart-19.04.0.tar.xz"; + sha256 = "6dbec1dcb6853c06f7cb10677a2c99678b398b4a658eb4206a146f24b0fa158a"; + name = "svgpart-19.04.0.tar.xz"; }; }; sweeper = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz"; - sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0"; - name = "sweeper-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/sweeper-19.04.0.tar.xz"; + sha256 = "7ed57321ba601725291e1cfa6cdfe2060ad0405d42124dc8d8d44d137b852f72"; + name = "sweeper-19.04.0.tar.xz"; }; }; umbrello = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz"; - sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"; - name = "umbrello-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/umbrello-19.04.0.tar.xz"; + sha256 = "7c37363a92bd91f2a515438068ba6f1c8747269ddaf2eda5a7998539ece4468d"; + name = "umbrello-19.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.3"; + version = "19.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz"; - sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12"; - name = "zeroconf-ioslave-18.12.3.tar.xz"; + url = "${mirror}/stable/applications/19.04.0/src/zeroconf-ioslave-19.04.0.tar.xz"; + sha256 = "e1f7465f200d1c7c53c56a8ebf9a463022a27d6c244d0d1768ff58763e5b53dc"; + name = "zeroconf-ioslave-19.04.0.tar.xz"; }; }; } From 223a30e1901fbbed559158e5c81f6d735cfd680d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Apr 2019 21:34:17 +0200 Subject: [PATCH 246/637] akonadi: patch fix --- ...evert-Make-Akonadi-installation-properly-relocatabl.patch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch index 1b5e12c7ec3..24ed20fd83f 100644 --- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch +++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch @@ -38,12 +38,15 @@ index 75abede50..10f039376 100644 find_dependency(Boost "@Boost_MINIMUM_VERSION@") -@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) +@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") + + #################################################################################### + # CMAKE_AUTOMOC -- 2.15.1 From b32de6d48e628d23af770e0dd9122cca5e772198 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Apr 2019 21:41:55 +0200 Subject: [PATCH 247/637] kio-extras: missing dependency --- pkgs/applications/kde/kio-extras.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index dd717c9462d..a7aa817576f 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -2,8 +2,8 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, - kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, - qtsvg, samba, solid, gperf + kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr, ilmbase, + openslp, phonon, qtsvg, samba, solid, gperf }: mkDerivation { @@ -16,7 +16,8 @@ mkDerivation { buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support - kpty libmtp libssh openexr openslp phonon qtsvg samba solid gperf + kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba + solid gperf ]; CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } From 29395e5ea9411110929232d96a0901b585f5206b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Apr 2019 21:48:13 +0200 Subject: [PATCH 248/637] kdegraphics-thumbnailers: missing dependency --- pkgs/applications/kde/kdegraphics-thumbnailers.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 2e43e946d7f..6ae45057f19 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, kio, libkexiv2, libkdcraw + extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw }: mkDerivation { @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kio libkexiv2 libkdcraw ]; + buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } From 85b3448e6a1967e2f49bc85f2559b3393f33361d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 1 May 2019 21:56:58 +0200 Subject: [PATCH 249/637] nixos/factorio: sandbox service using systemd - DynamicUser enabled instead of static uid/gid - Enables most sandboxing options systemd offers --- nixos/modules/misc/ids.nix | 4 +-- nixos/modules/services/games/factorio.nix | 44 +++++++++++------------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5198bedc138..5b7fa5d2b98 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -265,7 +265,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # DynamicUser = true # emby = 242; # unusued, removed 2019-05-01 graylog = 243; sniproxy = 244; @@ -567,7 +567,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # unused # emby = 242; # unused, removed 2019-05-01 sniproxy = 244; nzbget = 245; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 3f6bf9de893..d04673a6c8b 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -6,7 +6,7 @@ let cfg = config.services.factorio; factorio = pkgs.factorio-headless; name = "Factorio"; - stateDir = cfg.stateDir; + stateDir = "/var/lib/${cfg.stateDirName}"; mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true @@ -80,11 +80,11 @@ in customizations. ''; }; - stateDir = mkOption { - type = types.path; - default = "/var/lib/factorio"; + stateDirName = mkOption { + type = types.string; + default = "factorio"; description = '' - The server's data directory. + Name of the directory under /var/lib holding the server's data. The configuration and map will be stored here. ''; @@ -176,20 +176,6 @@ in }; config = mkIf cfg.enable { - users = { - users.factorio = { - uid = config.ids.uids.factorio; - description = "Factorio server user"; - group = "factorio"; - home = stateDir; - createHome = true; - }; - - groups.factorio = { - gid = config.ids.gids.factorio; - }; - }; - systemd.services.factorio = { description = "Factorio headless server"; wantedBy = [ "multi-user.target" ]; @@ -205,12 +191,10 @@ in ]; serviceConfig = { - User = "factorio"; - Group = "factorio"; Restart = "always"; KillSignal = "SIGINT"; - WorkingDirectory = stateDir; - PrivateTmp = true; + DynamicUser = true; + StateDirectory = cfg.stateDirName; UMask = "0007"; ExecStart = toString [ "${factorio}/bin/factorio" @@ -220,6 +204,20 @@ in "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") ]; + + # Sandboxing + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; }; }; From 3bd3ef9c9dea744af71cd74841086c235b137053 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 02:57:53 -0500 Subject: [PATCH 250/637] dnstracer: 1.9 -> 1.10, touchup --- pkgs/tools/networking/dnstracer/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 5e2b27c6516..5261fdb1896 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, libresolv }: +{ stdenv, fetchurl, libresolv, perl }: stdenv.mkDerivation rec { - version = "1.9"; - name = "dnstracer-${version}"; + version = "1.10"; + pname = "dnstracer"; src = fetchurl { - url = "https://www.mavetju.org/download/${name}.tar.gz"; - sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; + url = "https://www.mavetju.org/download/${pname}-${version}.tar.bz2"; + sha256 = "089bmrjnmsga2n0r4xgw4bwbf41xdqsnmabjxhw8lngg2pns1kb4"; }; outputs = [ "out" "man" ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; + setOutputFlags = false; + installPhase = '' + install -Dm755 -t $out/bin dnstracer + install -Dm755 -t $man/share/man/man8 dnstracer.8 + ''; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; From 40cc6fb44e7be2faf98fd5ff01f37ce013862f13 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 11:39:47 -0500 Subject: [PATCH 251/637] guake: 3.5.0 -> 3.6.3 --- pkgs/applications/misc/guake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0d7f460fb06..37352915cb8 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales -, gtk3, keybinder3, libnotify, libutempter, vte }: +, gtk3, keybinder3, libnotify, libutempter, vte, libwnck3 }: let - version = "3.5.0"; + version = "3.6.3"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "0fz0gciw5fpxrp6yyji27l7q8c0r9ljsq6vw584mr70bcl1gzjqx"; + sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; }; # Strict deps breaks guake @@ -23,7 +23,7 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; - propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 libwnck3 ]; LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 From 43ed419aa10ab8ac111acdb4335b6dcb58fbe704 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 08:41:43 -0500 Subject: [PATCH 252/637] libxmlb: 0.1.9 -> 0.1.10 https://github.com/hughsie/libxmlb/blob/0.1.10/NEWS --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index c5ff7c11713..9edb9b475e8 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libxmlb-${version}"; - version = "0.1.9"; + version = "0.1.10"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1rdpsssrwpx24snqb82hisjybnpz9fq91wbmxfi2s63xllzi14b6"; + sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd"; }; nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; From b911ce24e6e8a8d96f75e5a812649709a6a5e375 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 08:39:22 -0500 Subject: [PATCH 253/637] fwts: 19.03.00 -> 19.05.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 566d1e9f56a..7f31ac1dac0 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.03.00"; + version = "19.05.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1zri73qmpgc0dwmdcfbcywcvxld7dqz7rkwwqncfkvvfc9zchk5l"; + sha256 = "0hhwp25a7lknzmbbm067nxlzgyb3p7gh119jra2gdkm6d3p2gc47"; stripRoot = false; }; From ff884c83715f8eda9b1d5e3a0593baa9ae7aa936 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 19:57:04 -0500 Subject: [PATCH 254/637] audacity: 2.3.1 -> 2.3.2 https://www.audacityteam.org/audacity-2-3-2-released/ --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 3b12ffe3463..b685fda7683 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "089kz6hgqg0caz33sps19wpkfnza5gf7brdq2p9y6bnwkipw1w9f"; + sha256 = "0cf7fr1qhyyylj8g9ax1rq5sb887bcv5b8d7hwlcfwamzxqpliyc"; }; preConfigure = /* we prefer system-wide libs */ '' From f5b400b875f42a6fbf01564534e74063ec53d7a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 19:55:58 -0500 Subject: [PATCH 255/637] spectre-meltdown-checker: 0.40 -> 0.41 https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.41 --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 256423892c4..a3e6468c4fe 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs"; + sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899"; }; prePatch = '' From fc1129c8af5705039d197d133e15a090052ebb24 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 17 May 2019 12:29:44 +0200 Subject: [PATCH 256/637] electrum: implement crude updater Takes care of the tedium of checking signatures & whatnot. Does not update checksum for the tests yet ... Usage $ nix-shell maintainers/scripts/update.nix --argstr package electrum Warning: dumps cruft to $PWD --- pkgs/applications/misc/electrum/default.nix | 30 ++++++++++- pkgs/applications/misc/electrum/update.nix | 59 +++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/electrum/update.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 6e69665da2b..2f8b98f3a44 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: +{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 + + +# for updater.nix +, writeScript +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix +}: let version = "3.3.6"; @@ -85,6 +98,21 @@ python3Packages.buildPythonApplication rec { $out/bin/electrum help >/dev/null ''; + passthru.updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit + writeScript + common-updater-scripts + bash + coreutils + curl + gnupg + gnugrep + gnused + nix + ; + }; + meta = with stdenv.lib; { description = "A lightweight Bitcoin wallet"; longDescription = '' diff --git a/pkgs/applications/misc/electrum/update.nix b/pkgs/applications/misc/electrum/update.nix new file mode 100644 index 00000000000..247fabe3891 --- /dev/null +++ b/pkgs/applications/misc/electrum/update.nix @@ -0,0 +1,59 @@ +{ lib +, writeScript +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix +}: + +with lib; + +let + downloadPageUrl = "https://download.electrum.org"; + + signingKeys = ["6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6"]; +in + +writeScript "update-electrum" '' +#! ${bash}/bin/bash + +set -eu -o pipefail + +export PATH=${makeBinPath [ + common-updater-scripts + coreutils + curl + gnugrep + gnupg + gnused + nix +]} + +version=$(curl -L --list-only -- '${downloadPageUrl}' \ + | grep -Po ' Date: Fri, 17 May 2019 13:07:53 +0200 Subject: [PATCH 257/637] molden: 5.9.5 -> 6.1 --- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 35d21848e2b..274afd5fc3d 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.9.5"; + version = "6.1"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9"; + sha256 = "0swbjnqlkwhy8lvjkbx8yklqj4zfphwdg6s3haawxi3dd65ij539"; }; nativeBuildInputs = [ which ]; From 89457d01795f622827827e79c627df83f7726c54 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 17 May 2019 13:38:48 +0200 Subject: [PATCH 258/637] vimPlugins: update (#61628) --- pkgs/misc/vim-plugins/generated.nix | 204 ++++++++++++++-------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 97121e2d6ce..7e9e49f82de 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-09"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "f444abdfe66696505cb891889b18c4144d12d4ea"; - sha256 = "1id66swgzkgal2hxppm3ls0asffvmsbz81sl1qvci053jr9mr5d0"; + rev = "e5ea809094fd1d521ac88516f5b4b6870e656f3a"; + sha256 = "1wq12ycfkkcj70gprzwrp88v0i7jjzf1340mmkhs46wyd5ds82vz"; }; }; @@ -248,12 +248,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-03-31"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "792d6079d32f1973c142c6fab89d2fdc94019ac8"; - sha256 = "0bi2bmx0k6fwi1jwajgafbb750ajlzz1jncvvg0cssv6h5syxvpk"; + rev = "57e112c12c99185e062a4330896cfaf422d1ea64"; + sha256 = "19ajaxga54kij9ii68cd38frq4y7lr7896wqa5xgs5qq83wh1b1z"; fetchSubmodules = true; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-05-01"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f16b581357a575f37f4c51f6c809e8f2fd98b5bf"; - sha256 = "17fsngxpfy1m0r76c99xphwlcip85s4fyf9zj3vcdvb69hdgva2s"; + rev = "67475c70b4c48b99a0b327a3ff93ca8d25aa3632"; + sha256 = "0bgz2ljfpccawklzhhxvg5z77h4569p6ihf64rqs2q0b3laswmcx"; }; }; @@ -505,12 +505,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-04-15"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "9d4e88f6cce63ed1b52ca2401d809c55ab443b25"; - sha256 = "165vxlr2zjh0p7mcqaj60axpnffcrjfx6rvp786nxch4kmfhrz5p"; + rev = "310371d7e0cf123a725dd3f1d1fe02e4919d2d8a"; + sha256 = "15j6hq3ckjmgwr3a2wc43r7kv9bi8ns4x9sg9gn8lwp4c325khfw"; }; }; @@ -695,12 +695,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-04-29"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ac4e7bfb36c88d27799c080218cea3bb833bdbd9"; - sha256 = "10m6v1jrry4fhrbkgb8kkdjasl0pz2qgr9khxl94nlg42fxb1r20"; + rev = "5c87ab86c0e7b0ec8a5edd39a4ce5500bb9e9333"; + sha256 = "0ippj4xpxx8yypfp4fa66hahz9ciy2inyq9275ajpgs7gxs6yx7n"; }; }; @@ -949,12 +949,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-05-02"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "78b1cc9e715f509a7e9f157e0d7a0e02b7e5125e"; - sha256 = "0j2i09shwi8fcqfh7m48m4d6bi5pzfgn8mf6iw53v4ah2cdp2m93"; + rev = "bb0b4013611e11200d2ae5a65e8804bbd930a770"; + sha256 = "1sjsrih8cl8pksb3ikycarszhx8cvkgvj4nn63db59fnvdr7nqyl"; }; }; @@ -1037,12 +1037,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-05-09"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "485520af57aee528a3448d1f26bb7761dd915b0e"; - sha256 = "1qq5mydg99y2865gx3i3kzk0vl6agx26l8if4nq47wlxnfcbgslv"; + rev = "10f7d917c5fbc99c0029cf4aa6befb91e4b90364"; + sha256 = "0hap4plkqs21908h1l1y54i77da9nh26ii636ymw8948d7gyb0wc"; }; }; @@ -1147,34 +1147,34 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-03"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7fe72c5d84765e0af19718a57e24659f81471393"; - sha256 = "1kpb6ycsnf0sncpixf3016i2aq82wxvm9q9hjcg9bb7d9706s15d"; + rev = "787b1bff2a48a85b823abb9d50f8c8553273776a"; + sha256 = "1vdnbplv5spy18azcsn2plcfgnxxbbmr1dca2pfalzgs7bww0la1"; }; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-04-17"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "9baaab193f461193e737dd1342a43d43a380bca6"; - sha256 = "0gh2sdz32hp7wa5rvnrgwp8ga75sxpb4d3fxszkf8vd3gdxkxsq4"; + rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; + sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; }; }; neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-09"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "9575d0f72b82c453281eac697630d85cb097550f"; - sha256 = "12mbgglszgqrbpwwfxhmiq77h6ml4hd0z4ambrdzzl8hidp73d55"; + rev = "786e76cfc1124355f68ff7820439268a0cf9779d"; + sha256 = "02l5rh9n31c8k2vjnm8wx323x21ssg1pxnlhm2svhkpm1qax5q45"; }; }; @@ -1334,12 +1334,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2018-12-23"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0"; - sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v"; + rev = "9eac5b198ad87210a498d4f93344b7450537ab00"; + sha256 = "17y1lcq92dkynjv5hbk3mjnc8g1yg8f19rw1imak7smwx4xjiqv8"; }; }; @@ -1708,12 +1708,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-05"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "29e15407b2b372bf1bad95bf0c5264dc7fdc1882"; - sha256 = "1vnxm49zjsk0w7n9arpl9pgy5lh7hrqa2392yl68rhk0vvh5fn46"; + rev = "1e8bae3d13e62628ec2262fcc2dc8aa36d6953fe"; + sha256 = "1bbvbvj8yr83kk6rpai24mhdb2q18yq0rnjj2kxfvzm3cwchbdwz"; }; }; @@ -1829,12 +1829,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-04-27"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "971d0f6c293002bea7c90773c8fd67f4345ddf7c"; - sha256 = "0aj5x96g4ngir73h79brmijw5gikz6vgbblpbd3np64nb3h86a7c"; + rev = "d07bb40a3064ff5a2fb16c90946a6259ceb447a3"; + sha256 = "18b9215ifp591hkirs9h09g7r7baal2kcxccpz0siq9939y32b9p"; }; }; @@ -2170,12 +2170,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-08"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9a1acf144fd63cae6f48a3b445958d737c0b167e"; - sha256 = "14n3fcmiv733si64226vm72f7gicffrkcq3xadpzzy0n22dnb1hz"; + rev = "7b20361baf5f8947ff55ac5d26dd4a75aacfc7d7"; + sha256 = "07bcd3f41jc52kn3spjrn8s3p58fsy6vn6kjrsl1j9qvmjc7x1q8"; }; }; @@ -2390,12 +2390,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-05-03"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "10eae530889331457b738b28eafcfa3789481fcd"; - sha256 = "0y9m2jnzz58y5h7r8xgfimha8fz0if2pc760g4qbm922afm3a00a"; + rev = "8a84356d5319cad3da2835bd5fbc6318500f31ce"; + sha256 = "1yad8jrcna82ll893wf53ms2hqmcaa63g43yafxvlgmxw5yrh3im"; }; }; @@ -2434,12 +2434,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-03-05"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "2257a283fc6e03d018ff503382c2ae97e32d5afa"; - sha256 = "0fqshk92dn62lz44csavpl9jg5bpd8jfik20ci9plns8nd9g6pg4"; + rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; + sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; }; }; @@ -2456,12 +2456,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-03-26"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5"; - sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k"; + rev = "d8bf968958f4bdc838321cceace52299f28ad750"; + sha256 = "0y1wwscj5vn9ssmysr12zwx1k1a4j6l0gchhlrvgzj4ar2wpvig0"; }; }; @@ -2533,12 +2533,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-05-02"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "98c03047d15dfa62cedf56e27bffb03772d41753"; - sha256 = "0pbad3hlsy6glhmbz6nkb6lfx9y3yb6rw23vc48acxw936zm282n"; + rev = "38e8bbfd0019033ae53d623e3fd1d9cf6ec2d335"; + sha256 = "1mbgks1460vm8sl2hkag6hrsvbf9gfvdlswqr5hh8hy3laylh6qf"; }; }; @@ -2577,12 +2577,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-09"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f327d6e523975e1544b2effd426b99df25b01d18"; - sha256 = "0abh80w4xyg1wpc1fra9m68f882x430ky0vjfbp9xsnz3i5xd44c"; + rev = "6f12616ee3d2160054270a9fb444006f580667d6"; + sha256 = "0ms1xpp3kw98qq4dl7mp4c353acqncav6dwfz690lacpy0bgb9d3"; }; }; @@ -2676,12 +2676,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-03-11"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "7eeea63e62b1cc088a75c7a7c244fc774d82e5bb"; - sha256 = "0m7mkhm5cq4aknaxxn476lykkgyapb350cn20ax5c9nrmpfzf4rz"; + rev = "e5936a22cfd2e25893e2ac34af4b0afdec1e36f5"; + sha256 = "04nhkg1axpcvzjba6rvjn16v3gfdch12y74mfcrbmj0v2qqs8rgk"; }; }; @@ -2698,12 +2698,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-07"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "c4b419db6c57125e91d6f292daa664b73b155b7b"; - sha256 = "1whcmgr0isa7np6xmc66jrc68an58677bnpzyrd1y817np5f2336"; + rev = "d2f1bbe458d8c7c3154ed113c3768bd84451f872"; + sha256 = "0dcj36vcrbai049bjv8gw6kfd594lny17vvi7c817av6yclmxjqf"; }; }; @@ -3062,12 +3062,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2019-03-24"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "08f1389285902473a8b2de045c2d916fcc5affbc"; - sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1"; + rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9"; + sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3"; }; }; @@ -3084,12 +3084,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-04-24"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9616bcb14c0128a6722806dafe2b6f325fa0c26f"; - sha256 = "10vsmcifjinqd26rw4fk94l4pymqzsqm66d8gwdqpp3jkx5birwg"; + rev = "1fb7e1a50a11f5c45988c6515141b83e131d674f"; + sha256 = "065yfp499640kkdn3n1n246lq3dhvgpc9ibpzn77qvqpmjavanzh"; }; }; @@ -3172,12 +3172,12 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2018-08-27"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; - sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; + rev = "1403934ebe9f2e1951ebafa38dd93ca9326c890e"; + sha256 = "0910slyddcgl03ijayx2p2vhvsz4442q7ffsz7xsrl6fr0k0xkj9"; }; }; @@ -3260,12 +3260,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-05-05"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2e342ac8b841934c66a1c9afade42e709a068095"; - sha256 = "1hzjp9s490k8rcvv74zhjn8k17xn9igxbzxxkxy3n3zxhfd3jw8j"; + rev = "2b91b338c371c4d7a7ab75901246d992b3542d7e"; + sha256 = "1yn1kip09s37hs8ngld67zxa20gvvman6jd7q4vdrxlmy2miy9q4"; }; }; @@ -3282,12 +3282,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-05-05"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "e557ade9aceb4925cd919c412fe9660b8c4f4cba"; - sha256 = "1msryzjzlv4mil05h17jjy09839dzqp9r11g1f369zxi5hini8g2"; + rev = "14c778e5bf069a1f13a4645aa8a34e1b46c980a8"; + sha256 = "1a66f0shycqkl1329lgbvrbbzwdv8pgi9d8zaybw9jddn64rx9r7"; }; }; @@ -3601,12 +3601,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2018-08-29"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "91192d8969af1d86c98beff4001612976ea25d7a"; - sha256 = "0nmbrp0ma9s3yfzb8z70l0pcxv8p115zv6fz4injxn1c436x9337"; + rev = "045b3c0a70815de8e928a094c36d3b6bfde0aade"; + sha256 = "1qwhfbsjwz58wph91l4disk1ab1c63lirf9j472wlwb22nf4yzlc"; }; }; @@ -3623,12 +3623,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-05-01"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9827f1713407ace7d7608b5dec4db256979d5858"; - sha256 = "1l3pig6v0k629av50vcdhc0qwh5v1lsg7wlmm77q11sk0jacw2sv"; + rev = "7ade68cb23b33e9483667a09dc6683bb5b4de682"; + sha256 = "0ix30glpl55xz9knpi9p7gmyjpjg2nr4yg94qa8wj9y8hs54zm5l"; }; }; @@ -3667,12 +3667,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-04-11"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "0a212847827933436d0b139f37b9825e28e3c0a1"; - sha256 = "08si59jvwlgj1i8z1i0ly439ar75ifrnlraa6nw20n3ii6nwzsvh"; + rev = "2e5d068572f1e6899d7cb7b509020b0a6f0c3f68"; + sha256 = "1hkf8lc63bdjwdcp0cabwx3p1jydiy4h5gzm042110szxx5xir3q"; }; }; @@ -3755,23 +3755,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-03-31"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a44bf0b1a142bb39e84e5d525f7d98b5d3a66057"; - sha256 = "12wyjfmwz3lsd45vv4ava361ph6gravggi9vvvr9qgf5zc1shd3b"; + rev = "d98d657d29691118b2ac830ca876f297d8567800"; + sha256 = "1hhr3d8z9mfhylwx6vj49hs3b54hrhkipy67si5mds38g92rqfhg"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-05-09"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "8e137f223df427e620496f02f0fda6363a76435f"; - sha256 = "0qj4f597mr20lglvyapviqzn390yiwbaksb2bz42v4s0zh33nahg"; + rev = "f665955382b4baf4f2e33344250a9914c5281681"; + sha256 = "0mx4gz072gx7kvrhmfn7kdh3ccx9q1hfibkwz6870a3hxsciin6a"; }; }; @@ -3854,12 +3854,12 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-04-20"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "e48cc1d71b838e6223a0ece54b9457ed76f92676"; - sha256 = "16cx1j76b9kdrcjs8hhl15kfhpgan69qs9djda0c1pvzphj4bbgp"; + rev = "09ac84c4d152a944caa341e913220087211c72ef"; + sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; }; }; @@ -4019,12 +4019,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-03"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ee10671c2b25287196194426607c2684827126f7"; - sha256 = "04mxx4ww1qmr6918dryfh956lwmyz4nlq4dissms440p4kqf5giv"; + rev = "26de8b92c9e9f2428f27d241cab1e7e15af56d3a"; + sha256 = "0zvj6f02x3gf3qpv877n01yxyi7hqk5gczw0z3m7x3yz81xpv1m1"; }; }; @@ -4163,12 +4163,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-05-08"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "f7e0a6cb7580471d1fc1c68ab85467ff207b5dee"; - sha256 = "0cbv9ahnl70zh3abrr43ijyaqxnprp1kp6bgiwkpi7qzvcbvwzca"; + rev = "dbcc3b0e14876fd4f39d38dfdef22351f74da3a5"; + sha256 = "17rmmdnmj4pa1admls3d3w43vl9r040x3yhf4nnr1pf2jarv028v"; fetchSubmodules = true; }; }; From 03398be1b9fa2febdbb301fff5576c48740f56bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 16 May 2019 10:40:32 +0200 Subject: [PATCH 259/637] saleae-logic: 1.2.28 -> 1.2.18 Yes, this is a downgrade. The .28 version is beta software, whereas .18 is the latest stable version. --- pkgs/development/tools/misc/saleae-logic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 779f6c76fef..19e4423f7d8 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -26,13 +26,13 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.28"; + version = "1.2.18"; name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "0apq8hmn39k0ads4xy8iyy9rp8bvia60mh7a944rk1gjpqv227g5"; + sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8"; }; desktopItem = makeDesktopItem { From a9110315fef4145c4c852a95cadb384aacc19c6a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 09:05:42 -0500 Subject: [PATCH 260/637] bettercap: 2.11 -> 2.24 (#61215) * bettercap: 2.11 -> 2.24 * bettercap: use current libusb1 and not the old v0.1 compat-API --- pkgs/tools/security/bettercap/default.nix | 14 +-- pkgs/tools/security/bettercap/deps.nix | 132 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 110 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index f7e09d54de1..c72bc6d8b9e 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue, libusb1 }: buildGoPackage rec { - name = "bettercap-${version}"; - version = "2.11"; + pname = "bettercap"; + version = "2.24"; goPackagePath = "github.com/bettercap/bettercap"; src = fetchFromGitHub { - owner = "bettercap"; - repo = "bettercap"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "08hd7hk0jllfhdiky1f5pfsvl1x0bkgv1p4z9qvsksdg9a7qjznw"; + sha256 = "1f8bzxbcyf0bpyqj6hz4l8dp5xknnb537xy9y5skcznp03i44h55"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue ]; + buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; goDeps = ./deps.nix; diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix index cbfe7c54dad..ef09a821317 100644 --- a/pkgs/tools/security/bettercap/deps.nix +++ b/pkgs/tools/security/bettercap/deps.nix @@ -9,13 +9,40 @@ sha256 = "167iwpwdwfbyghqfrzdfvfpvsmj92x7qqy6sx6yngdw21wd0m44f"; }; } + { + goPackagePath = "github.com/antchfx/jsonquery"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/jsonquery"; + rev = "a2896be8c82bb2229d1cf26204863180e34b2b31"; + sha256 = "0mh6v21i3v3sxqjln7vph6wx3sm79p99010in9am1wh7k30rrjl5"; + }; + } + { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "ce1d48779e67a1ddfb380995fe532b2e0015919c"; + sha256 = "0brd75mhd5ix7rz1ijhbggyp53v6g8kz9bc2n7g6zwavzxarfj5p"; + }; + } { goPackagePath = "github.com/bettercap/gatt"; fetch = { type = "git"; url = "https://github.com/bettercap/gatt"; - rev = "66e7446993acb3de936b3f487e5933522ed16923"; - sha256 = "0hvm59zpbghgw8fq9yr4dd2x3209ii9856qklflkz2ywf7vryjqq"; + rev = "fac16c0ad797bbccae1fe4acf49761b98f7516e7"; + sha256 = "08pyg4caw7lzb230l3k4rwgvn68zz6kmrlsdapaf3wa216pphyd9"; + }; + } + { + goPackagePath = "github.com/bettercap/nrf24"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/nrf24"; + rev = "aa37e6d0e0eb125cee9ec71ed694db2ad58b509a"; + sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj"; }; } { @@ -27,6 +54,15 @@ sha256 = "1qd2qhjps26x4pin2614w732giy89p22b2qww4wg15zz5g2365nk"; }; } + { + goPackagePath = "github.com/bettercap/recording"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/recording"; + rev = "3ce1dcf032e391eb321311b34cdf31c6fc9523f5"; + sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23"; + }; + } { goPackagePath = "github.com/chifflier/nfqueue-go"; fetch = { @@ -50,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/elazarl/goproxy"; - rev = "f58a169a71a51037728990b2d3597a14f56b525b"; - sha256 = "103crrh6zwdwcj7j6z63rbm467nff3r1rvpwdk0qj8x275zi45g6"; + rev = "9d40249d3c2f14d1a9d75e070a738362adeb5a83"; + sha256 = "0hpzna9dvs2ff0bj8baz3sc5gg49vqmb0cbi6p061lmwl09cd00i"; }; } { @@ -59,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/evilsocket/islazy"; - rev = "3d8400c74f9dbc626d913e0575cda05d914bea57"; - sha256 = "0yfqvcxaympfgsda0jhqnaqhbhic2irdjn0h2bppz4misjv6sxn9"; + rev = "c5c7a41bb1c20e6df409825ed24af8de5fb7fb70"; + sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3"; }; } { @@ -95,17 +131,17 @@ fetch = { type = "git"; url = "https://github.com/google/gopacket"; - rev = "d67ddb98d5a1b7c79a8977ec2d552e1db45eda86"; - sha256 = "0pk4hddx6fnbbjjgi86vx12xs5d8591dlkx1q5cswc0jghymbplh"; + rev = "v1.1.16"; + sha256 = "1vnjgjz52l1bzrhx70qpvmwandf8v13zhiaj3rdljsphdp5cgadi"; }; } { - goPackagePath = "github.com/gorilla/context"; + goPackagePath = "github.com/google/gousb"; fetch = { type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + url = "https://github.com/google/gousb"; + rev = "64d82086770b8b671e1e7f162372dd37f1f5efba"; + sha256 = "1kjgg8cdp8wz9rck4nh48pcia741p7a8w2nikhzxsscn0ld33109"; }; } { @@ -113,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + rev = "c5c6c98bc25355028a63748a498942a6398ccd22"; + sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62"; }; } { @@ -126,6 +162,15 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "06dd1a31b32c42d4d6c2cf8dbce70597d1118f54"; + sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; + }; + } { goPackagePath = "github.com/inconshreveable/go-vhost"; fetch = { @@ -140,8 +185,17 @@ fetch = { type = "git"; url = "https://github.com/jpillora/go-tld"; - rev = "4bfc8d9a90b591e101a56265afc2239359fb0810"; - sha256 = "04pv1rwpfq3ip3vn0yfixxczcnv56w1l0z8bp4fjscw1bfqbb4pn"; + rev = "f16ca3b7b383d3f0373109cac19147de3e8ae2d1"; + sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "88f551ae580780cc79d12ab4c218ba1ca346b83a"; + sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w"; }; } { @@ -158,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -167,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -176,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/dhcp6"; - rev = "e26af0688e455a82b14ebdbecf43f87ead3c4624"; - sha256 = "0fvw8zz2yhla03jfb79bby9vg4rbmaj39v00ypb8yl4fb696zfip"; + rev = "2a67805d7d0b0bad6c1103058981afdea583b459"; + sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw"; }; } { @@ -185,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/raw"; - rev = "67a536258490ec29bca6d465b51dea32c0db3623"; - sha256 = "1fba4c6kc7llwr4n5rsspsc3yb0c81xsqzxv86wnj1b0d8l2s7nr"; + rev = "480b93709cce56651807d3fdeb260a5a7c4e2d5f"; + sha256 = "0a0zlznk67nhpmgp21hxsbhyl5lvlkmwy5xvm3d3q0yaq0rqnh2x"; }; } { @@ -207,13 +261,22 @@ sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx"; }; } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "8aa92d4e02c501ba21e26fb92cf2fb9f23f56917"; + sha256 = "1niymj11xv82ghif3p7i60bgj0lqskwm7fmrzfjchd8wxwbk4bbi"; + }; + } { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -234,13 +297,22 @@ sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; }; } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a29dc8fdc73485234dbef99ebedb95d2eced08de"; + sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p"; + }; + } { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1df9410e1712aa6433dae904ff66a"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + rev = "9ce7a6920f093fc0b908c4a5f66ae049110f417e"; + sha256 = "1kbs85jsqbv4v89ii2zam4b8dhmllhsrf46njmi09x0w6s0b9cbk"; }; } { @@ -248,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fa43e7bc11baaae89f3f902b2b4d832b68234844"; - sha256 = "1z96xhgw930jpd53g1sy9x6wiijgz751czbvr2zzgc55y0md1mfw"; + rev = "d89cdac9e8725f2aefce25fcbfef41134c9ad412"; + sha256 = "0iazr13ir6i267nb2w81lc3pr740wdjs86nsliwpf90kkgzn853f"; }; } { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9afc88c12c..9f635450982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1932,11 +1932,7 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + bettercap = callPackage ../tools/security/bettercap { }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; From 9d200707bad9e8494c36e9b1c6d184fc80fe3ec9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 17 May 2019 10:04:15 -0400 Subject: [PATCH 261/637] oh-my-zsh: 2019-05-11 -> 2019-05-17 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 9a2e71e5a40..01fdfb7d1f4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-11"; + version = "2019-05-17"; name = "oh-my-zsh-${version}"; - rev = "486fa1010df847bfd8823b4492623afc7c935709"; + rev = "5aa62461d91546ce1fd5dcc6531569d0e6e6f17f"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "097n64xzdqgqdbgcqnzsk0s9r9yn8ncqbixbsxgpcj29x9hi1dkn"; + sha256 = "0mg308h9k9lcv9flqwnynq2iiicl7b89arn7m97wwjijww1isdg6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From fa064ffd3b407fc45698f1623c736bca50400d62 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 13 May 2019 22:49:16 +0300 Subject: [PATCH 262/637] phpPackages.event: init at 2.5.0 --- pkgs/top-level/php-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1cc57ad833b..e1e60b6a5d1 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -142,6 +142,26 @@ let ]; }; + event = buildPecl rec { + version = "2.5.0"; + pname = "event"; + + sha256 = "1igbxla4s784z7lw1jar6pjyfn596040a52kfmawwclqf9qcvx0v"; + + configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ openssl libevent ]; + + meta = with pkgs.lib; { + description = '' + This is an extension to efficiently schedule I/O, time and signal based + events using the best I/O notification mechanism available for specific platform. + ''; + license = licenses.php301; + homepage = "https://bitbucket.org/osmanov/pecl-event/"; + }; + }; + igbinary = buildPecl rec { version = "3.0.1"; pname = "igbinary"; From 0962aa7d544e7bf6d5e1788c640a67bc2905fbf8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 13 May 2019 22:55:49 +0300 Subject: [PATCH 263/637] phpPackages.protobuf: init at 3.7.1 --- pkgs/top-level/php-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e1e60b6a5d1..7f6db140108 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -444,6 +444,23 @@ let }; }; + protobuf = buildPecl rec { + version = "3.7.1"; + pname = "protobuf"; + + sha256 = "0fbf29851dpgjfdgi6i1dgy047dfiazm6qh943w22zbj35l7g2yc"; + + buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; + + meta = with pkgs.lib; { + description = '' + Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. + ''; + license = licenses.bsd3; + homepage = "https://developers.google.com/protocol-buffers/"; + }; + }; + psysh = mkDerivation rec { version = "0.9.9"; pname = "psysh"; From 96c66ee6094d5b076b05003fd31d8dfa250980a3 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Fri, 17 May 2019 17:59:22 +0200 Subject: [PATCH 264/637] sublime3: 3200 -> 3207 --- pkgs/applications/editors/sublime/3/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index ebceb4a8b35..b8fef39d3ea 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -12,8 +12,8 @@ in } {}; sublime3 = common { - buildVersion = "3200"; - x32sha256 = "01krmbji8z62x4kl1hf3c1nfj4c4n4xmg1df62ljiwhkcfm74izr"; - x64sha256 = "1gagc50fqb0d2bszi8m5spzb64shkaylvrwl6fxah55xcmy2kmdr"; + buildVersion = "3207"; + x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy"; + x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc"; } {}; } From 3cebc9a390305e33d719a967d1deeabc87e47db3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 17 May 2019 20:31:45 +0200 Subject: [PATCH 265/637] gns3Packages.{server,gui}Stable: 2.1.16 -> 2.1.17 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/server.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index cda455d9e56..2f588cd304d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.16"; + stableVersion = "2.1.17"; previewVersion = "2.2.0a5"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; - serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; + guiSrcHash = "1caqb644nq0hhszlg3ac87730m1xmw48b17jisqiq7zmk9scsh40"; + serverSrcHash = "0zyfh5sw8r2n41v0nazgdbr50cz6g5an2myvlgj5xx41smr9gflb"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 556d341231f..dcad3027e96 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -47,6 +47,8 @@ in python.pkgs.buildPythonPackage { postPatch = '' # "typing" is only required for Python 3.4 and breaks Python 3.7: sed -iE "s/.*typing.*//" requirements.txt + # Only 2.x is problematic: + sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt ''; propagatedBuildInputs = with python.pkgs; [ From 989787b5e6b76c7c47de8dfcdbea237d7696b9b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 15 May 2019 23:33:04 +0200 Subject: [PATCH 266/637] iputils: 20190324 -> 20190515 This is mainly a bug fix release [0]. File changes: -etc/systemd/system/rdisc@.service +etc/systemd/system/rdisc.service nix path-info -S: 20190324: 41055576 20190515: 41055584 [0]: https://github.com/iputils/iputils/releases/tag/s20190515 --- pkgs/os-specific/linux/iputils/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 223d5c4fe0f..57eb09e40cf 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - time = "20190324"; + time = "20190515"; # ninfod probably could build on cross, but the Makefile doesn't pass --host # etc to the sub configure... withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; @@ -21,19 +21,19 @@ in stdenv.mkDerivation { owner = "iputils"; repo = "iputils"; rev = "s${time}"; - sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; + sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i"; }; # ninfod cannot be build with nettle yet: patches = [ ./build-ninfod-with-openssl.patch - (fetchpatch { # tracepath: fix musl build, again - url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; - sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; + (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc + url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch"; + sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw"; }) - (fetchpatch { # doc: Use namespace correctly - url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; - sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; + (fetchpatch { # build-sys: Make setcap really optional + url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch"; + sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf"; }) ]; @@ -41,13 +41,14 @@ in stdenv.mkDerivation { [ "-DUSE_CRYPTO=nettle" "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" + "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" ] ++ optional (!withNinfod) "-DBUILD_NINFOD=false" # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap nettle systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional withNinfod openssl; # TODO: Build with nettle From 1a7c1989e9506cc75645e471ff06bafee4e71690 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 23:04:17 -0400 Subject: [PATCH 267/637] gnome3.mutter328: 3.28.3 -> 3.28.4 Changes since we pulled in everything from gnome-3.28 branch: https://gitlab.gnome.org/GNOME/mutter/compare/4af8d9d4752a94612a98d619e65828f0070a7b0e...3.28.4 https://gitlab.gnome.org/GNOME/mutter/blob/3.28.4/NEWS --- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 9be383220e6..8aa7cff2d03 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.28.3"; + version = "3.28.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28 - sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v"; + rev = version; + sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i"; }; patches = [ From b4148fb8399fac33ba27624070c3fae843f9ee59 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Wed, 15 May 2019 21:09:53 +0200 Subject: [PATCH 268/637] xbill: init at 2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Old game, once more popular than Quake (but not Quake â…¡). From the homepage: Ever get the feeling that nothing is going right? You're a sysadmin, and someone's trying to destroy your computers. The little people running around the screen are trying to infect your computers with Wingdows [TM], a virus cleverly designed to resemble a popular operating system. --- pkgs/games/xbill/default.nix | 34 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/games/xbill/default.nix diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix new file mode 100644 index 00000000000..119cd8f0876 --- /dev/null +++ b/pkgs/games/xbill/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, libX11, libXpm, libXt, motif, ... }: + +stdenv.mkDerivation rec { + pname = "xbill"; + version = "2.1"; + + buildInputs = [ libX11 libXpm libXt motif ]; + + NIX_CFLAGS_LINK = [ "-lXpm" ]; + + configureFlags = [ + "--with-x" + "--enable-motif" + ]; + + src = fetchurl { + url = "http://www.xbill.org/download/${pname}-${version}.tar.gz"; + sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; + }; + + meta = with stdenv; { + description = "Protect a computer network from getting infected."; + homepage = "http://www.xbill.org/"; + license = lib.licenses.gpl1; + maintainers = with lib.maintainers; [ aw ]; + longDescription = '' + Ever get the feeling that nothing is going right? You're a sysadmin, + and someone's trying to destroy your computers. The little people + running around the screen are trying to infect your computers with + Wingdows [TM], a virus cleverly designed to resemble a popular + operating system. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35c40045b8e..50cd07c2f1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6585,6 +6585,8 @@ in xbanish = callPackage ../tools/X11/xbanish { }; + xbill = callPackage ../games/xbill { }; + xbrightness = callPackage ../tools/X11/xbrightness { }; xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; From 66c091c52c2ecd374a6ddb580b58cf7fc33a947f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 18 May 2019 00:00:17 +0200 Subject: [PATCH 269/637] python.pkgs.r2pipe: 1.2.0 -> 1.3.1 (#61647) --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 354f2743e98..1612c31562f 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.2.0"; + version = "1.3.1"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qs3xqmi9alahsgr8akzw06ia4c3554dz8pran1h7z5llk262nj4"; + sha256 = "0xvv12q3cwbibim3r97dsz6lbj7xxhlbq7fdm4pznwfzg803cmiv"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From bbba52522635f0ac0dab06571d1b93bd8a651ffd Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Sat, 18 May 2019 03:46:52 +0200 Subject: [PATCH 270/637] tokei: fix missing Security framework on macOS --- pkgs/development/tools/misc/tokei/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index f9b4343a63a..de60d91bf83 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -13,7 +13,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4"; - buildInputs = [ libiconv ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security + ]; meta = with stdenv.lib; { description = "Program that displays statistics about your code"; From 619492c03ecfc6cde541a680a1ac1e5250584acc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 May 2019 21:31:16 -0400 Subject: [PATCH 271/637] devede: fix runtime error --- pkgs/applications/video/devede/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 48c5032f2da..4802d259fb2 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: +, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; @@ -15,8 +15,18 @@ in buildPythonApplication rec { sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; }; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext wrapGAppsHook + + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + gobject-introspection ]; buildInputs = [ From 9b3b2af6e750c7e7412dd30da1b0a60af00bf043 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 09:08:33 -0500 Subject: [PATCH 272/637] kdiff3: 1.8, finally a release! Drop git-diff patch, really hope it's not still outstanding (and it doesn't apply). cc @vcunat (who filed linked upstream issue) --- pkgs/tools/text/kdiff3/default.nix | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 514085bee64..ea50e69fa53 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,35 +1,18 @@ { - mkDerivation, lib, fetchgit, fetchpatch, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, wrapGAppsHook, kcrash, kconfig, kinit, kparts }: mkDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-2017-02-19"; + pname = "kdiff3"; + version = "1.8"; - src = fetchgit { - # gitlab is outdated - url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; - sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; - rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54"; }; - setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; - - patches = [ - (fetchpatch { - name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2 - url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch"; - sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y"; - }) - ]; - patchFlags = "-p 2"; - - postPatch = '' - sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp - ''; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; From 10832b0c4d48ee5ed53101ea2716fe2f030035ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 10:35:43 -0700 Subject: [PATCH 273/637] python37Packages.plyvel: 1.0.5 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-plyvel/versions --- pkgs/development/python-modules/plyvel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 9ce01c098fd..b66d3231146 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "14cbdyq1s8xmvha3lj942gw478cd6jyhkw8n0mhxpgbz8px9jkfn"; + sha256 = "1icsycqqjj8048a0drj3j75a71yiv2cmijh4w3jf9zxahh3k2c9p"; }; buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; From dd2ad6547e6681d1d553804bb0eafe75349639fa Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Fri, 17 May 2019 23:10:49 +0200 Subject: [PATCH 274/637] mkcl: 1.1.10.2017-11-14 -> 1.1.11 --- pkgs/development/compilers/mkcl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 8ec249ed360..72626ec0014 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkcl-${version}"; - version = "1.1.10.2017-11-14"; + version = "1.1.11"; src = fetchFromGitHub { owner = "jcbeaudoin"; repo = "mkcl"; - rev = "d3f5afe945907153db2be5a17a419966f83d7653"; - sha256 = "1jfmnh96b5dy1874a9y843vihd14ya4by46rb4h5izldp6x3j3kl"; + rev = "v${version}"; + sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26"; }; nativeBuildInputs = [ makeWrapper ]; From d7cfe3cad03330fa0e8b3666823d15e5c5620c3c Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Sat, 18 May 2019 09:11:21 +0200 Subject: [PATCH 275/637] maintainers: add ptrhlm --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0df70cdbaf7..98ec8551f5a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4001,6 +4001,11 @@ github = "Ptival"; name = "Valentin Robert"; }; + ptrhlm = { + email = "ptrhlm0@gmail.com"; + github = "ptrhlm"; + name = "Piotr Halama"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; From 0127f447c2bd97ac3e424aadb7c55c811d7931c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 18:29:11 -0500 Subject: [PATCH 276/637] libu2f-host: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/libu2f-host/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index c163720f56e..ad0557049e3 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.9"; + pname = "libu2f-host"; + version = "1.1.10"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "1hnh3f4scx07v9jfkr1nnxasmydk1cmivn0nijcp2p75bc1fznip"; + url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.xz"; + sha256 = "0vrivl1dwql6nfi48z6dy56fwy2z13d7abgahgrs2mcmqng7hra2"; }; nativeBuildInputs = [ pkgconfig ]; From c0a0dc19ce8259aacd0f4559f38ff829f689aeaa Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 17 May 2019 09:58:58 +0300 Subject: [PATCH 277/637] tiled: 1.2.3 -> 1.2.4 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 1cfb04b7b2e..4fa93d78235 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tiled"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "1zsfhw539zwyf5qfnirzkkgy5bmrrs2cry4gimrhpky9fjlaa9h8"; + sha256 = "18a0pkq8j20v1njrl0sswm0ch10c6c4fas7q9kk2d2fd610ga6gh"; }; nativeBuildInputs = [ pkgconfig qmake ]; From bc38106acbd757c9fffe64599e44132b0d6d78ce Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 May 2019 10:56:55 +0200 Subject: [PATCH 278/637] jellyfin: 10.3.2 -> 10.3.3 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index d41c94eee56..9be9a1ec06c 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.2"; + version = "10.3.3"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz"; + sha256 = "197bmr9y13rxms1bwm4infrv0dzbv9qqw67lb1alskmpp0vjg3s7"; }; buildInputs = [ From 381964e9a3390ceccf60dcd9d443fa137547a7a3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 18 May 2019 10:56:19 +0200 Subject: [PATCH 279/637] alsaPlugins: 1.1.8 -> 1.1.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-plugins/versions The alsalconfdir has been fixed upstream in: https://git.alsa-project.org/?p=alsa-plugins.git;a=blobdiff;f=configure.ac;h=1be4a70c803c367528aaf07839430801bc7f0c78;hp=5b80585fa54257266de4c59adcfd7858156f9abd;hb=2d9f140caa63fbf79d6a0823e293110b97229895;hpb=613ac0c3483fb9bc0d010e8ed4ad50191500d641 Co-authored-by: Robin Gloster --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 90319efd7c7..6768dac3326 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; - configureFlags = [ - "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d" - ]; - meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; From e8a24831634f7209dbba06fe6384c1bac6595197 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 18 May 2019 11:38:55 +0200 Subject: [PATCH 280/637] cnstrokeorder: init at 0.0.4.7 --- pkgs/data/fonts/cnstrokeorder/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/cnstrokeorder/default.nix diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix new file mode 100644 index 00000000000..965bf119f6e --- /dev/null +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl }: + +let + version = "0.0.4.7"; +in fetchurl { + name = "cnstrokeorder-${version}"; + + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + + recursiveHash = true; + downloadToTemp = true; + + postFetch = '' + install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + ''; + + sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; + + meta = with lib; { + description = "Chinese font that shows stroke order for HSK 1-4"; + homepage = "http://rtega.be/chmn/index.php?subpage=68"; + license = [ licenses.arphicpl ]; + maintainers = with maintainers; [ johnazoidberg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c28665f1b61..39c08f1143b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16022,6 +16022,8 @@ in cherry = callPackage ../data/fonts/cherry { }; + cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; From 52dca1c459b208bd2e965bc2e5b6f204a968ab49 Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Sat, 18 May 2019 09:13:21 +0200 Subject: [PATCH 281/637] kanji-stroke-order-font: init at 4.002 --- .../fonts/kanji-stroke-order-font/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/kanji-stroke-order-font/default.nix diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix new file mode 100644 index 00000000000..1c1609b03f1 --- /dev/null +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip }: + +let + version = "4.002"; +in fetchzip { + name = "kanji-stroke-order-font-${version}"; + + url = "https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${version}.zip?attredirects=0"; + + postFetch = '' + mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/kanji-stroke-order + unzip -j $downloadedFile \*.txt -d $out/share/doc/kanji-stroke-order + ''; + + sha256 = "194ylkx5p7r1461wnnd3hisv5dz1xl07fyxmg8gv47zcwvdmwkc0"; + + meta = with stdenv.lib; { + description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; + homepage = "https://sites.google.com/site/nihilistorguk/"; + + license = [ licenses.bsd3 ]; + maintainers = with maintainers; [ ptrhlm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50cd07c2f1b..56b837fe18b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16223,6 +16223,8 @@ in junicode = callPackage ../data/fonts/junicode { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; + kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; From b7f032ebed61cfecd53ec6f17f081513837adb9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 May 2019 20:51:02 +0200 Subject: [PATCH 282/637] LTS Haskell 13.21 --- .../configuration-hackage2nix.yaml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe76c581eda..7c1ab7f85b6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.20 + # LTS Haskell 13.21 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -196,7 +196,7 @@ default-package-overrides: - apecs-gloss ==0.2.0 - apecs-physics ==0.3.2 - api-field-json-th ==0.1.0.2 - - appar ==0.1.7 + - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 @@ -282,7 +282,7 @@ default-package-overrides: - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.1.5.1 + - binary-tagged ==0.1.5.2 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.2.1.1 - bindings-libzip ==1.0.1 @@ -458,7 +458,7 @@ default-package-overrides: - conduit-throttle ==0.3.1.0 - conduit-zstd ==0.0.1.1 - confcrypt ==0.1.0.4 - - configuration-tools ==0.4.0 + - configuration-tools ==0.4.1 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 @@ -795,7 +795,7 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - - generics-sop-lens ==0.1.2.1 + - generics-sop-lens ==0.1.3 - genvalidity ==0.7.0.2 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 @@ -804,7 +804,7 @@ default-package-overrides: - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 - - genvalidity-hspec-hashable ==0.2.0.3 + - genvalidity-hspec-hashable ==0.2.0.4 - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - genvalidity-property ==0.3.0.0 @@ -895,7 +895,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.2 - - happy ==1.19.9 + - happy ==1.19.10 - hasbolt ==0.1.3.3 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 @@ -1000,7 +1000,7 @@ default-package-overrides: - hsinstall ==2.2 - HSlippyMap ==3.0.1 - hslogger ==1.2.12 - - hslua ==1.0.3 + - hslua ==1.0.3.1 - hslua-aeson ==1.0.0 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.16 @@ -1046,7 +1046,7 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7.1 - http-date ==0.0.8 - - http-directory ==0.1.1 + - http-directory ==0.1.2 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 @@ -1063,7 +1063,7 @@ default-package-overrides: - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - - hw-diagnostics ==0.0.0.5 + - hw-diagnostics ==0.0.0.7 - hweblib ==0.6.3 - hw-eliasfano ==0.1.0.1 - hw-excess ==0.2.0.2 @@ -1174,7 +1174,7 @@ default-package-overrides: - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - kan-extensions ==5.2 - - kanji ==3.4.0 + - kanji ==3.4.0.2 - katip ==0.7.0.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 @@ -1310,7 +1310,7 @@ default-package-overrides: - microbench ==0.1 - microformats2-parser ==1.0.1.9 - microlens ==0.4.10 - - microlens-aeson ==2.3.0.1 + - microlens-aeson ==2.3.0.4 - microlens-contra ==0.1.0.2 - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 @@ -1430,7 +1430,7 @@ default-package-overrides: - network-transport ==0.5.2 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - - newtype ==0.2 + - newtype ==0.2.1.0 - newtype-generics ==0.5.3 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 @@ -1472,7 +1472,7 @@ default-package-overrides: - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - - OpenGL ==3.0.2.2 + - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 @@ -1505,7 +1505,7 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.2 + - parser-combinators ==1.0.3 - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 @@ -1602,7 +1602,7 @@ default-package-overrides: - prettyprinter-compat-wl-pprint ==1.0.0.1 - pretty-show ==1.9.5 - pretty-simple ==2.2.0.1 - - pretty-sop ==0.2.0.2 + - pretty-sop ==0.2.0.3 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - primitive ==0.6.4.0 @@ -1687,7 +1687,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - rebase ==1.3.1 - record-dot-preprocessor ==0.1.5 - - records-sop ==0.1.0.2 + - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 - reducers ==3.12.3 - refact ==0.3.0.2 @@ -1704,10 +1704,10 @@ default-package-overrides: - regex-pcre-builtin ==0.94.4.8.8.35 - regex-pcre-text ==0.94.0.1 - regex-posix ==0.95.2 - - regex-tdfa ==1.2.3.1 + - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.6 + - registry ==0.1.4.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1927,7 +1927,7 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.29.1 - streaming ==0.2.2.0 - - streaming-attoparsec ==1.0.0 + - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 - streaming-wai ==0.1.1 @@ -2057,7 +2057,7 @@ default-package-overrides: - throttle-io-stream ==0.2.0.1 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.1.0 + - th-utilities ==0.2.3.0 - thyme ==0.3.5.5 - tidal ==1.0.13 - tile ==0.3.0.0 @@ -2092,7 +2092,7 @@ default-package-overrides: - transformers-compat ==0.6.4 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.2 + - tree-diff ==0.0.2.1 - tree-fun ==0.8.1.0 - trifecta ==2 - triplesec ==0.2.2.0 @@ -2201,7 +2201,7 @@ default-package-overrides: - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 - vivid-supercollider ==0.4.1.2 - - void ==0.7.2 + - void ==0.7.3 - vty ==5.25.1 - wai ==3.2.2 - wai-app-static ==3.1.6.3 @@ -2239,7 +2239,7 @@ default-package-overrides: - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - - websockets-snap ==0.10.3.0 + - websockets-snap ==0.10.3.1 - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.11 From dc1cd81cfbf8c8bc2d1a4b2d9b2ea9e35a787a8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 May 2019 17:23:02 +0000 Subject: [PATCH 283/637] hackage2nix: disable broken builds on Hydra --- .../configuration-hackage2nix.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7c1ab7f85b6..0f942bb25b4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2899,6 +2899,7 @@ broken-packages: - atomic-primops-vector - atomo - ats-format + - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2968,6 +2969,7 @@ broken-packages: - azure-service-api - azure-servicebus - azurify + - b9 - babylon - backdropper - backtracking-exceptions @@ -3054,6 +3056,7 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree + - binary-instances - binary-protocol - binary-protocol-zmq - binary-streams @@ -3321,6 +3324,7 @@ broken-packages: - cabin - cabocha - cached + - cacophony - caffegraph - cairo-core - cake @@ -3696,6 +3700,7 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous-checked - contiguous-fft - continue - continuum @@ -4006,6 +4011,7 @@ broken-packages: - derp-lib - descript-lang - deterministic-game-engine + - detour-via-sci - detour-via-uom - deunicode - devil @@ -4197,6 +4203,7 @@ broken-packages: - Dust-crypto - Dust-tools - Dust-tools-pcap + - dvault - dvda - dvdread - dvi-processing @@ -4542,6 +4549,7 @@ broken-packages: - flexiwrap - flexiwrap-smallcheck - flickr + - flight-kml - Flippi - flite - float-binstring @@ -4821,6 +4829,7 @@ broken-packages: - gi-wnck - giak - Gifcurry + - ginger - ginsu - gipeda - gist @@ -5429,6 +5438,7 @@ broken-packages: - heckle - hedgehog-checkers - hedgehog-checkers-lens + - hedgehog-fn - hedgehog-gen-json - Hedi - hedis-config @@ -5520,6 +5530,7 @@ broken-packages: - hgrib - hharp - HHDL + - hhp - hi3status - hiccup - hichi @@ -6519,6 +6530,7 @@ broken-packages: - ldif - leaf - leaky + - lean - leanpub-wreq - leapseconds - learn @@ -6720,6 +6732,7 @@ broken-packages: - LslPlus - lsp-test - lsystem + - ltext - ltk - lua-bc - luachunk @@ -7276,6 +7289,7 @@ broken-packages: - Nomyx-Web - non-empty-zipper - NonEmpty + - nonempty-containers - NonEmptyList - normalization-insensitive - NoSlow @@ -7785,6 +7799,7 @@ broken-packages: - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort - primula-board - primula-bot - pringletons @@ -8097,6 +8112,7 @@ broken-packages: - regions-mtl - register-machine-typelevel - registry + - registry-hedgehog - regress - regular - regular-extras @@ -8109,6 +8125,7 @@ broken-packages: - relacion - relation - relational-postgresql8 + - relational-record-examples - relative-date - reload - remark @@ -9074,6 +9091,7 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-lua - tasty-quickcheck-laws - tasty-stats - tasty-tap From 71fee27abb33ab6ada3165372c600f8728ea81bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 May 2019 20:52:12 +0200 Subject: [PATCH 284/637] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5a5fa437a241e1ce625d99ac674842a2b917e2a2. --- .../haskell-modules/hackage-packages.nix | 2293 ++++++++++------- 1 file changed, 1415 insertions(+), 878 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ddcfa0ff447..4cc3c34b9d1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -768,8 +768,8 @@ self: { }: mkDerivation { pname = "Agda"; - version = "2.6.0"; - sha256 = "1f3gq1vd9ra3421ff5an6q33mlfzc2qvaxmfg9qhvr4z99ivqwdz"; + version = "2.6.0.1"; + sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -4846,8 +4846,8 @@ self: { }: mkDerivation { pname = "ENIG"; - version = "0.0.0.2"; - sha256 = "0rnqp6bdib4w683gvj6i0p3p7ms0zw6vwvmsgy9gwfwxqkh6m3ps"; + version = "0.0.1.0"; + sha256 = "1zv6dybsnj3kssiyyg69lxyj5wvi5qjx0xp7skg362xzqmi97ch3"; libraryHaskellDepends = [ base text unicode-transforms vector ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -6221,8 +6221,8 @@ self: { }: mkDerivation { pname = "Frames-map-reduce"; - version = "0.1.0.0"; - sha256 = "05xk49qc5l8h7qnxhyxj9k2r2igcf7qc4njiw9w28fajlmnrgcw3"; + version = "0.1.0.1"; + sha256 = "1m3ifx867hn4zhrj9xlars44w3sv1sp6ja38kb6f3lnhr86nf8g2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10545,6 +10545,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: + mkDerivation { + pname = "HsYAML"; + version = "0.1.2.0"; + sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers mtl parsec text + ]; + description = "Pure Haskell YAML 1.2 parser"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector }: @@ -11299,6 +11315,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_4_1" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.4.1"; + sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -12926,32 +12960,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_4_0_1" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.4.0.1"; - sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8"; - revision = "2"; - editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -12962,6 +12970,8 @@ self: { pname = "MissingH"; version = "1.4.1.0"; sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; + revision = "2"; + editedCabalFile = "1k7d8cgvpmln4imcrfpj4c02n3c5l1gkd5hs4hnar9ln0qh61cfx"; libraryHaskellDepends = [ array base containers directory filepath hslogger HUnit mtl network old-locale old-time parsec process random regex-compat time unix @@ -12975,6 +12985,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MissingH_1_4_2_0" = callPackage + ({ mkDerivation, array, base, containers, directory + , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network + , network-bsd, old-locale, old-time, parsec, process, random + , regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.4.2.0"; + sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process random regex-compat + time unix + ]; + testHaskellDepends = [ + base containers directory errorcall-eq-instance filepath HUnit + old-time parsec regex-compat time unix + ]; + description = "Large utility library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -14505,22 +14539,6 @@ self: { }) {}; "OpenGL" = callPackage - ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName - , OpenGLRaw, StateVar, text, transformers - }: - mkDerivation { - pname = "OpenGL"; - version = "3.0.2.2"; - sha256 = "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc"; - libraryHaskellDepends = [ - base bytestring containers GLURaw ObjectName OpenGLRaw StateVar - text transformers - ]; - description = "A binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "OpenGL_3_0_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName , OpenGLRaw, StateVar, text, transformers }: @@ -14534,7 +14552,6 @@ self: { ]; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenGLCheck" = callPackage @@ -15852,8 +15869,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "1"; - editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; + revision = "2"; + editedCabalFile = "0d7dzba96vglz4k7ryf0zzqm18vl0wrr9v3xwwjf4cv91cc8cql2"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -15871,6 +15888,8 @@ self: { pname = "QuickCheck"; version = "2.13.1"; sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; + revision = "1"; + editedCabalFile = "1i8h75cxxpkriqprkr0ry5ig29pqhhhs5syjjxsyf1df6rngxipx"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -20073,8 +20092,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.3"; - sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6"; + version = "0.2.2.4"; + sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -20141,8 +20160,8 @@ self: { ({ mkDerivation, Advapi32, base, Win32, Win32-errors }: mkDerivation { pname = "Win32-services"; - version = "0.4"; - sha256 = "1zxi8m98n5pgpx7z20f4g40w4njqllw7gfnlfxwgw3iismxiyyp8"; + version = "0.4.0.1"; + sha256 = "1skf8w3d1n61847bjpvll3bql65mrc6vg03q84bg21mlh77mx1s3"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; @@ -23218,22 +23237,21 @@ self: { "aeson-gadt-th" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map - , dependent-sum, hspec, HUnit, markdown-unlit, template-haskell - , transformers + , dependent-sum, dependent-sum-template, hspec, HUnit + , template-haskell, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.1.0"; - sha256 = "09529lpjmm7hpqwrs3w8z1d6zzy4dw5wyqyx88ra68wf2a5nlwsh"; + version = "0.2.1.1"; + sha256 = "18lkf75pw8lp03bj4b8vknj7ysvbhpix6zkzd86qaq0z3yh6s6jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers dependent-sum template-haskell transformers ]; executableHaskellDepends = [ - aeson base dependent-map dependent-sum + aeson base dependent-map dependent-sum dependent-sum-template ]; - executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ aeson aeson-qq base dependent-sum hspec HUnit ]; @@ -27174,20 +27192,19 @@ self: { }) {}; "amazonka-s3-streaming" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, deepseq, dlist, exceptions, http-client - , lens, lifted-async, mmap, mmorph, mtl, resourcet + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async, base + , bytestring, conduit, dlist, exceptions, http-client, lens, mmorph + , mtl }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.5"; - sha256 = "1j9jp409gjq7gnwx163i7qpk4ih3rff7z2icsfmzakiarwmg2ff2"; + version = "1.0.0.2"; + sha256 = "1k7l49h3zdqw3va70mr4rrmsyjpbzgbnr3bhj7yl24np77r6cs99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq - dlist exceptions http-client lens lifted-async mmap mmorph mtl - resourcet + amazonka amazonka-core amazonka-s3 async base bytestring conduit + dlist exceptions http-client lens mmorph mtl ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; @@ -28337,12 +28354,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_9" = callPackage + "ansi-terminal_0_9_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.9"; - sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp"; + version = "0.9.1"; + sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28353,19 +28370,22 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal - , clock, hspec, linebreak, split, terminal-size, timers-tick + , clock, hspec, linebreak, mtl, split, terminal-size, timers-tick }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.2.1.0"; - sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836"; + version = "0.3.1.0"; + sha256 = "0q62lq4i638hn23qvmlv7qa6gdnxl3bnrhpp2j2liw885x4qxlhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bytestring cereal clock linebreak split - terminal-size timers-tick + ansi-terminal array base bytestring cereal clock linebreak mtl + split terminal-size timers-tick + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock hspec linebreak + mtl split terminal-size timers-tick ]; - testHaskellDepends = [ array base hspec linebreak ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -28387,6 +28407,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-wl-pprint_0_6_9" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.9"; + sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { @@ -28533,14 +28567,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_0_2" = callPackage + "antiope-athena_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.0.2"; - sha256 = "0jnw1r2qxdsgb2a96ibayy504ndmgwnr083y3hxvsf081bi72n03"; + version = "7.0.3"; + sha256 = "15z64bwqnz7ypv35alj1wfvw0ab1zp0h7sdhw300mq3715snw0x1"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28558,8 +28592,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.0.2"; - sha256 = "0pf9dqx4px93fvq9rsl13ckngylj9dywzapn8largccvw0j5g8zk"; + version = "7.0.3"; + sha256 = "1c2q532dy6zash5ap3mq9qx9316gqhd3ilafvqs3xvfx6gddb7k6"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28591,7 +28625,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_0_2" = callPackage + "antiope-core_7_0_3" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28599,8 +28633,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.0.2"; - sha256 = "1rybjb99sqgs2qa0b2mjrfwi5h8112ipwjphapcbgzg2y7nicw60"; + version = "7.0.3"; + sha256 = "0qn89pij3gg129y4waiwq6y6i7d7lny9ibjz9zdv5n6fzsgmrz8l"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28637,15 +28671,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_0_2" = callPackage + "antiope-dynamodb_7_0_3" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.0.2"; - sha256 = "0apbpikpcj400qn4jq0s29rmsbk3ngi7drd8jmkpnnlqvz7g4cyv"; + version = "7.0.3"; + sha256 = "1shfi2l9pys211pxq03z71d53578d2amwlyvsj4cb9qspccqmxb0"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28683,7 +28717,7 @@ self: { broken = true; }) {}; - "antiope-messages_7_0_2" = callPackage + "antiope-messages_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28691,8 +28725,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.0.2"; - sha256 = "1v0wfhniy5gaqnn8b39vc8whzmj9a58zh6l0zz234n5yghggz7fq"; + version = "7.0.3"; + sha256 = "05xrjlm5w2pbx9dlgi800j28zxyhbilhd902f8mshdw5jq7l3ws3"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28714,8 +28748,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.0.1"; - sha256 = "018jnswibppmr3qzk6bn64r3xg55msp4bzmcg99vkr6nzgjl1zad"; + version = "7.0.3"; + sha256 = "1pw8jhbhn11jjp5zlsx2sdf3swjqcda0ka6xm09wzk14njyj2m0a"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28754,7 +28788,7 @@ self: { broken = true; }) {}; - "antiope-s3_7_0_2" = callPackage + "antiope-s3_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28763,8 +28797,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.0.2"; - sha256 = "1g46qy0xxwszx7mnsyd04yi83wf0kv57h4sb1jfq6ds6sh9l0xnc"; + version = "7.0.3"; + sha256 = "0n5jzp1ab3nk99z0n2d4kp400cg2ygxnk9s9siks2qncpgx3bb42"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28802,15 +28836,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_0_2" = callPackage + "antiope-sns_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.0.2"; - sha256 = "19l0sl33ywr2j5kxkqk0bbpqiahlzn1k883vhyki585hhgh2dad1"; + version = "7.0.3"; + sha256 = "0kq669k1h11cjrx4d0rdyzfv94br5w0pxl0zm0xa0pq4inagz06q"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -28849,19 +28883,20 @@ self: { broken = true; }) {}; - "antiope-sqs_7_0_2" = callPackage + "antiope-sqs_7_0_3" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl - , network-uri, text, time, unliftio-core, unordered-containers + , network-uri, split, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "7.0.2"; - sha256 = "0wpfcr3z3vpsy1m0zwrzszpsa4w4p9261ys8bnmvwg1qa8fpg278"; + version = "7.0.3"; + sha256 = "152w0zg2psdgii74k8h1wpq2qcnpmiybh0fa3y8i7fj75v8y0wj9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit - generic-lens lens lens-aeson monad-loops mtl network-uri text + generic-lens lens lens-aeson monad-loops mtl network-uri split text unliftio-core unordered-containers ]; testHaskellDepends = [ @@ -29186,21 +29221,19 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, hspec, HTTP, http-client, http-client-tls, http-types - , text, tls, transformers + , QuickCheck, text, tls, transformers }: mkDerivation { pname = "api-builder"; - version = "0.15.0.0"; - sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad"; - revision = "1"; - editedCabalFile = "0sw6vdnzlqyv9n7gdhy1ibh7vrzfflc1cy2q558a4i23gn74k74s"; + version = "0.16.0.0"; + sha256 = "1va2h0sbmx15a29ffmnqqidwzj1kk6dbcgdlcx2lpfk3cwwnpj8m"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers ]; testHaskellDepends = [ - aeson base bytestring Cabal containers hspec http-client text - transformers + aeson base bytestring Cabal containers hspec http-client QuickCheck + text transformers ]; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -29685,17 +29718,6 @@ self: { }) {}; "appar" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "appar"; - version = "0.1.7"; - sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn"; - libraryHaskellDepends = [ base bytestring ]; - description = "A simple applicative parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "appar_0_1_8" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "appar"; @@ -29704,7 +29726,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appc" = callPackage @@ -32413,10 +32434,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.13"; - sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz"; - revision = "1"; - editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh"; + version = "3.2.5.16"; + sha256 = "044i1a6faw7r7ds910wk99mmg09ks1gdzc1md114nml614n3fqih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32435,6 +32454,8 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-setup" = callPackage @@ -34607,6 +34628,8 @@ self: { ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "babl" = callPackage @@ -36729,8 +36752,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, time }: mkDerivation { pname = "bgmax"; - version = "0.2.0.3"; - sha256 = "15w8ib36spnlsvr41rb4n6dp6nh6ksyb07lzwlcf1a4ajfx23ns6"; + version = "0.2.0.4"; + sha256 = "0cgxdq5dfs9dvj5ly9sd52pf75yslrnds45hg9nwv5zrfld90rdv"; libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; @@ -37125,6 +37148,8 @@ self: { pname = "binary"; version = "0.8.6.0"; sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y"; + revision = "1"; + editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -37296,6 +37321,33 @@ self: { broken = true; }) {}; + "binary-instances" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1"; + sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "binary-list" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , phantom-state, transformers @@ -37351,6 +37403,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_1_0_1" = callPackage + ({ mkDerivation, base, binary, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "binary-orphans"; + version = "1.0.1"; + sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; + libraryHaskellDepends = [ base binary transformers ]; + testHaskellDepends = [ + base binary QuickCheck quickcheck-instances tagged tasty + tasty-quickcheck + ]; + description = "Compatibility package for binary; provides instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl , quickcheck-instances, rerebase, tasty, tasty-hunit @@ -37547,10 +37617,8 @@ self: { }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.1"; - sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh"; - revision = "1"; - editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx"; + version = "0.1.5.2"; + sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable scientific SHA tagged text time @@ -37571,32 +37639,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary-tagged_0_1_5_2" = callPackage + "binary-tagged_0_2" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-orphans, bytestring, containers, criterion - , deepseq, generics-sop, hashable, nats, quickcheck-instances - , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck - , text, time, unordered-containers, vector + , binary, binary-instances, bytestring, containers, criterion + , cryptohash-sha1, deepseq, generics-sop, hashable, nats + , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, unordered-containers + , vector }: mkDerivation { pname = "binary-tagged"; - version = "0.1.5.2"; - sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz"; + version = "0.2"; + sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - generics-sop hashable scientific SHA tagged text time + cryptohash-sha1 generics-sop hashable scientific tagged text time unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary binary-orphans - bytestring containers generics-sop hashable quickcheck-instances - scientific SHA tagged tasty tasty-quickcheck text time - unordered-containers vector + aeson array base base16-bytestring bifunctors binary + binary-instances bytestring containers generics-sop hashable + quickcheck-instances scientific tagged tasty tasty-hunit + tasty-quickcheck text time unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-orphans bytestring - containers criterion deepseq generics-sop hashable nats scientific - semigroups SHA tagged text time unordered-containers vector + aeson array base base16-bytestring binary binary-instances + bytestring containers criterion deepseq generics-sop hashable nats + scientific semigroups SHA tagged text time unordered-containers + vector ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; @@ -38831,8 +38901,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.2.0"; - sha256 = "0xqx7y0nv80wywp6ybcb23z77plizfvv6rk04gkykcpfjna6ijai"; + version = "0.1.2.1"; + sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41386,6 +41456,8 @@ self: { pname = "both"; version = "0.1.1.0"; sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg"; + revision = "1"; + editedCabalFile = "0fi2lvxcdnj9bi683kl840xpyj12wxwxvqbi86a6qp4r8bq8442n"; libraryHaskellDepends = [ base semigroups zero ]; description = "Like Maybe, but with a different Monoid instance"; license = stdenv.lib.licenses.mit; @@ -41711,8 +41783,8 @@ self: { }: mkDerivation { pname = "breve"; - version = "0.4.4.0"; - sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p"; + version = "0.4.5.1"; + sha256 = "1db93l3lb09rsb6yh3pkbfpyh736a9ki0q1x8s8rcp4dsy79b3va"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -41723,7 +41795,7 @@ self: { xdg-basedir ]; description = "a url shortener"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -44210,8 +44282,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.0.9"; - sha256 = "1h7wp30gmggsrjgspsahn6b045njy6c23mhgkmhz6nn5s4wa1hak"; + version = "1.0.0.10"; + sha256 = "1iy7a7zmf3z539snj6rgg3qkcx8f8xwqvjry6wwagalr6z5smhmx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45458,6 +45530,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -48707,17 +48781,18 @@ self: { "check-pvp" = callPackage ({ mkDerivation, base, Cabal, containers, explicit-exception - , filepath, haskell-src-exts, non-empty, transformers, utility-ht + , filepath, haskell-packages, haskell-src-exts, hse-cpp, non-empty + , tagged, transformers, utility-ht }: mkDerivation { pname = "check-pvp"; - version = "0.0.1"; - sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f"; + version = "0.0.2.1"; + sha256 = "0n3rq7zf0q92jm6y1gicp98b5yww8s8d430kc6a48rsxqs96i1w6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers explicit-exception filepath haskell-src-exts - non-empty transformers utility-ht + base Cabal containers explicit-exception filepath haskell-packages + haskell-src-exts hse-cpp non-empty tagged transformers utility-ht ]; description = "Check whether module and package imports conform to the PVP"; license = stdenv.lib.licenses.bsd3; @@ -48849,7 +48924,7 @@ self: { }) {}; "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers + ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, extra, file-embed, haskeline, megaparsec, MonadRandom , mtl, o-clock, optparse-applicative, parallel, parser-combinators , prettyprinter, process, random, stm, text, time @@ -48857,23 +48932,23 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.0.0"; - sha256 = "18ni11hlcd4mkd6s0a22afiads83vhspxabchspnjyn9vm75spfg"; + version = "0.3.1.0"; + sha256 = "1aj0lnvscc07q879s9mxv0kgr8spnzvdskazi2maf7hsgirpijsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers file-embed megaparsec + attoparsec base binary bytestring containers file-embed megaparsec MonadRandom o-clock parser-combinators prettyprinter process random stm text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base bytestring containers extra file-embed haskeline - megaparsec MonadRandom mtl o-clock optparse-applicative + attoparsec base binary bytestring containers extra file-embed + haskeline megaparsec MonadRandom mtl o-clock optparse-applicative parser-combinators prettyprinter process random stm text time unordered-containers vector ]; testHaskellDepends = [ - attoparsec base bytestring containers directory file-embed + attoparsec base binary bytestring containers directory file-embed megaparsec MonadRandom o-clock parallel parser-combinators prettyprinter process random stm text time unordered-containers vector @@ -52135,8 +52210,8 @@ self: { pname = "co-log"; version = "0.3.0.0"; sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; - revision = "1"; - editedCabalFile = "0qf4icy6mrvkwc8kd4w3x47ckhqsx5d5zqpc6cd9qcv1r6pw2vhj"; + revision = "2"; + editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54864,6 +54939,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_10" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.10"; + sha256 = "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -55285,8 +55377,8 @@ self: { pname = "conduit-extra"; version = "1.2.3.2"; sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; - revision = "2"; - editedCabalFile = "0x77alx5h3v07ra0l0l5b36rx5qb3vg2f5k711yvin1q40vwvhqg"; + revision = "3"; + editedCabalFile = "0m68hvcmg4wwn12wcczqx1i60i8g2nv95c05abnl8ymq0377c7wi"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -55851,41 +55943,6 @@ self: { }) {}; "configuration-tools" = 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; - }) {}; - - "configuration-tools_0_4_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory @@ -55918,7 +55975,6 @@ self: { ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -56422,8 +56478,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.2.0"; - sha256 = "0czsxil1mzswm9l88df4lnrgsgp634n06k14vs6f4zh2s9xxb59g"; + version = "1.0.3.0"; + sha256 = "0mx3r79sc86afpa0fnb8jhxk2g8cfr4hax7q5j8a8lfyxp1bcf3z"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -56456,18 +56512,15 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, aeson, base, constraints, markdown-unlit - , template-haskell - }: + ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.5"; - sha256 = "1p45847w48waqvwmsvk44bvg39p2ifzdrwhk5h3n7l1avsmks37w"; + version = "0.3.0.1"; + sha256 = "0majx5yrddpyvymfl84dqwrqf4bf91jskgaki4ia0h8vhzqfcivx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; executableHaskellDepends = [ aeson base constraints ]; - executableToolDepends = [ markdown-unlit ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56757,12 +56810,19 @@ self: { }) {}; "contiguous" = callPackage - ({ mkDerivation, base, deepseq, primitive }: + ({ mkDerivation, base, deepseq, primitive, primitive-unlifted + , QuickCheck, quickcheck-instances, vector + }: mkDerivation { pname = "contiguous"; - version = "0.3.3.0"; - sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; - libraryHaskellDepends = [ base deepseq primitive ]; + version = "0.4.0.1"; + sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn"; + libraryHaskellDepends = [ + base deepseq primitive primitive-unlifted + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-instances vector + ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56776,6 +56836,8 @@ self: { libraryHaskellDepends = [ base contiguous primitive ]; description = "contiguous with bounds checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-fft" = callPackage @@ -56960,9 +57022,10 @@ self: { ({ mkDerivation, base, containers, stm, time }: mkDerivation { pname = "control-event"; - version = "1.2.1.1"; - sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565"; + version = "1.3"; + sha256 = "1a48h7nna7padcffdfyaavhfl43lqfhvib5ddsxbqm7y99nylni6"; libraryHaskellDepends = [ base containers stm time ]; + testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57437,8 +57500,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0.1"; - sha256 = "11vrin2d0zfqzn3c9ikn1ra76m2083nlrk3l8j4hk0pnssy9kjvp"; + version = "3.0.2"; + sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -64144,6 +64207,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_7" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.7"; + sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -66309,6 +66400,8 @@ self: { ]; description = "JSON and CSV encoding for rationals as decimal point numbers"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "detour-via-uom" = callPackage @@ -66786,19 +66879,19 @@ self: { "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant - , dhall, Diff, directory, filepath, hashable, microlens - , optparse-applicative, prettyprinter, tasty, tasty-golden - , tasty-hunit, text, transformers, vector + , dhall, Diff, directory, filepath, microlens, optparse-applicative + , prettyprinter, tasty, tasty-golden, tasty-hunit, text + , transformers, vector }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.3.2.0"; - sha256 = "1cy7pqqfrmli3a8p24j0dgksfwhj08kjpbp31bdibnr8ix204jjc"; + version = "1.3.3.0"; + sha256 = "0nh7sn8hzm38prx4c2h9azw351gns4mscjnn7dsgxpn34l5yyql7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers contravariant dhall filepath - hashable text transformers vector + base bytestring Cabal containers contravariant dhall filepath text + transformers vector ]; executableHaskellDepends = [ base bytestring Cabal dhall directory filepath microlens @@ -68664,6 +68757,17 @@ self: { broken = true; }) {}; + "discokitty" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "discokitty"; + version = "0.1.0"; + sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj"; + libraryHaskellDepends = [ base containers ]; + description = "DisCoCat implementation"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "discord-gateway" = callPackage ({ mkDerivation, aeson, base, discord-types, hslogger, transformers , url, websockets, wuss @@ -69637,8 +69741,8 @@ self: { }: mkDerivation { pname = "distributed-static"; - version = "0.3.8"; - sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm"; + version = "0.3.9"; + sha256 = "1nch2k8dnlf6is2p4skh8vd0qbkgai4r6msfn6r5cr0cqaarb6pf"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -72078,6 +72182,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dvault" = callPackage + ({ mkDerivation, base, bytestring, containers, crypto-rng + , data-default, directory, process, vector + }: + mkDerivation { + pname = "dvault"; + version = "0.1.0.0"; + sha256 = "1djk7c7zbkhr95nvrn4wf864yl425w0ifwgsb5f4al0gyv1cx0c9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers crypto-rng data-default directory + process vector + ]; + description = "Dead simple password manager"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dvda" = callPackage ({ mkDerivation, ad, base, containers, directory, fgl , file-location, graphviz, hashable, hashtables, mtl, process @@ -72468,19 +72592,18 @@ self: { "dynamodb-simple" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , base, bytestring, conduit, containers, double-conversion - , exceptions, generics-sop, hashable, hspec, lens, monad-loops - , monad-supply, safe-exceptions, scientific, semigroups, tagged - , template-haskell, text, transformers, unordered-containers - , uuid-types, vector + , exceptions, generics-sop, hashable, hspec, lens, monad-loops, mtl + , safe-exceptions, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, uuid-types, vector }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.1"; - sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; + version = "0.6.0.2"; + sha256 = "1mx2ylbvcyskv0pc053mcwlz3mycqrq3g4rgrbk4qhnywx8p7gav"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop - hashable lens monad-loops monad-supply scientific semigroups tagged + hashable lens monad-loops mtl scientific semigroups tagged template-haskell text transformers unordered-containers uuid-types vector ]; @@ -73437,8 +73560,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.14"; - sha256 = "0iilizs6nj901fmzfam9s0s2phz91m2292wggqvzj8p6260589iq"; + version = "3.8.1"; + sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -77095,6 +77218,8 @@ self: { pname = "eventful-sql-common"; version = "0.2.0"; sha256 = "1g5f6rvb14hi81dby2hdcq444zhv2vl76ql4lsrh9gdmpf6a2vm4"; + revision = "1"; + editedCabalFile = "1w2qq0p4304zsjkwmqx79azpq5v0ajz5grg740vwkca8qvdvdq91"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent persistent-template text uuid @@ -78474,29 +78599,29 @@ self: { ({ mkDerivation, async, base, bytestring, containers, data-default , deepseq, directory, exceptions, extensible-effects, filepath , hostname, HUnit, lens, monad-control, mtl, network, parallel - , process, QuickCheck, safe-exceptions, stm, tasty, tasty-discover - , tasty-hunit, text, time, transformers-base + , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty + , tasty-discover, tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.22.1"; - sha256 = "1vjd8rr60zxgvv96i9fx5vjbvvxagj8fxz6891irmjgxhlb1v75z"; + version = "0.23.0"; + sha256 = "0lyhkpds8j8b6vb9sk4ibad8a36zanfdq59mg1kiasxx6wmy20v5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-default deepseq directory exceptions extensible-effects filepath hostname lens monad-control - mtl network parallel process QuickCheck safe-exceptions stm text - time transformers-base + mtl network parallel pretty-types process QuickCheck + safe-exceptions stm text time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath - lens text + lens pretty-types text ]; testHaskellDepends = [ async base containers data-default deepseq extensible-effects - filepath hostname HUnit lens QuickCheck stm tasty tasty-discover - tasty-hunit text time + filepath hostname HUnit lens pretty-types QuickCheck stm tasty + tasty-discover tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; @@ -78966,8 +79091,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.2.0"; - sha256 = "0297bppk69gn4sv5m5w1wh4wbshiz9w3b81sr9ps309k7bb6va9j"; + version = "0.2.1"; + sha256 = "11dsj2b1dyg6hdjhj3l7q04w896mrc32zkn1zkj2l032zlbwi44n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath random @@ -79459,15 +79584,17 @@ self: { }) {inherit (pkgs) openssl;}; "fastsum" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, template-haskell }: + ({ mkDerivation, base, deepseq, ghc-prim, hashable + , template-haskell + }: mkDerivation { pname = "fastsum"; - version = "0.1.0.0"; - sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57"; + version = "0.1.1.0"; + sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc-prim hashable template-haskell + base deepseq ghc-prim hashable template-haskell ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = stdenv.lib.licenses.bsd3; @@ -82560,6 +82687,8 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flip-cmd" = callPackage @@ -86530,15 +86659,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_3_1_0" = callPackage + "fused-effects_0_4_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.3.1.0"; - sha256 = "0mg6sgp4j6my34wzsdpvjvsb07s9k515shvi8nnrnzf0djqq95rv"; + version = "0.4.0.0"; + sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8"; libraryHaskellDepends = [ base deepseq MonadRandom random transformers unliftio-core ]; @@ -86552,12 +86681,16 @@ self: { }) {}; "fused-effects-exceptions" = callPackage - ({ mkDerivation, base, fused-effects, safe-exceptions }: + ({ mkDerivation, base, fused-effects, safe-exceptions + , unliftio-core + }: mkDerivation { pname = "fused-effects-exceptions"; - version = "0.1.0.0"; - sha256 = "0ga4cjlmrc577gps0mhy37n1np2ds0wcfnq3nbhvz3fy3m5fzylz"; - libraryHaskellDepends = [ base fused-effects safe-exceptions ]; + version = "0.1.1.0"; + sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd"; + libraryHaskellDepends = [ + base fused-effects safe-exceptions unliftio-core + ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88238,21 +88371,19 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.2.1"; - sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "6"; - editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw"; + version = "0.1.3"; + sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop-lens_0_1_3" = callPackage + "generics-sop-lens_0_2" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.1.3"; - sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay"; + version = "0.2"; + sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -88774,27 +88905,6 @@ self: { }) {}; "genvalidity-hspec-hashable" = callPackage - ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec - , genvalidity-property, hashable, hspec, hspec-core, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-hashable"; - version = "0.2.0.3"; - sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; - libraryHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec QuickCheck validity - ]; - testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec genvalidity-property - hashable hspec hspec-core QuickCheck validity - ]; - description = "Standard spec's for Hashable instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec-hashable_0_2_0_4" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity @@ -88813,7 +88923,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -89707,8 +89816,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0.2"; - sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy"; + version = "0.9.0"; + sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89955,8 +90064,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190423"; - sha256 = "1jj4ph9ldxicccs3myqmll9x3a1rl9zv95b797mm9yas80sbijnx"; + version = "0.20190516"; + sha256 = "0jk0k870iznichiw7f99snv2syyqhaqh3faglc32fkhghmawv9y5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89980,8 +90089,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190423"; - sha256 = "1vwfsyyj8h0x56zq498mhjbpj6bz9n901v3mwyn5hzp7c25zdv5k"; + version = "0.20190516"; + sha256 = "0blwr9gii81rh689skmzxqfhiya412hic9rvkqafwwrilppn8043"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -91973,15 +92082,15 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , data-default, filepath, http-types, mtl, parsec, process - , regex-tdfa, safe, scientific, tasty, tasty-hunit + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers , utf8-string, vector, yaml }: mkDerivation { pname = "ginger"; - version = "0.8.4.0"; - sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7"; + version = "0.8.4.1"; + sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91991,8 +92100,8 @@ self: { unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson base bytestring data-default process text transformers - unordered-containers yaml + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml ]; testHaskellDepends = [ aeson base bytestring data-default mtl tasty tasty-hunit @@ -92001,6 +92110,8 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gingersnap" = callPackage @@ -92233,13 +92344,12 @@ self: { bup curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - installPhase = "make PREFIX=$out BUILDER=: install"; - checkPhase = '' + postBuild = '' ln -sf dist/build/git-annex/git-annex git-annex ln -sf git-annex git-annex-shell - export PATH+=":$PWD" - git-annex test ''; + installPhase = "make PREFIX=$out BUILDER=: install install-completions"; + checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; @@ -93632,13 +93742,14 @@ self: { , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , regex-tdfa, semigroupoids, split, stm, template-haskell, text - , time, transformers, unix, unordered-containers, vector, vty + , regex-tdfa, regex-tdfa-text, semigroupoids, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.30"; - sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; + version = "2.31"; + sha256 = "1div9xkls0jgsi3h0pm7y9rdlyr5rnc07ld3ka285g0hkg5yyban"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -93646,8 +93757,9 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues regex-tdfa semigroupoids split stm template-haskell text - time transformers unix unordered-containers vector vty + psqueues regex-tdfa regex-tdfa-text semigroupoids split stm + template-haskell text time transformers unix unordered-containers + vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -101206,8 +101318,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "5"; - editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi"; + revision = "6"; + editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -102430,8 +102542,8 @@ self: { }: mkDerivation { pname = "hakyll-dhall"; - version = "0.2.2.2"; - sha256 = "0w2vhma28904mg7bymk0qd3gzwirbjkjkw862jxg2zzcnsg8m04i"; + version = "0.2.3.0"; + sha256 = "1a8aq1gmj6mwpv43s2vr7asp6v6bflms1vhd9dvs04jfnw3jbvpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102625,6 +102737,8 @@ self: { pname = "hakyll-shortcut-links"; version = "0.0.0.0"; sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; + revision = "1"; + editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p"; libraryHaskellDepends = [ base hakyll megaparsec mtl pandoc-types shortcut-links text ]; @@ -104080,25 +104194,6 @@ self: { }) {}; "happy" = callPackage - ({ mkDerivation, array, base, Cabal, containers, directory - , filepath, mtl, process - }: - mkDerivation { - pname = "happy"; - version = "1.19.9"; - sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; - revision = "3"; - editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ array base containers mtl ]; - testHaskellDepends = [ base process ]; - description = "Happy is a parser generator for Haskell"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "happy_1_19_10" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, mtl, process }: @@ -104113,7 +104208,6 @@ self: { testHaskellDepends = [ base process ]; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happy-meta" = callPackage @@ -104982,6 +105076,8 @@ self: { pname = "hashtables"; version = "1.2.3.1"; sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg"; + revision = "1"; + editedCabalFile = "1yyqnqn85mlw03f2bpvwa1w9gigswk9n30i918myqyxwr595l7rr"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -105651,18 +105747,19 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, monad-loops, process, text, unordered-containers + , haddock-api, haddock-library, monad-loops, process, text + , unordered-containers }: mkDerivation { pname = "haskell-docs"; - version = "4.2.8"; - sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz"; + version = "4.2.9"; + sha256 = "10pgziq2f9wx92afmwh1m4bwxcyygpf4xg99vghm6r4ilh1fbkg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api monad-loops process - text unordered-containers + directory filepath ghc ghc-paths haddock-api haddock-library + monad-loops process text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; @@ -107870,6 +107967,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskey-btree_0_3_0_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-ordlist + , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "haskey-btree"; + version = "0.3.0.1"; + sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m"; + libraryHaskellDepends = [ + base binary bytestring containers hashable mtl semigroups text + transformers vector + ]; + testHaskellDepends = [ + base binary bytestring containers data-ordlist HUnit mtl QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers vector + ]; + description = "B+-tree implementation in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskey-mtl" = callPackage ({ mkDerivation, base, binary, exceptions, haskey, haskey-btree , lens, monad-control, mtl, text, transformers, transformers-base @@ -108191,8 +108312,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.14.7"; - sha256 = "0dn0d71jdpa4dmrwmpqipkdbl2cb8w8i2p18fly3b1xhpqra20il"; + version = "0.15.2"; + sha256 = "078w4a3xymp79dk17rprspm4c2m3p7qbcdqzmcgxjzz7kzsr5mmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111229,8 +111350,8 @@ self: { pname = "hedgehog"; version = "0.6.1"; sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; - revision = "4"; - editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx"; + revision = "5"; + editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -111245,6 +111366,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions, fail + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0"; + sha256 = "1np9xg58x20kalfci9dxbd4wsg0sl3ka56ragzy3i9p0nx29pmns"; + revision = "1"; + editedCabalFile = "1b2hvd3z5mnwfdp5xwdwrh2f1l0wshnnz6ggak2dqqm57wyifdql"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions fail lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -111307,10 +111456,8 @@ self: { ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { pname = "hedgehog-fn"; - version = "0.6"; - sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv"; - revision = "1"; - editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1"; + version = "1.0"; + sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111318,6 +111465,8 @@ self: { ]; description = "Function generation for `hedgehog`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -111363,8 +111512,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1"; sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "3"; - editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3"; + revision = "5"; + editedCabalFile = "0x3vsw9pvdgbi0a2fc0kbk9x3dbfq963bb8lkpj8cy2in29qv77f"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; @@ -111396,7 +111545,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_4" = callPackage + "hedis_0_12_5" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -111404,8 +111553,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.4"; - sha256 = "1d1r0ghf1fpiiarpywx7j48bhc86q86lass3b837dcyfni8z2sxw"; + version = "0.12.5"; + sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -111533,6 +111682,8 @@ self: { pname = "hedn"; version = "0.2.0.1"; sha256 = "16yi4x6g27zabgqwd4xckp5zibxq882919mmyyr95g56r7pm8v1j"; + revision = "1"; + editedCabalFile = "1wr3zv0bj1714y1ip40va34zysmypicd6qp0l50bg9wj2db0misz"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -113535,6 +113686,8 @@ self: { ]; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hi" = callPackage @@ -113864,8 +114017,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.1.0"; - sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542"; + version = "0.1.1.1"; + sha256 = "03jza44q99qfc46kb1r66qjirgklp7h8l2c28k4cmkzd2r23bd7a"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; testHaskellDepends = [ base doctest hspec lens QuickCheck ]; description = "Partial types as a type constructor"; @@ -114899,6 +115052,8 @@ self: { pname = "hit-on"; version = "0.0.0"; sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r"; + revision = "1"; + editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115080,21 +115235,25 @@ self: { }) {}; "hjugement-protocol" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite, hashable - , memory, mmorph, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unordered-containers + ({ mkDerivation, base, bytestring, containers, criterion + , cryptonite, deepseq, memory, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190501"; - sha256 = "0jhc5qjraf3v54892134g1qlsi1wrl87kv9c0m4k40hd4fkjh894"; + version = "0.0.0.20190513"; + sha256 = "0m51216rxy0lm8q6v0hc1fa1qkxmxlnrd47plm3jjcxl5pg2li25"; libraryHaskellDepends = [ - base bytestring containers cryptonite memory mmorph random text + base bytestring containers cryptonite deepseq memory random text transformers unordered-containers ]; testHaskellDepends = [ - base containers hashable QuickCheck random tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers + base containers QuickCheck random tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion QuickCheck random text transformers ]; description = "A cryptographic protocol for the Majority Judgment"; license = stdenv.lib.licenses.gpl3; @@ -115329,8 +115488,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.12.0.0"; - sha256 = "0d57q99p1ph70mmwanlyps7vfj6iph9wmx0nza2jlg6falr7wrbj"; + version = "0.12.2.1"; + sha256 = "1vx74i1cqjmrrjq0mrdxmar6v221lir1zzkl8bn7iza4czkdarg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115624,22 +115783,22 @@ self: { "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml + , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour + , process, refact, text, transformers, uniplate + , unordered-containers, vector, yaml }: mkDerivation { pname = "hlint"; - version = "2.1.17"; - sha256 = "0brinb3fjy619qh8yingqz2k03gcixc7mvqxzhzjadj69zlns6j3"; + version = "2.1.20"; + sha256 = "01dgz9lqkx6j06r9vclicjaiylk05pzcglnqmrvyy3yk9h93lhs1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml + data-default directory extra filepath ghc-lib-parser + haskell-src-exts haskell-src-exts-util hscolour process refact text + transformers uniplate unordered-containers vector yaml ]; executableHaskellDepends = [ base ]; description = "Source code suggestions"; @@ -116722,6 +116881,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.6"; + sha256 = "1m1www5i2wp49vb03zm0d0gaq0dlgdjafwjgp2zcc16gajpabami"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -117556,28 +117735,30 @@ self: { }) {}; "hoogle" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit - , conduit-extra, connection, containers, deepseq, directory, extra - , filepath, foundation, hashable, haskell-src-exts, http-conduit - , http-types, js-flot, js-jquery, mmap, network-uri, old-locale - , process-extras, QuickCheck, resourcet, storable-tuple, tar - , template-haskell, text, time, transformers, uniplate, utf8-string - , vector, wai, wai-logger, warp, warp-tls, zlib + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, cmdargs, conduit, conduit-extra, connection + , containers, deepseq, directory, extra, filepath, foundation + , hashable, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network-uri, old-locale, process-extras + , QuickCheck, resourcet, storable-tuple, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; - version = "5.0.17.7"; - sha256 = "1nk255n7lwar9l70pz3z48c4fsp3a07gqhpci37iya1mw6kdnbbp"; + version = "5.0.17.8"; + sha256 = "0cdxxrq3c5jpkb469y7s571q8lbw7a2adq535cx0nsjldwxvjvlb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cmdargs conduit conduit-extra - connection containers deepseq directory extra filepath foundation - hashable haskell-src-exts http-conduit http-types js-flot js-jquery - mmap network-uri old-locale process-extras QuickCheck resourcet - storable-tuple tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib + aeson base binary blaze-html blaze-markup bytestring cmdargs + conduit conduit-extra connection containers deepseq directory extra + filepath foundation hashable haskell-src-exts http-conduit + http-types js-flot js-jquery mmap network-uri old-locale + process-extras QuickCheck resourcet storable-tuple tar + template-haskell text time transformers uniplate utf8-string vector + wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; testTarget = "--test-option=--no-net"; @@ -117625,10 +117806,10 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.2.2"; - sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "4"; - editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; + version = "0.2.3"; + sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj"; + revision = "1"; + editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -121472,8 +121653,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.8"; - sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j"; + version = "0.10.0"; + sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121484,7 +121665,8 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; - description = "A command line program for extending the import list of a Haskell source file"; + doHaddock = false; + description = "Extend the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -121696,29 +121878,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; - version = "1.0.3"; - sha256 = "1g2llcffj4yah326lf9axffziz0bla443zddr0lhpz8nqrpbh4j1"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions fail mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions fail mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances , tasty, tasty-hunit, tasty-quickcheck, text @@ -121739,7 +121898,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -121751,6 +121909,8 @@ self: { pname = "hslua-aeson"; version = "1.0.0"; sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; + revision = "1"; + editedCabalFile = "1ysgh5s99zv0khkwqw1kcli2r2vi77r7wz3yc0y0i7qr35shzklh"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -124864,22 +125024,6 @@ self: { }) {}; "http-directory" = callPackage - ({ mkDerivation, base, bytestring, html-conduit, http-client - , http-date, http-types, text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; - version = "0.1.1"; - sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-date http-types text - time xml-conduit - ]; - description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-directory_0_1_2" = callPackage ({ mkDerivation, base, bytestring, html-conduit, http-client , http-client-tls, http-date, http-types, text, time, xml-conduit }: @@ -124893,7 +125037,6 @@ self: { ]; description = "http directory listing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-dispatch" = callPackage @@ -126474,17 +126617,6 @@ self: { }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.5"; - sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw"; - libraryHaskellDepends = [ base ]; - description = "Diagnostics library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-diagnostics_0_0_0_7" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; @@ -126493,7 +126625,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-dsv" = callPackage @@ -126507,6 +126638,8 @@ self: { pname = "hw-dsv"; version = "0.3.5"; sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2"; + revision = "1"; + editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126607,19 +126740,18 @@ self: { }) {}; "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit - , hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog }: mkDerivation { pname = "hw-fingertree"; - version = "0.1.0.1"; - sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + version = "0.1.0.3"; + sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 + base deepseq hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -126648,6 +126780,8 @@ self: { pname = "hw-hedgehog"; version = "0.1.0.3"; sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2"; + revision = "1"; + editedCabalFile = "1wvjv13pznqxzhix7ikjx2gpqc3ppn7z20yl7l6z80yslalh7pm2"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; @@ -126676,6 +126810,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.7"; sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv"; + revision = "1"; + editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -127021,6 +127157,8 @@ self: { pname = "hw-prim"; version = "0.6.2.23"; sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy"; + revision = "1"; + editedCabalFile = "0pwgw9fqrfmfk3fjcdc9xss1vc6fl53pdnp8xcawia4mskd38sv7"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -127916,6 +128054,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.2"; sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; + revision = "1"; + editedCabalFile = "16wpgh7cxgmap5acyccbff02b2jvhqiad5m3fknribpbahvmkk88"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -131912,8 +132052,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.39"; - sha256 = "0qfns2rwgkmd1i28p5pgvcp0yza8lrpi9xlq3zpl7jqrawbxbp3v"; + version = "0.1.40"; + sha256 = "09p5bjjqagbz1xkcfd5psmgxbg3z057kyv39j0i63g4q484zznz3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -133151,6 +133291,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_1_1_0_6" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-chans + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.1.0.6"; + sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-chans text time tls transformers x509 + x509-store x509-validation + ]; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -133180,14 +133341,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_3_0_2" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.3.0.2"; + sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + description = "Streaming IRC message library using conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "2.6.0"; - sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; + version = "2.7.0"; + sha256 = "1bsj4b8xwavc2z0amd2lmh4qn4gmxfmsicwdr1h3a2sqyx8qdv9m"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -133743,8 +133923,8 @@ self: { }: mkDerivation { pname = "itanium-abi"; - version = "0.1.1.0"; - sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8"; + version = "0.1.1.1"; + sha256 = "1dmr6sz4mf24781md81jjrwjsp431zyh7alkz71jlb224phc81nz"; libraryHaskellDepends = [ base boomerang text transformers unordered-containers ]; @@ -137178,36 +137358,6 @@ self: { }) {}; "kanji" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion - , deepseq, hashable, HUnit-approx, microlens, microlens-aeson - , optparse-applicative, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "kanji"; - version = "3.4.0"; - sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr"; - revision = "2"; - editedCabalFile = "1bcc3kh6kndmkqi3vaxp27mg1qb7xbg1h8pgjc1kk1iawnhl930j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers deepseq hashable text - ]; - executableHaskellDepends = [ - aeson aeson-pretty base containers microlens microlens-aeson - optparse-applicative text transformers - ]; - testHaskellDepends = [ - aeson base containers HUnit-approx tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ aeson base containers criterion text ]; - description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "kanji_3_4_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion , deepseq, hashable, HUnit-approx, microlens, microlens-aeson , optparse-applicative, tasty, tasty-hunit, text, transformers @@ -138859,26 +139009,27 @@ self: { "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive - , colonnade, containers, directory, Glob, here, http-client - , http-client-tls, http-types, hvega, logging-effect, lucid, mtl - , network, network-uri, pandoc, polysemy, prettyprinter, random - , random-fu, random-source, text, time + , colonnade, containers, diagrams-lib, diagrams-svg, directory + , Glob, here, http-client, http-client-tls, http-types, hvega + , logging-effect, lucid, mtl, network, network-uri, pandoc, plots + , polysemy, prettyprinter, random, random-fu, random-source + , svg-builder, text, time }: mkDerivation { pname = "knit-haskell"; - version = "0.2.0.0"; - sha256 = "0028g05plj8dsakb2c78ryl3lcbfaagg4n1hjfj6b92cxn1bg5hv"; + version = "0.3.0.0"; + sha256 = "1mhxixiz07zlyhrdw68d2ajax40s01ikh27g56hlp1ilwnp8zqcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html - bytestring case-insensitive colonnade containers directory Glob - http-client http-client-tls http-types hvega logging-effect lucid - mtl network network-uri pandoc polysemy prettyprinter random - random-fu random-source text time + bytestring case-insensitive colonnade containers diagrams-lib + diagrams-svg directory Glob http-client http-client-tls http-types + hvega logging-effect lucid mtl network network-uri pandoc polysemy + prettyprinter random random-fu random-source svg-builder text time ]; executableHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl polysemy + base blaze-html colonnade containers here hvega mtl plots polysemy random-fu text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; @@ -140521,8 +140672,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.1.1"; - sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic"; + version = "0.1.2"; + sha256 = "0v0y50n2ks8jp91y37az6q46ax6dqx1igmlkb4b7c76qngak88xi"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -142182,6 +142333,25 @@ self: { broken = true; }) {}; + "lazyboy" = callPackage + ({ mkDerivation, aeson, base, hspec, microstache, text + , transformers + }: + mkDerivation { + pname = "lazyboy"; + version = "0.2.0.1"; + sha256 = "1f5r0dpwf4x3zp9ii03pqw1j9iy0cyrrl6a9pfnmximzw753dhkp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + testHaskellDepends = [ + aeson base hspec microstache text transformers + ]; + description = "An EDSL for programming the Game Boy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazyio" = callPackage ({ mkDerivation, base, transformers, unsafe }: mkDerivation { @@ -142407,6 +142577,23 @@ self: { broken = true; }) {}; + "lean" = callPackage + ({ mkDerivation, base, base-unicode-symbols, text-utf8 + , transformers, util + }: + mkDerivation { + pname = "lean"; + version = "0.0.0.1"; + sha256 = "1i1xkaipjaczp32hn5g5g4x9a3ml98hamb4qaycy7rlcfbildiga"; + libraryHaskellDepends = [ + base base-unicode-symbols text-utf8 transformers util + ]; + description = "Bonds to Lean theorem prover"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "leancheck" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -143221,8 +143408,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.2.2.0"; - sha256 = "0xm3nvh5irw3nw4cn94xh8i6z63mgkiymgf99yh582rbf047dfms"; + version = "1.2.3.0"; + sha256 = "07q7s710mcsbf51cwx68ps616nlsddll5k4cq6sn81bdd2n72fbx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143576,8 +143763,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "1.0.5.0"; - sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r"; + version = "1.0.5.1"; + sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -144204,6 +144391,17 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "librdkafka" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "librdkafka"; + version = "0.0.0.0"; + sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "libretls" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls , monad-ste, primitive, transformers, vector @@ -144316,8 +144514,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.3"; - sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq"; + version = "1.4.4"; + sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -147395,8 +147593,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.1"; - sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; + version = "0.10.1.0"; + sha256 = "10a7p0z9bqjfmc04xvqsflwqrhhnxk72kbhk62sh8l1is0i94vcs"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -147416,10 +147614,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.0.2"; - sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; - revision = "1"; - editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; + version = "0.7.1.0"; + sha256 = "01xkkmdxlxn66a884ymzpxqqf0x8h2inagzvigg3d3iyn9sgrrh1"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -147617,6 +147813,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.4"; + sha256 = "10xgh61ghwri21j7jr6svkd24h2s9nmawc33xkzjc6d4nbg261jf"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -148201,6 +148421,23 @@ self: { broken = true; }) {}; + "looper" = callPackage + ({ mkDerivation, aeson, base, hspec, optparse-applicative, text + , time, unliftio + }: + mkDerivation { + pname = "looper"; + version = "0.0.0.2"; + sha256 = "0w4aancb0lbfgmk2drnbc1w6bxlbdkhg0zy1qj7xp3kvgc76vqli"; + libraryHaskellDepends = [ + aeson base optparse-applicative text time unliftio + ]; + testHaskellDepends = [ + aeson base hspec optparse-applicative text time unliftio + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "loops" = callPackage ({ mkDerivation, base, criterion, primitive, tasty , tasty-quickcheck, transformers, vector @@ -148620,6 +148857,8 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltiv1p1" = callPackage @@ -150780,8 +151019,8 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.0"; - sha256 = "03f5jkjsrn5a82g0cvjwm9dq1hn4c9m6a8hsyh035f92vflfk5vc"; + version = "0.1.0.1"; + sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151057,6 +151296,23 @@ self: { license = "GPL"; }) {}; + "markov-chain-usage-model" = callPackage + ({ mkDerivation, base, doctest, matrix, tasty, tasty-discover + , tasty-hunit, vector + }: + mkDerivation { + pname = "markov-chain-usage-model"; + version = "0.0.0"; + sha256 = "14r73bvh6w7qz7rqb97ky2iyf2z2j7y14iy4fcr8mjyxag3mk3jc"; + libraryHaskellDepends = [ base matrix vector ]; + testHaskellDepends = [ + base doctest matrix tasty tasty-discover tasty-hunit vector + ]; + testToolDepends = [ tasty-discover ]; + description = "Computations for Markov chain usage models"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "markov-processes" = callPackage ({ mkDerivation, assertions, base, bifunctors, memoize, MonadRandom , random @@ -153869,29 +154125,6 @@ self: { }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq - , hashable, microlens, scientific, tasty, tasty-hunit, text - , unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.3.0.1"; - sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs"; - revision = "1"; - editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable microlens - scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hashable microlens tasty tasty-hunit - text unordered-containers vector - ]; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - }) {}; - - "microlens-aeson_2_3_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , hashable, microlens, scientific, tasty, tasty-hunit, text , unordered-containers, vector @@ -153910,7 +154143,6 @@ self: { ]; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -154781,36 +155013,36 @@ self: { broken = true; }) {}; - "minio-hs_1_3_0" = callPackage + "minio-hs_1_3_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , case-insensitive, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, digest, directory, exceptions, filepath - , http-client, http-conduit, http-types, ini, memory, protolude - , QuickCheck, raw-strings-qq, resourcet, retry, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , xml-conduit + , case-insensitive, conduit, conduit-extra, connection, containers + , cryptonite, cryptonite-conduit, digest, directory, exceptions + , filepath, http-client, http-client-tls, http-conduit, http-types + , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet + , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , unordered-containers, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "1.3.0"; - sha256 = "1caia9dyxirxl7qy7ijhk1s4hp56m0f901ik34nbf5aizhl0qx94"; + version = "1.3.1"; + sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude raw-strings-qq resourcet retry text - time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + raw-strings-qq resourcet retry text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; testHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra containers cryptonite cryptonite-conduit - digest directory exceptions filepath http-client http-conduit - http-types ini memory protolude QuickCheck raw-strings-qq resourcet - retry tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary - text time transformers unliftio unliftio-core unordered-containers - xml-conduit + conduit conduit-extra connection containers cryptonite + cryptonite-conduit digest directory exceptions filepath http-client + http-client-tls http-conduit http-types ini memory protolude + QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit + tasty-quickcheck tasty-smallcheck temporary text time transformers + unliftio unliftio-core unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = stdenv.lib.licenses.asl20; @@ -158805,6 +159037,26 @@ self: { broken = true; }) {}; + "ms-tds" = callPackage + ({ mkDerivation, array, base, binary, bytestring + , data-default-class, mtl, network, text, time, tls, uuid-types + , x509-store, x509-system + }: + mkDerivation { + pname = "ms-tds"; + version = "0.1.0.0"; + sha256 = "05g5y0c105p1dqcd8mybqnrky495nb0320yrjgk7dr7lhfwsyb6s"; + libraryHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + testHaskellDepends = [ + array base binary bytestring data-default-class mtl network text + time tls uuid-types x509-store x509-system + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty @@ -158925,6 +159177,23 @@ self: { broken = true; }) {}; + "mssql-simple" = callPackage + ({ mkDerivation, base, binary, bytestring, ms-tds, network + , network-bsd, text, time, tls + }: + mkDerivation { + pname = "mssql-simple"; + version = "0.1.0.1"; + sha256 = "0vprjbr7w4273p15d74xjl0axxn0xsbxa3j2vbjx30jmizz8imqq"; + libraryHaskellDepends = [ + base binary bytestring ms-tds network network-bsd text time tls + ]; + testHaskellDepends = [ + base binary bytestring ms-tds network network-bsd text time tls + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mstate" = callPackage ({ mkDerivation, base, fail, monad-peel, mtl, stm }: mkDerivation { @@ -163378,6 +163647,8 @@ self: { pname = "network-info"; version = "0.2.0.10"; sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; + revision = "1"; + editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d"; libraryHaskellDepends = [ base ]; description = "Access the local computer's basic network configuration"; license = stdenv.lib.licenses.bsd3; @@ -163797,6 +164068,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-transport_0_5_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , transformers + }: + mkDerivation { + pname = "network-transport"; + version = "0.5.4"; + sha256 = "0izcqi3zl7ynav0qqrrfmiax8vziqwrhflprddhjj6x6nkzhp1sv"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable transformers + ]; + description = "Network abstraction layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-transport-amqp" = callPackage ({ mkDerivation, amqp, async, base, bytestring, cereal, containers , exceptions, lens-family, lens-family-th, network-transport @@ -164283,19 +164570,6 @@ self: { }) {}; "newtype" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "newtype"; - version = "0.2"; - sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; - revision = "1"; - editedCabalFile = "0rbhpa1krcmvv4hsy3h5h8l4vqjk9wckddcz34rfcq0m7zlmsrfz"; - libraryHaskellDepends = [ base ]; - description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype_0_2_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "newtype"; @@ -164304,7 +164578,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-deriving" = callPackage @@ -165422,6 +165695,29 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "nonempty-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, comonad, containers, data-or, deepseq + , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.2.0.0"; + sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw"; + libraryHaskellDepends = [ + base comonad containers data-or deepseq semigroupoids + ]; + testHaskellDepends = [ + base comonad containers data-or hedgehog hedgehog-fn semigroupoids + tasty tasty-hedgehog text + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nonemptymap" = callPackage @@ -165817,6 +166113,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nsis_0_3_3" = callPackage + ({ mkDerivation, base, directory, process, transformers, uniplate + }: + mkDerivation { + pname = "nsis"; + version = "0.3.3"; + sha256 = "12vp44g56x6lkagh9qm5rf0hfrn7kqk4jxsswlml60iji7r8x9mx"; + libraryHaskellDepends = [ base transformers uniplate ]; + testHaskellDepends = [ + base directory process transformers uniplate + ]; + description = "DSL for producing Windows Installer using NSIS"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nth-prime" = callPackage ({ mkDerivation, base, opentheory-prime, opentheory-primitive }: mkDerivation { @@ -169008,6 +169320,8 @@ self: { pname = "optional-args"; version = "1.0.2"; sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f"; + revision = "1"; + editedCabalFile = "0fda6mhm44qpbc9hfkf6jxnm3a7qszabywsmxa2iw0dz734a9xl3"; libraryHaskellDepends = [ base ]; description = "Optional function arguments"; license = stdenv.lib.licenses.bsd3; @@ -170829,7 +171143,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_1_0" = callPackage + "pandoc-pyplot_2_1_1_1" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations , open-browser, pandoc, pandoc-types, tasty, tasty-hspec @@ -170838,8 +171152,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.1.0"; - sha256 = "0s66m591v6x91qqdkyxl40zwlv6nan86zfq5z4cx73yz9xf3gjsx"; + version = "2.1.1.1"; + sha256 = "0m066z26z0w3jq96f4i8r45r1iwzy2wp8hzjq179z6jip4pjfh2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172170,17 +172484,6 @@ self: { }) {}; "parser-combinators" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "parser-combinators"; - version = "1.0.2"; - sha256 = "1wb6xbx3p9fyisza9d7svnby4makv2bkp0yh7lfi2bg3kybg41ry"; - libraryHaskellDepends = [ base ]; - description = "Lightweight package providing commonly useful parser combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parser-combinators_1_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; @@ -172189,7 +172492,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parser-combinators-tests" = callPackage @@ -172465,12 +172767,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "partial-semigroup_0_5_1_1" = callPackage + ({ mkDerivation, base, doctest, hedgehog }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.5.1.1"; + sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hedgehog ]; + description = "A partial binary associative operator"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "partial-semigroup-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.0"; - sha256 = "1qd9bg9qv0n80asfkrycvqwv92cdyy590871ypgkl82kx8x7qgbf"; + version = "0.6.0.1"; + sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = stdenv.lib.licenses.asl20; @@ -175148,38 +175463,23 @@ self: { }) {}; "persistent-test" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base - , base64-bytestring, blaze-builder, blaze-html, blaze-markup - , bytestring, cereal, conduit, containers, exceptions, fast-logger - , hashable, hspec, hspec-expectations, http-api-data, HUnit - , lifted-base, monad-logger, mtl, network, old-locale, path-pieces - , persistent, persistent-sqlite, persistent-template, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , scientific, semigroups, silently, system-fileio, system-filepath - , tagged, template-haskell, text, time, transformers - , transformers-base, unliftio, unliftio-core, unordered-containers - , vector + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.0.0.3"; - sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3"; - isLibrary = true; - isExecutable = true; + version = "2.0.3.0"; + sha256 = "1bspcv64qhcqiam964kxfxlc9afbns41dffh00k36dl2akr7p99a"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base64-bytestring blaze-builder - blaze-html blaze-markup bytestring cereal conduit containers - exceptions fast-logger hashable hspec hspec-expectations - http-api-data HUnit lifted-base monad-logger mtl network old-locale - path-pieces persistent persistent-sqlite persistent-template - QuickCheck quickcheck-instances random resource-pool resourcet - scientific semigroups silently tagged template-haskell text time - transformers transformers-base unliftio unliftio-core - unordered-containers vector - ]; - executableHaskellDepends = [ - base hspec persistent resourcet scientific system-fileio - system-filepath + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; @@ -175569,6 +175869,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pgp-wordlist_0_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "pgp-wordlist"; + version = "0.1.0.3"; + sha256 = "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg"; + libraryHaskellDepends = [ base bytestring containers text vector ]; + testHaskellDepends = [ + base bytestring deepseq doctest HUnit tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Translate between binary data and a human-readable collection of words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pgsql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, binary , blaze-builder, blaze-textual, bytestring, containers @@ -178351,10 +178669,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.0.2"; - sha256 = "0kdn2s686rfanqq4qfkbjfys53zzf2hgc2jx3m9zpfzjb3wabhg5"; - revision = "1"; - editedCabalFile = "1n3qzplpis1h90kw4x8fi4d8qhqy1xxxflv1d38516ikffwvai9x"; + version = "0.1.1.0"; + sha256 = "0hhmxwz18d2wdj2xnf9mn51ibym5dxc1gmji87cdccdf6a4wcxpa"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -178722,8 +179038,8 @@ self: { pname = "pointful"; version = "1.0.11.0"; sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; - revision = "1"; - editedCabalFile = "1a7fc03c586w011amjq770ifvf7ajbp9x3xp2w2yz1da9rkga2qv"; + revision = "2"; + editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181757,19 +182073,6 @@ self: { }) {}; "pretty-sop" = callPackage - ({ mkDerivation, base, generics-sop, pretty-show }: - mkDerivation { - pname = "pretty-sop"; - version = "0.2.0.2"; - sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; - revision = "2"; - editedCabalFile = "04hzf2ajlnh3ynk72xr5s396v8y0d8fkr4pf11nqss7yf60dkxwi"; - libraryHaskellDepends = [ base generics-sop pretty-show ]; - description = "A generic pretty-printer using generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-sop_0_2_0_3" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { pname = "pretty-sop"; @@ -181780,7 +182083,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-terminal" = callPackage @@ -182127,6 +182429,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_7_0_0" = callPackage + ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.0.0"; + sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck semigroups tagged tasty + tasty-quickcheck transformers transformers-compat + ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "primitive-addr" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-addr"; + version = "0.1.0.0"; + sha256 = "0nm6l9gy57l1hli7zjlh2mfdzhwi602dnicxis1d8ylqqyv633gw"; + libraryHaskellDepends = [ base primitive ]; + description = "Addresses to unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-atomic" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -182231,6 +182563,17 @@ self: { broken = true; }) {}; + "primitive-offset" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-offset"; + version = "0.1.0.0"; + sha256 = "0la56iw09x83ci5v82z8hpb0zdzdwi6awy5czszd78kj3n8ni3ax"; + libraryHaskellDepends = [ base primitive ]; + description = "Types for offsets into unboxed arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -182266,6 +182609,31 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "primitive-stablename" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-stablename"; + version = "0.1"; + sha256 = "1kdrzam5m2svxrpa7k3byg061i5xs0lc6q12hwgiq6l09savql6j"; + libraryHaskellDepends = [ base primitive ]; + description = "primitive operations on StableNames"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-unlifted" = callPackage + ({ mkDerivation, base, primitive, stm }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.0.0"; + sha256 = "014vkxfc2jas5qcsnlkxyczwsibm70vpb7zfzc5mhmfy60pib0vy"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = stdenv.lib.licenses.bsd3; }) {}; "primula-board" = callPackage @@ -186814,21 +187182,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_20" = callPackage + "quickcheck-instances_0_3_21" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, splitmix, tagged, text, time, transformers - , transformers-compat, unordered-containers, uuid-types, vector + , scientific, splitmix, tagged, text, time, time-compat + , transformers, transformers-compat, unordered-containers + , uuid-types, vector }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.20"; - sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + version = "0.3.21"; + sha256 = "0kk9i5lck40jbx1sxcvaq66hywgnfslcx2cgy7lacq4cnjmyzrh1"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time - transformers transformers-compat unordered-containers uuid-types - vector + time-compat transformers transformers-compat unordered-containers + uuid-types vector ]; testHaskellDepends = [ base containers QuickCheck tagged uuid-types @@ -190450,24 +190819,6 @@ self: { }) {}; "records-sop" = callPackage - ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec - , should-not-typecheck - }: - mkDerivation { - pname = "records-sop"; - version = "0.1.0.2"; - sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5"; - revision = "1"; - editedCabalFile = "082f4dmdvbnv6jq28mrva8clxif366vcbn9m8d1bb8lcf9h3qxjb"; - libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; - testHaskellDepends = [ - base deepseq generics-sop hspec should-not-typecheck - ]; - description = "Record subtyping and record utilities with generics-sop"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "records-sop_0_1_0_3" = callPackage ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec , should-not-typecheck }: @@ -190481,7 +190832,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -191909,21 +192259,6 @@ self: { }) {}; "regex-tdfa" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl - , parsec, regex-base - }: - mkDerivation { - pname = "regex-tdfa"; - version = "1.2.3.1"; - sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim mtl parsec regex-base - ]; - description = "Replaces/Enhances Text.Regex"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "regex-tdfa_1_2_3_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl , parsec, regex-base }: @@ -191936,7 +192271,6 @@ self: { ]; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-tdfa-pipes" = callPackage @@ -192283,35 +192617,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.3.6"; - sha256 = "19wch1vd41r3hvgr9a1yjvbiz7fmib1qlhviqivsdd5apncgn2jk"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize MonadRandom mtl multimap protolude - random resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_4_2" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph , MonadRandom, mtl, multimap, protolude, random, resourcet @@ -192320,8 +192625,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.4.2"; - sha256 = "0jfwxpf4w4laj0allbalkb0haircf0w33j0h2c2b5dzrhmmsg2gp"; + version = "0.1.4.0"; + sha256 = "0iqx0pa5dzf4nbjjdjignn7baf9vckppsz81c4a1m1zrlv1ipyig"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -192340,6 +192645,62 @@ self: { broken = true; }) {}; + "registry_0_1_5_1" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.5.1"; + sha256 = "1yvfrxhldbw6y8rawx5dddqrbgn8z8fsg5n745bx8wrag63s0vna"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "registry-hedgehog" = callPackage + ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph + , multimap, protolude, registry, tasty, tasty-discover + , tasty-hedgehog, tasty-th, template-haskell, text, transformers + , universum, unordered-containers + }: + mkDerivation { + pname = "registry-hedgehog"; + version = "0.2.0.0"; + sha256 = "19wjy4dmv3cycql0aharg6qxd7bkb87qkr206apfi0km58mb01d8"; + libraryHaskellDepends = [ + base containers hedgehog mmorph multimap protolude registry tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers universum unordered-containers + ]; + testHaskellDepends = [ + base containers generic-lens hedgehog mmorph multimap protolude + registry tasty tasty-discover tasty-hedgehog tasty-th + template-haskell text transformers universum unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "utilities to work with Hedgehog generators and `registry`"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -192545,10 +192906,12 @@ self: { }: mkDerivation { pname = "relation"; - version = "0.4"; - sha256 = "1jy5m0jih6ik05zagngrskk1ibiiblxsydxgdq6kjx1aa2pqnmqi"; + version = "0.5"; + sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb"; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testHaskellDepends = [ + base containers hedgehog hspec hw-hspec-hedgehog + ]; testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; @@ -192597,6 +192960,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_2_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.2.1"; + sha256 = "09ihkynff79kpgph6kwb0rr6q9crkppdhal4nz7gvb1nx3y8fw9s"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -192621,6 +193007,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query-HDBC_0_7_2_0" = callPackage + ({ mkDerivation, base, containers, convertible, dlist, HDBC + , HDBC-session, names-th, persistable-record, product-isomorphic + , QuickCheck, quickcheck-simple, relational-query + , relational-schemas, sql-words, template-haskell, th-data-compat + , transformers + }: + mkDerivation { + pname = "relational-query-HDBC"; + version = "0.7.2.0"; + sha256 = "0gzgjqh6pp4nf2zkc77xmm9sm02h2hya1bn339z1sa71nxs0ksc3"; + libraryHaskellDepends = [ + base containers convertible dlist HDBC HDBC-session names-th + persistable-record product-isomorphic relational-query + relational-schemas sql-words template-haskell th-data-compat + transformers + ]; + testHaskellDepends = [ + base convertible HDBC QuickCheck quickcheck-simple + ]; + description = "HDBC instance of relational-query and typed query interface for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record" = callPackage ({ mkDerivation, base, persistable-record , persistable-types-HDBC-pg, product-isomorphic, relational-query @@ -192640,13 +193051,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.1"; - sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; + version = "0.6.0.0"; + sha256 = "1f37pzz60zrg5z09vf6sdp9in5f78kyvxag6gbyanapi7iki14k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192654,8 +193065,13 @@ self: { relational-query relational-query-HDBC relational-schemas template-haskell ]; + executableHaskellDepends = [ + base product-isomorphic relational-query template-haskell time + ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-schemas" = callPackage @@ -192673,6 +193089,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_7_0" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.7.0"; + sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -193807,6 +194239,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rerebase_1_3_1_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.3.1.1"; + sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -200888,19 +201332,17 @@ self: { }) {}; "selective" = callPackage - ({ mkDerivation, base, checkers, containers, mtl, QuickCheck, tasty + ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: mkDerivation { pname = "selective"; - version = "0.1.0"; - sha256 = "1f30y2q5xph8jp2pfwkqdy59byad3q70kfp9jgcy2039i268fjfv"; - revision = "1"; - editedCabalFile = "1p6r23ahxpsq6rkb925ryd0cn09876z435q61wfz4r2rnb3s2wb2"; - libraryHaskellDepends = [ base containers mtl transformers ]; + version = "0.2"; + sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms"; + libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ - base checkers containers mtl QuickCheck tasty - tasty-expected-failure tasty-quickcheck + base containers mtl QuickCheck tasty tasty-expected-failure + tasty-quickcheck ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; @@ -201284,6 +201726,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semver_0_3_4" = callPackage + ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "semver"; + version = "0.3.4"; + sha256 = "0swffqyqraz2nxn64mwxp29zfdq7135q2j815yzwh2pk135xmns2"; + libraryHaskellDepends = [ attoparsec base deepseq hashable text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Representation, manipulation, and de/serialisation of Semantic Versions"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver-range" = callPackage ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck , text, unordered-containers @@ -205486,8 +205944,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.9"; - sha256 = "0kkglnw7cwj9xkxg7ffj09dnjyribgs1vrsyl2hmpl3xy4gs0sdk"; + version = "0.18"; + sha256 = "1manjf4834dh556j8x7zxndw94vz1xlmilqdqlhd2q8hcfdxlc3q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206248,6 +206706,8 @@ self: { pname = "shellmet"; version = "0.0.1"; sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk"; + revision = "1"; + editedCabalFile = "0v6j5fgmbbqizqx800adnkij1b1b8f7zkjmyfqvcpgljgg6xada5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -207369,6 +207829,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-enumeration" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "simple-enumeration"; + version = "0.1"; + sha256 = "08zqs36v8vm3iqz9pnj6df0f8c15j9gl0883xxbr27nma9mwqygx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Finite or countably infinite sequences of values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-eval" = callPackage ({ mkDerivation, base, parsec, text, transformers }: mkDerivation { @@ -208162,6 +208634,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simplistic-generics" = callPackage + ({ mkDerivation, base, comonad, kind-apply }: + mkDerivation { + pname = "simplistic-generics"; + version = "0.1.0.0"; + sha256 = "11z02m4dr9p2y29xwhy6a3l2cz2np164c8cwp0a0b9vkhphw4y1j"; + libraryHaskellDepends = [ base comonad kind-apply ]; + description = "Generic programming without too many type classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -210136,8 +210619,8 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.4"; - sha256 = "144l44s587hizsxkh38bqrabyjndwacipklsg30hiwk8cdhqa8f4"; + version = "0.1.0.5"; + sha256 = "04zn5d8qz17gm1c77xmas059hvl4ach8sayh81q676fkadiwk3x7"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; @@ -211602,6 +212085,8 @@ self: { pname = "soap-tls"; version = "0.1.1.4"; sha256 = "051shlb128lsacd2cjm4kpyqkmzdcwcj7ppl7l4n1k5j9g6k72yf"; + revision = "1"; + editedCabalFile = "11djy824gaw3cbsvphq263hxjrn1b3v5p1kdivsvlyn7q9bgvms9"; libraryHaskellDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation @@ -213691,6 +214176,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_3" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.3"; + sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -215864,17 +216362,16 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp , libuv, primitive, QuickCheck, quickcheck-instances, scientific - , stm, template-haskell, time, word8 + , stm, tagged, template-haskell, time, unordered-containers, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.1.0"; - sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; - revision = "1"; - editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; + version = "0.2.0.0"; + sha256 = "0j2ywcrzwx2q9fwa8slx7clzgrmfsnfz22ma08b77ii0yg0za271"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time word8 + integer-gmp primitive QuickCheck scientific stm tagged + template-haskell time unordered-containers ]; libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; @@ -216782,15 +217279,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_36_0" = callPackage + "stratosphere_0_37_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.36.0"; - sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k"; + version = "0.37.0"; + sha256 = "02m5cf4cxf32y3haqgx0nvwy64fmhbpmgk4g3i024mh1ab00k5fn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217020,27 +217517,6 @@ self: { }) {}; "streaming-attoparsec" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, streaming - , streaming-bytestring, tasty, tasty-hunit - }: - mkDerivation { - pname = "streaming-attoparsec"; - version = "1.0.0"; - sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z"; - revision = "2"; - editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx"; - libraryHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring - ]; - testHaskellDepends = [ - attoparsec base bytestring streaming streaming-bytestring tasty - tasty-hunit - ]; - description = "Attoparsec integration for the streaming ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-attoparsec_1_0_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, streaming , streaming-bytestring, tasty, tasty-hunit }: @@ -217057,7 +217533,6 @@ self: { ]; description = "Attoparsec integration for the streaming ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-base64" = callPackage @@ -217238,8 +217713,8 @@ self: { }: mkDerivation { pname = "streaming-concurrency"; - version = "0.3.1.2"; - sha256 = "0ra4svn595qx08rfg3qz2n30y6dsv2xj2kdl4s61xbhi4cmff819"; + version = "0.3.1.3"; + sha256 = "07fk9kdfh2983qawl78sy0ibqa8ngwna2slz3ckbm1fgc8sybzip"; libraryHaskellDepends = [ base exceptions lifted-async monad-control stm streaming streaming-with transformers-base @@ -219152,8 +219627,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "1"; - editedCabalFile = "0cw9vzvmmg13iyqh9g12c6yblv4ibxzcn61n4y7s59zmy4rqxg65"; + revision = "2"; + editedCabalFile = "0y3c59flsiz9w5a88ciy3jxzs1hvnlzyb3z5bz0199g0wrpwjxr6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219617,8 +220092,8 @@ self: { pname = "sv"; version = "1.3.1"; sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; - revision = "1"; - editedCabalFile = "19khsv0s2gk78fiwjkd3b1f2dkv78yhsl88rlb2jb2j48sjaqsgn"; + revision = "2"; + editedCabalFile = "1c0q010bpzdmjlncjn58fvz50l5z2wqp4hjpj0isvdr5iq96pgza"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -219695,8 +220170,8 @@ self: { pname = "sv-core"; version = "0.4.1"; sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; - revision = "1"; - editedCabalFile = "1zdg2v5sxz0x6q6sgz79s71kqj79g8vn9pyl8hvqkw43b3g6zs4i"; + revision = "2"; + editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -221482,6 +221957,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "systemd_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "1.2.0"; + sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -222793,15 +223283,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_2_1" = callPackage + "tasty_1_2_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.2.1"; - sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia"; + version = "1.2.2"; + sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -222976,10 +223466,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "0.2.0.0"; - sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; - revision = "6"; - editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43"; + version = "1.0.0.0"; + sha256 = "1sdgadqw0y6cdaa46i4z2jah03654iikjr04i92h06cpw1aw2mqm"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -223057,6 +223545,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-hunit_0_10_0_2" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.0.2"; + sha256 = "1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -223187,19 +223687,25 @@ self: { }) {}; "tasty-lua" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, hslua - , tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text }: mkDerivation { pname = "tasty-lua"; - version = "0.1.0"; - sha256 = "199zhrd48ixyi32spnm85v0dj6i09sl3rwi42kaxdlxkkmc54i1z"; + version = "0.1.1"; + sha256 = "0a6b02aq9wzbdkz8mkq8ii5pp65ijbj0ayr4ay5ipqn3jzimmr71"; + revision = "1"; + editedCabalFile = "1di6lpqjkrq3mcmaix7ar136kfmc54m4jma7byz6vc41gha388yr"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; - testHaskellDepends = [ base directory hslua tasty tasty-hunit ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -223234,6 +223740,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_10_1" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.10.1"; + sha256 = "0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-quickcheck-laws" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { @@ -227260,26 +227783,6 @@ self: { }) {}; "th-utilities" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; - version = "0.2.1.0"; - sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-utilities_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hspec, primitive, syb, template-haskell, text, th-orphans, vector }: @@ -227297,7 +227800,6 @@ self: { ]; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thank-you-stars" = callPackage @@ -228378,6 +228880,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_2_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.2.2"; + sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -230093,7 +230613,7 @@ self: { broken = true; }) {}; - "tomland_1_0_0" = callPackage + "tomland_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -230103,10 +230623,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.0.0"; - sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; - revision = "1"; - editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; + version = "1.0.1.0"; + sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230298,8 +230816,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.6.0"; - sha256 = "1nwjf5qmvshgcg2zf0mqav5kz19rj0a4vd7w6x1zbalysj9v5nb7"; + version = "0.1.6.1"; + sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231156,6 +231674,8 @@ self: { pname = "transformers-bifunctors"; version = "0.1"; sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w"; + revision = "1"; + editedCabalFile = "1vjyk2ldwfi2pkvk79p37ii5xgg1399kxqhkq3l4wvag4j5p4afs"; libraryHaskellDepends = [ base mmorph transformers ]; description = "Bifunctors over monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -231668,33 +232188,6 @@ self: { }) {}; "tree-diff" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; - version = "0.0.2"; - sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; - revision = "2"; - editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_0_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, containers, generics-sop, hashable , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged @@ -231717,7 +232210,6 @@ self: { ]; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -234330,6 +234822,8 @@ self: { pname = "typed-process"; version = "0.2.4.0"; sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; + revision = "1"; + editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -234601,6 +235095,8 @@ self: { pname = "typerep-map"; version = "0.3.2"; sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; + revision = "1"; + editedCabalFile = "1ka2ah7cg7hzd7yvnj6iasa57bszzif1b5r94sd8fk00l1qspjag"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; @@ -236538,6 +237034,8 @@ self: { pname = "unix-compat"; version = "0.5.1"; sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; + revision = "1"; + editedCabalFile = "0c4ak3y72nhv3nf025cyfi1dri2wjmsal3icjwj0aczmlb0imwrd"; libraryHaskellDepends = [ base unix ]; description = "Portable POSIX-compatibility layer"; license = stdenv.lib.licenses.bsd3; @@ -238839,6 +239337,8 @@ self: { pname = "validation"; version = "1.1"; sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"; + revision = "1"; + editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp"; libraryHaskellDepends = [ base bifunctors deepseq lens semigroupoids semigroups ]; @@ -239552,8 +240052,8 @@ self: { pname = "vector"; version = "0.12.0.3"; sha256 = "1a756s4w759ji3als5alfxwlckh5zcmykfg9rll4mlr2knzvz8mq"; - revision = "1"; - editedCabalFile = "0nkx1kwrvskp7xx1193d7b72fk7b678nlljzjqazhcbvi7qxpdxr"; + revision = "2"; + editedCabalFile = "1kjs6jnbxziv1q0md2jiqic0r19ry8xlg7wdr8b52rz7yjyb08hl"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans HUnit primitive QuickCheck random @@ -239572,8 +240072,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.1"; sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; - revision = "1"; - editedCabalFile = "18jm5zjzbphyzgc1hjqay04c6j4h7bq2bs8rzngnxk2q8gv658vz"; + revision = "2"; + editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -240948,17 +241448,6 @@ self: { }) {}; "void" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "void"; - version = "0.7.2"; - sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk"; - libraryHaskellDepends = [ base ]; - description = "A Haskell 98 logically uninhabited data type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "void_0_7_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "void"; @@ -240967,7 +241456,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A Haskell 98 logically uninhabited data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vorbiscomment" = callPackage @@ -244008,6 +244496,41 @@ self: { broken = true; }) {}; + "web3_0_8_3_2" = callPackage + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, microlens, microlens-aeson + , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random + , relapse, split, stm, tagged, template-haskell, text, time + , transformers, uuid-types, vinyl + }: + mkDerivation { + pname = "web3"; + version = "0.8.3.2"; + sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; + libraryHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec relapse tagged template-haskell text transformers uuid-types + vinyl + ]; + testHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop hspec hspec-contrib hspec-discover + hspec-expectations http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec random relapse split stm tagged template-haskell text time + transformers uuid-types vinyl + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum API for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -244669,22 +245192,6 @@ self: { }) {}; "websockets-snap" = callPackage - ({ mkDerivation, base, bytestring, bytestring-builder, io-streams - , mtl, snap-core, snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.10.3.0"; - sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk"; - libraryHaskellDepends = [ - base bytestring bytestring-builder io-streams mtl snap-core - snap-server websockets - ]; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets-snap_0_10_3_1" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets }: @@ -244698,7 +245205,6 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -251966,6 +252472,25 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yesod-markdown_0_12_6_2" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.2"; + sha256 = "0w9fmqk49b4c9g26dhrrmbwshrfcrnwcnsba97jyhb2m8bc4s1xj"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod @@ -254037,6 +254562,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zero_0_1_5" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "zero"; + version = "0.1.5"; + sha256 = "1yb00wcgcyckzlf8kdxsdxpqra0r1sakwdph7pv9naa6q8zhhllw"; + libraryHaskellDepends = [ base semigroups ]; + description = "Semigroups with absorption"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zerobin" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptonite, docopt, http-conduit, memory, raw-strings-qq From 2903cbf66b36aad41636dff287847454a07f8d22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 May 2019 17:20:34 +0000 Subject: [PATCH 285/637] haskell-tasty-hedgehog: current versions need hedgehog 1.x or later --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ba1e461feab..548f9750d7e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1236,8 +1236,9 @@ self: super: { pandoc = doDistribute super.pandoc_2_7_2; pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - # https://github.com/qfpl/tasty-hedgehog/issues/24 - tasty-hedgehog = dontCheck super.tasty-hedgehog; + # Current versions of tasty-hedgehog need hedgehog 1.x, which + # we don't have in LTS-13.x. + tasty-hedgehog = super.tasty-hedgehog.override { hedgehog = self.hedgehog_1_0; }; # The latest release version is ancient. You really need this tool from git. haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" From f9f3d6b210f0ca946ed202d3b7f89ec78988c130 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 May 2019 12:30:30 +0100 Subject: [PATCH 286/637] libsass: add patch for CVE-2018-19827 (PR #61673) vcunat switched to upstream commit that's reachable from master. --- pkgs/development/libraries/libsass/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 54108e1a007..ce43ed73432 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-19827.patch"; + url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; + sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; + }) + ]; + preConfigure = '' export LIBSASS_VERSION=${version} ''; From 7b09727d37fc96cf2fbacea1b9954cc119d4ec97 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 11 May 2019 17:03:59 +0200 Subject: [PATCH 287/637] cpcfs: init at 0.85.4 --- pkgs/tools/filesystems/cpcfs/default.nix | 41 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/filesystems/cpcfs/default.nix diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix new file mode 100644 index 00000000000..46635aa6741 --- /dev/null +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: + +stdenv.mkDerivation rec { + + pname = "cpcfs"; + version = "0.85.4"; + + src = fetchFromGitHub { + owner = "derikz"; + repo = "cpcfs"; + rev = "v${version}"; + sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-ltermcap' '-lncurses' \ + --replace '-L /usr/lib/termcap' ' ' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/man/man1 + cp cpcfs $out/bin + ronn --roff ../template.doc --pipe > $out/man/man1/cpcfs.1 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/derikz/cpcfs/" ; + license = licenses.bsd2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292f3596213..f0d8b3585fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2261,6 +2261,8 @@ in convoy = callPackage ../tools/filesystems/convoy { }; + cpcfs = callPackage ../tools/filesystems/cpcfs { }; + cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { }; From a8672602224e674248b828ab9b870c883587c14b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 14:26:48 -0500 Subject: [PATCH 288/637] whatstyle: init at 0.1.7 --- .../tools/misc/whatstyle/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/misc/whatstyle/default.nix diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix new file mode 100644 index 00000000000..0c6e4f568ff --- /dev/null +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -0,0 +1,30 @@ +{ stdenv, python3, fetchFromGitHub, clang-unwrapped }: + +python3.pkgs.buildPythonApplication rec { + pname = "whatstyle"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "mikr"; + repo = pname; + rev = "v${version}"; + sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm"; + }; + + # Fix references to previous version, to avoid confusion: + postPatch = '' + substituteInPlace setup.py --replace 0.1.6 ${version} + substituteInPlace ${pname}.py --replace 0.1.6 ${version} + ''; + + checkInputs = [ clang-unwrapped /* clang-format */ ]; + + doCheck = false; # 3 or 4 failures depending on version, haven't investigated. + + meta = with stdenv.lib; { + description = "Find a code format style that fits given source files"; + homepage = https://github.com/mikr/whatstyle; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d9f4b8ae60..8d2e49510b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9694,6 +9694,10 @@ in vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + whatstyle = callPackage ../development/tools/misc/whatstyle { + inherit (llvmPackages) clang-unwrapped; + }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; From 13b97cffaef8174bf4183d806ff97c57f855c6fe Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 23 Feb 2019 16:56:49 +0100 Subject: [PATCH 289/637] gitAndTools.transcrypt: add hidden dependencies --- .../version-management/git-and-tools/transcrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 35e9c17438f..8218ad6ffa8 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { name = "transcrypt-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ git makeWrapper openssl ]; + buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" ''; meta = with stdenv.lib; { From de5a9dea8812f0d57c31aaaf2b938a85876bd321 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 23 Feb 2019 19:31:53 +0100 Subject: [PATCH 290/637] gitAndTools.transcrypt: query dependencies in helper scripts adds a tool to get the paths of the dependencies needed by the helper scripts (which are written only once and are never updated) to the output and patches them to use it expand their path --- .../git-and-tools/transcrypt/default.nix | 8 ++++ .../helper-scripts_depspathprefix.patch | 37 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 8218ad6ffa8..cea588f76ca 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; + patches = [ ./helper-scripts_depspathprefix.patch ]; + installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1 @@ -21,6 +23,12 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/transcrypt \ --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" + + cat > $out/bin/transcrypt-depspathprefix << EOF + #!${stdenv.shell} + echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + EOF + chmod +x $out/bin/transcrypt-depspathprefix ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch new file mode 100644 index 00000000000..925aadab3dd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/helper-scripts_depspathprefix.patch @@ -0,0 +1,37 @@ +diff --git a/transcrypt b/transcrypt +index a0b562d..7888f5d 100755 +--- a/transcrypt ++++ b/transcrypt +@@ -278,6 +278,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/clean" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -300,6 +301,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/smudge" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + tempfile=$(mktemp 2> /dev/null || mktemp -t tmp) + trap 'rm -f "$tempfile"' EXIT + cipher=$(git config --get --local transcrypt.cipher) +@@ -309,6 +311,7 @@ save_helper_scripts() { + + cat <<-'EOF' > "${GIT_DIR}/crypt/textconv" + #!/usr/bin/env bash ++ PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" + filename=$1 + # ignore empty files + if [[ -s $filename ]]; then +@@ -351,7 +354,7 @@ save_configuration() { + git config merge.renormalize 'true' + + # add a git alias for listing encrypted files +- git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" ++ git config alias.ls-crypt "!PATH=\"\$(transcrypt-depspathprefix 2>/dev/null)\$PATH\"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = \":\" }; /crypt$/{ print \$1 }'" + } + + # display the current configuration settings From d5e745f4120db10f9d417d4addad649f8f113600 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 4 May 2019 23:43:49 +0200 Subject: [PATCH 291/637] pythonPackages.pyatmo: init at 1.10 --- .../python-modules/pyatmo/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyatmo/default.nix diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix new file mode 100644 index 00000000000..13f8efbb581 --- /dev/null +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyatmo"; + version = "1.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "13ca794416707b8cefcb7584bbfff65a4640fcc2510ad73e818fef94d424fca6"; + }; + + # Upstream provides no unit tests. + doCheck = false; + + meta = with lib; { + description = "Simple API to access Netatmo weather station data"; + license = licenses.mit; + homepage = https://github.com/jabesq/netatmo-api-python; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76ee8e1270e..54a8f7c6a4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3800,6 +3800,8 @@ in { pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; + pyatmo = callPackage ../development/python-modules/pyatmo { }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; pysam = callPackage ../development/python-modules/pysam { }; From fb455c62e05fd1db729f95faa1379e823b473c95 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 5 May 2019 01:28:25 +0200 Subject: [PATCH 292/637] pythonPackages.fitbit: init at 0.3.0 --- .../python-modules/fitbit/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/fitbit/default.nix diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix new file mode 100644 index 00000000000..93bf4716073 --- /dev/null +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, coverage +, dateutil +, freezegun +, mock +, requests-mock +, requests_oauthlib +, sphinx +}: + +buildPythonPackage rec { + pname = "fitbit"; + version = "0.3.0"; + + checkInputs = [ coverage freezegun mock requests-mock sphinx ]; + propagatedBuildInputs = [ dateutil requests_oauthlib ]; + + # The source package on PyPi is missing files required for unit testing. + # https://github.com/orcasgit/python-fitbit/issues/148 + src = fetchFromGitHub { + rev = version; + owner = "orcasgit"; + repo = "python-fitbit"; + sha256 = "0s1kp4qcxvxghqf9nb71843slm4r5lhl2rlvj3yvhbby3cqs4g84"; + }; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace 'Sphinx>=1.2,<1.4' 'Sphinx' \ + --replace 'coverage>=3.7,<4.0' 'coverage' + ''; + + meta = with lib; { + description = "Fitbit API Python Client Implementation"; + license = licenses.asl20; + homepage = https://github.com/orcasgit/python-fitbit; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76ee8e1270e..95c20666bf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2606,6 +2606,8 @@ in { fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; + fitbit = callPackage ../development/python-modules/fitbit { }; + flake8 = callPackage ../development/python-modules/flake8 { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; From 96e513df82579114bb95f899d7dae7b8eefb9219 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 18 May 2019 10:07:56 -0700 Subject: [PATCH 293/637] guile-lib: 0.2.2 -> 0.2.6.1 (#60978) * guile-lib: 0.2.2 -> 0.2.6.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/guile-lib/versions * guile-cairo: disable tests --- pkgs/development/guile-modules/guile-cairo/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 4bd49b06796..592e6ad8999 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index c3aa8400791..cea464ad5d2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -4,23 +4,18 @@ assert stdenv ? cc && stdenv.cc.isGNU; let name = "guile-lib-${version}"; - version = "0.2.2"; + version = "0.2.6.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b"; + sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile texinfo ]; - # One test doesn't seem to be compatible with guile_2_2. - patchPhase = '' - sed -i -e '/sxml.ssax.scm/d' unit-tests/Makefile* - ''; - doCheck = true; preCheck = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d2e49510b3..9f0669b26ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8623,9 +8623,7 @@ in inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; - guile-lib = callPackage ../development/guile-modules/guile-lib { - guile = guile_2_0; - }; + guile-lib = callPackage ../development/guile-modules/guile-lib { }; guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; From 8857abb3b687be2bbf5381d7cb65b2d01426be16 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 18 May 2019 18:04:12 +0300 Subject: [PATCH 294/637] android-file-transfer: 3.7 -> 3.8 --- .../android-file-transfer/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 6441ae5dbd1..bd3c2428132 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "android-file-transfer-${version}"; - version = "3.7"; + pname = "android-file-transfer"; + version = "3.8"; + src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; }; - buildInputs = [ cmake fuse readline pkgconfig qtbase ]; - buildPhase = '' - cmake . - make - ''; - installPhase = '' - make install - ''; + + nativeBuildInputs = [ cmake readline pkgconfig ]; + buildInputs = [ fuse qtbase ]; + meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; homepage = https://whoozle.github.io/android-file-transfer-linux/; From 53947f19c2459f1f3fb045d2017b899f55b7e701 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 May 2019 10:19:16 +0200 Subject: [PATCH 295/637] waybar: 0.6.1 -> 0.6.5 --- pkgs/applications/misc/waybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 776ba8f081e..cdd78866cdc 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1hzwqg22sjiirx6743512271p3jlakrw0155av1phrv5b7p3ws8a"; + sha256 = "1k3ynx5ssq7ji0nlx0n7zrgrshxv5abj8fa8c5lcyxr2wxffna9z"; }; nativeBuildInputs = [ From f73ffce2d4c01011bc5454b203718f8187c189aa Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 13:25:41 -0400 Subject: [PATCH 296/637] gtk-doc: add missing pygments Also drop six since it was removed in the last release[0] [0]: https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_29/NEWS#L4 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 9d617e67127..91bd12a90a2 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; - # Make six available for binaries, python.withPackages creates a wrapper + # Make pygments available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. postInstall = '' - ln -s ${python3.pkgs.six}/${python3.sitePackages}/* $out/share/gtk-doc/python/ + ln -s ${python3.pkgs.pygments}/${python3.sitePackages}/* $out/share/gtk-doc/python/ ''; doCheck = false; # requires a lot of stuff From 064ca0afe9c9983d6735cf10d28be6c430409cae Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 14:34:57 -0400 Subject: [PATCH 297/637] gtk-doc: build with meson --- .../tools/documentation/gtk-doc/default.nix | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 91bd12a90a2..ee2ca64ffeb 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3 +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, python3 +, libxml2Python +, docbook_xml_dtd_43 +, docbook_xsl +, libxslt +, gettext +, gnome3 , withDblatex ? false, dblatex }: @@ -7,9 +17,12 @@ stdenv.mkDerivation rec { pname = "gtk-doc"; version = "1.30"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; + sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; }; patches = [ @@ -18,13 +31,27 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome-doc-utils gettext which itstool - ] ++ stdenv.lib.optional withDblatex dblatex; + nativeBuildInputs = [ + gettext + meson + ninja + ]; - configureFlags = [ "--disable-scrollkeeper" ]; + buildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + libxslt + pkgconfig + python3 + libxml2Python + ] + ++ stdenv.lib.optional withDblatex dblatex + ; + + mesonFlags = [ + "-Dtests=false" + "-Dyelp_manual=false" + ]; # Make pygments available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. From 0e2768050a7fee157556679b31773b75a935d01d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 14:50:56 -0400 Subject: [PATCH 298/637] gtk-doc: fix css file permissions Fixes https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 which was breaking the documentation build for glib. The patch was based off an upstream pr [0] but completed with the requested changes. [0]: https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27 --- ...ghlight-fix-permission-on-file-style.patch | 24 +++++++++++++++++++ .../tools/documentation/gtk-doc/default.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch diff --git a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch new file mode 100644 index 00000000000..f7e37a1a5e5 --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch @@ -0,0 +1,24 @@ +From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Sat, 18 May 2019 14:44:08 -0400 +Subject: [PATCH] highlight: fix permission on file style + +--- + gtkdoc/highlight.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py +index 8f6e470..d11c432 100644 +--- a/gtkdoc/highlight.py ++++ b/gtkdoc/highlight.py +@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): + + + def append_style_defs(css_file_name): +- os.chmod(css_file_name, stat.S_IWRITE) ++ os.chmod(css_file_name, 0o664) + with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: + css.write(HTML_FORMATTER.get_style_defs()) +-- +2.21.0 + diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index ee2ca64ffeb..44b5384106e 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { patches = [ passthru.respect_xml_catalog_files_var_patch + # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 + ./0001-highlight-fix-permission-on-file-style.patch ]; outputDevdoc = "out"; From b0651d564c38e45ea227dd08ee28737d80e792e4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 15 May 2019 21:28:55 -0400 Subject: [PATCH 299/637] gnome3.gnome-panel: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-panel/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index db00758fb55..b1f0de9ba32 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -24,7 +24,7 @@ let pname = "gnome-panel"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -32,18 +32,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12q0l7wy6hzl46i7xpvv82ka3bn14z0jg6fhv5xhnk7j9mkbmgqw"; + sha256 = "0a9zi1jb0b42zd6wx3251cnns9v1w0cbwasmrx9hsj1dsb9pjq3a"; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/GNOME/gnome-panel/issues/8 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/77be9c3507bd1b5d70d97649b85ec9f47f6c359c.patch; - sha256 = "00b1ihnc6hp2g6x1v1njbc6mhsk44izl2wigviibmka2znfk03nv"; - }) - ]; - # make .desktop Exec absolute postPatch = '' patch -p0 < Date: Wed, 15 May 2019 21:29:47 -0400 Subject: [PATCH 300/637] gnome3.gnome-flashback: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-flashback/blob/3.32.0/NEWS --- .../gnome-3/misc/gnome-flashback/default.nix | 14 ++------------ pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 1 - 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index f9387c11b81..6d8f48f0d8e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -1,7 +1,6 @@ { stdenv , autoreconfHook , fetchurl -, fetchpatch , gettext , glib , gnome-bluetooth @@ -29,25 +28,16 @@ let pname = "gnome-flashback"; - version = "3.30.0"; + version = "3.32.0"; requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18rwql2pi78155l9zp1i50xfi5z8xz2l08m9d81x6qqbfr1nyy57"; + sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62"; }; - patches =[ - # overrides do not respect gsettingsschemasdir - # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/9 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/a55530f58ccd600414a5420b287868ab7d219705.patch; - sha256 = "1la94lhhb9zlw7bnbpl6hl26zv3kxbsvgx996mhph720wxg426mh"; - }) - ]; - # make .desktop Execs absolute postPatch = '' patch -p0 < Date: Sat, 18 May 2019 15:52:57 -0400 Subject: [PATCH 301/637] gnome3.mutter: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/mutter/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 2c305f002fd..a8bc4e77011 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q74lrb08vy0ynxbssqyxvbzf9252xgf9l6jxr9g4q0gmvpq402j"; + sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; }; mesonFlags = [ From 839b0767ebb23dcbe9eaf7e003e2cc47f5d58a11 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 15:54:13 -0400 Subject: [PATCH 302/637] gnome3.gnome-shell: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-shell/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 33095a0f1b9..d9001d9b1b9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pb00af3w4wivdhcvdy59z2xlxasg90bcm5a9ck0p5lf97adwx08"; + sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; LANG = "en_US.UTF-8"; From b055d80f11f17620a18cd281a83faf2bf37fd311 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:11:42 -0400 Subject: [PATCH 303/637] gnome3.accerciser: 3.32.1 -> 3.32.2 Just translations. https://gitlab.gnome.org/GNOME/accerciser/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index efff8f846b9..94ecc5f4a32 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "accerciser-${version}"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4"; + sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; }; nativeBuildInputs = [ From cd612b734c94499c1658896eeea99f81fb06d724 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:12:28 -0400 Subject: [PATCH 304/637] gnome3.polari: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/polari/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index cf056ca7841..73b8016d97b 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0z2dxj1hd798jn79y9a7lkb77lm8l7y5fsqh9g6lbr7pnmg559yk"; + sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; From 2be5edbbbba4969a06f07309cadc536b2043319a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 16:15:05 -0400 Subject: [PATCH 305/637] gnome3.seahorse: 3.32.1 -> 3.32.2 https://download.gnome.org/sources/seahorse/3.32/seahorse-3.32.2.news --- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index b3feb230d0f..a1bcb406eb3 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nh2gahiixj661a3l008yhidx952q50fqgdckg8l0d237wnwp7f6"; + sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x"; }; doCheck = true; From e2c58c19c459cdb506d09b1c25758400d36219be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 18 May 2019 22:18:01 +0200 Subject: [PATCH 306/637] tests: add mxisd to all-tests --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d495b2fa633..a1176709506 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -151,6 +151,7 @@ in mumble = handleTest ./mumble.nix {}; munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; + mxisd = handleTest ./mxisd.nix {}; mysql = handleTest ./mysql.nix {}; mysqlBackup = handleTest ./mysql-backup.nix {}; mysqlReplication = handleTest ./mysql-replication.nix {}; From 75a60db00e85589791cbc7db676415fe4beca05a Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Sat, 18 May 2019 21:36:26 +0100 Subject: [PATCH 307/637] broadcom_sta: fix build on linux-5.1 --- .../linux/broadcom-sta/default.nix | 1 + .../linux/broadcom-sta/linux-5.1.patch | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 541539522f8..93ac3fe5b74 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl ./linux-4.12.patch ./linux-4.15.patch + ./linux-5.1.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch new file mode 100644 index 00000000000..8f04a737cab --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.1.patch @@ -0,0 +1,32 @@ +commit bcb06af629a36eb84f9a35ac599ec7e51e2d39fb +Author: georgewhewell +Date: Sat May 18 21:22:37 2019 +0100 + + find src -type f -name \'*.c\' -exec sed -i "s/get_ds()/KERNEL_DS/g" {} \; + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 7b606e0..51c81bc 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + ifr.ifr_data = (caddr_t)&ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else +diff --git a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c +index c4c610b..9c3c74e 100644 +--- a/src/wl/sys/wl_iw.c ++++ b/src/wl/sys/wl_iw.c +@@ -117,7 +117,7 @@ dev_wlc_ioctl( + ifr.ifr_data = (caddr_t) &ioc; + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + #if defined(WL_USE_NETDEV_OPS) + ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else From 3616f908df97ace225b38c37b81b560da21c24eb Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 18 May 2019 22:53:48 +0200 Subject: [PATCH 308/637] libassuan: add erictapen as maintainer --- pkgs/development/libraries/libassuan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 50747090011..f5af5db0101 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; license = licenses.lgpl2Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } From 63fbbe0a32857e2e258ea6f8e52a40a36306a0da Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 16 May 2019 18:06:10 +0200 Subject: [PATCH 309/637] libassuan: use npth instead of pth --- pkgs/development/libraries/libassuan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f5af5db0101..d55c3816868 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: +{ fetchurl, stdenv, gettext, npth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # libassuan-config depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = [ pth gettext ]; + buildInputs = [ npth gettext ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" From f47e545578070c12d15a7c26d9515117c8a13c7e Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 18 May 2019 22:35:15 +0200 Subject: [PATCH 310/637] opensc: add erictapen as maintainer --- pkgs/tools/security/opensc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 5170805e3f6..7de88e799c3 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = [ maintainers.erictapen ]; }; } From 9310d09dae17c8e981945e6846360aa391a7be85 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 16 May 2019 22:54:49 +0200 Subject: [PATCH 311/637] opensc: fix cross compilation Apparently, the location of xsltproc needs to be manually speciefied when cross compiling. Also autoreconfHook needs to be in nativeBuildInputs. --- pkgs/tools/security/opensc/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7de88e799c3..f14a08c8174 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 -, Carbon, PCSC +, Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin }: @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - autoreconfHook zlib readline openssl libassuan + zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { else "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" + (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC From ec49cf3a4169798963b8542cd1512fe9ace2bd52 Mon Sep 17 00:00:00 2001 From: 0xflotus <0xflotus@gmail.com> Date: Sat, 18 May 2019 23:01:49 +0200 Subject: [PATCH 312/637] Update haskell.section.md (#61685) --- doc/languages-frameworks/haskell.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d832716c030..48d22831cd9 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -953,7 +953,7 @@ is essentially a "free software" license (BSD3), according to paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! To work around these problems GHC can be build with a slower but LGPL-free -alternative implemention for Integer called +alternative implementation for Integer called [integer-simple](http://hackage.haskell.org/package/integer-simple). To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use From ea222ae04ea37424f38ebe4e14fc5a0a4dfe00ef Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 17:19:31 -0400 Subject: [PATCH 313/637] gnome3.accerciser: use buildPythonPackage, add xlib This application will now actually work. --- .../gnome-3/apps/accerciser/default.nix | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 94ecc5f4a32..f7d22220e64 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection -, itstool, libxml2, python3Packages, at-spi2-core -, dbus, gettext, libwnck3 }: +{ stdenv +, fetchurl +, pkgconfig +, gnome3 +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, itstool +, libxml2 +, python3 +, at-spi2-core +, dbus +, gettext +, libwnck3 +, adwaita-icon-theme +}: -stdenv.mkDerivation rec { + python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; version = "3.32.2"; + format = "other"; + src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "05ssj8whzhf98lpcaca7m45h03g0wx0i8jlsrh3yn943mshzidy8"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook itstool gettext + gettext gobject-introspection # For setup hook - ]; - buildInputs = [ - gtk3 libxml2 python3Packages.python python3Packages.pyatspi - python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme + itstool + libxml2 + pkgconfig + dbus + wrapGAppsHook ]; - wrapPrefixVariables = [ "PYTHONPATH" ]; + buildInputs = [ + adwaita-icon-theme + at-spi2-core + gtk3 + libwnck3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ipython + pyatspi + pycairo + pygobject3 + xlib + ]; + + # Strict deps breaks accerciser + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; passthru = { updateScript = gnome3.updateScript { From cb3c214602e25826ed53edb1bc00876903a483fd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 05:23:31 -0500 Subject: [PATCH 314/637] lightdm: 1.28.0 -> 1.30.0 --- pkgs/applications/display-managers/lightdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 85687090721..61d65cb64b6 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lightdm"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "CanonicalLtd"; repo = pname; rev = version; - sha256 = "1mmqy1jdvgc0h0h9gli7n4vdv5p8m5019qjr5ni4h73iz6mjdj2b"; + sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx"; }; nativeBuildInputs = [ From 9c46f16eac1bdbeabe39f52cbf563151d8360ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 19 May 2019 00:19:36 +0200 Subject: [PATCH 315/637] android-file-transfer: fix hash of version 3.8 --- pkgs/tools/filesystems/android-file-transfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index bd3c2428132..015408351fd 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; + sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; From f14cf438b4187ac2c13f2ff268bb573b93c08177 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sat, 18 May 2019 16:48:34 -0600 Subject: [PATCH 316/637] nixos/modules: Ensure the colord user is a system user Ideally, it should have an assigned uid and gid --- nixos/modules/services/x11/colord.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix index 17568df091d..cf113ad2af8 100644 --- a/nixos/modules/services/x11/colord.nix +++ b/nixos/modules/services/x11/colord.nix @@ -29,6 +29,7 @@ in { environment.etc."tmpfiles.d/colord.conf".source = "${pkgs.colord}/lib/tmpfiles.d/colord.conf"; users.users.colord = { + isSystemUser = true; home = "/var/lib/colord"; group = "colord"; }; From 9bb25d5c766098cd96da374384046dd05e04e2a5 Mon Sep 17 00:00:00 2001 From: kjuvi Date: Sat, 18 May 2019 11:18:24 +0200 Subject: [PATCH 317/637] ephemeral: init at 5.1.0 --- .../networking/browsers/ephemeral/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/networking/browsers/ephemeral/default.nix diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix new file mode 100644 index 00000000000..05bfab883fe --- /dev/null +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, desktop-file-utils +, gettext +, glib +, gtk3 +, hicolor-icon-theme +, libgee +, libdazzle +, meson +, ninja +, pantheon +, pkgconfig +, python3 +, webkitgtk +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "ephemeral"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = "ephemeral"; + rev = version; + sha256 = "1wfrbbdw429q2mkycn87fhci0jidcsflk5f2lbzfzccbcs8msffz"; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + hicolor-icon-theme + libdazzle + libgee + pantheon.granite + webkitgtk + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "The always-incognito web browser"; + homepage = https://github.com/cassidyjames/ephemeral; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f0669b26ff..9ac9475e278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17546,6 +17546,8 @@ in inherit (gnome3) epiphany; + ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; + epic5 = callPackage ../applications/networking/irc/epic5 { }; eq10q = callPackage ../applications/audio/eq10q { }; From a303d9da3d68b1ce4b2954464dd7e28e48e1ff5d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 19:36:53 -0400 Subject: [PATCH 318/637] ephemeral: add glib-networking This is needed for the wrapper. --- pkgs/applications/networking/browsers/ephemeral/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 05bfab883fe..26b3c3ace8b 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -13,7 +13,9 @@ , pkgconfig , python3 , webkitgtk -, wrapGAppsHook }: +, wrapGAppsHook +, glib-networking +}: stdenv.mkDerivation rec { pname = "ephemeral"; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib + glib-networking gtk3 hicolor-icon-theme libdazzle From af1176230794cfb1e0f4422ee9e3ccf05adff17b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 May 2019 20:00:00 -0500 Subject: [PATCH 319/637] brakeman: 4.5.0 -> 4.5.1 --- pkgs/development/tools/analysis/brakeman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 90eeffd58da..78a4396698b 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "brakeman"; - version = "4.5.0"; - source.sha256 = "0c11i01yw87fssmwbybaqf5rdxsjp44hvxdw54c3iqb8fvj76b68"; + version = "4.5.1"; + source.sha256 = "0vqnhlswvrg5fpxszfkjmla85gdlvgspz0whlli730ydx648mi68"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; From ac4bce925e7ff10b3ec06e060a4c47dd771f1bc2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 17 May 2019 14:25:19 -0700 Subject: [PATCH 320/637] pythonPackages.astroid: 2.1.0 -> 2.2.5 --- pkgs/development/python-modules/astroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 4cef66a5c2e..591726ea1ac 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,19 +5,19 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.1.0"; + version = "2.2.5"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m"; + sha256 = "1x5c8fiqa18frwwfdsw41lpqsyff3w4lxvjx9d5ccs4zfkhy2q35"; }; # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy six wrapt ] ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.7" && !isPyPy) typed-ast; + ++ lib.optional (!isPyPy) typed-ast; checkInputs = [ pytestrunner pytest ]; From 519196e7556a70a2f23ef676c522541657d389bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 17 May 2019 14:26:49 -0700 Subject: [PATCH 321/637] pythonPackages.pylint: 2.2.3 -> 2.3.1 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6cfb6367307..8f1f4378a39 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.2.3"; + version = "2.3.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "13109caab4972cb6d7395e94ad7189e93e9454f09ededaa6b6784cc5456d41f1"; + sha256 = "1wgzq0da87m7708hrc9h4bc5m4z2p7379i4xyydszasmjns3sgkj"; }; nativeBuildInputs = [ pytestrunner ]; From 8102e2ce3bc60e9addd8ad5a2ea33211e30f60c5 Mon Sep 17 00:00:00 2001 From: Mark Gardner Date: Tue, 14 May 2019 10:13:14 -0400 Subject: [PATCH 322/637] pytricia: init at version 2019-01-16 --- .../python-modules/pytricia/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pytricia/default.nix diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix new file mode 100644 index 00000000000..2f95d7fcecb --- /dev/null +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pytricia"; + version = "unstable-2019-01-16"; + + src = fetchFromGitHub { + owner = "jsommers"; + repo = pname; + rev = "4ba88f68c3125f789ca8cd1cfae156e1464bde87"; + sha256 = "0qp5774xkm700g35k5c76pck8pdzqlyzbaqgrz76a1yh67s2ri8h"; + }; + + meta = with stdenv.lib; { + description = "A library for fast IP address lookup in Python"; + homepage = https://github.com/jsommers/pytricia; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ mkg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ebd75b5c1..a9771119340 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -838,6 +838,8 @@ in { pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + pytricia = callPackage ../development/python-modules/pytricia { }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); From 5f7c701eff432048f0ff09f198e2a525dc3d3847 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 May 2019 21:36:32 -0400 Subject: [PATCH 323/637] spice-gtk: 0.35 -> 0.37 Meson! Pulseaudio backend has been deprecated upstream so it has been disabled. Celt has also been disabled because there's opus. Other than that optional features have been enabled. https://gitlab.freedesktop.org/spice/spice-gtk/blob/v0.36/NEWS https://gitlab.freedesktop.org/spice/spice-gtk/blob/v0.37/NEWS --- .../libraries/spice-gtk/default.nix | 109 +++++++++++++----- 1 file changed, 80 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index bc583f732db..0169a42ed65 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,8 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 -, openssl, libpulseaudio, pixman, gobject-introspection, libjpeg_turbo, zlib -, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup -, withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: +{ stdenv +, fetchurl +, pkgconfig +, fetchpatch +, meson +, ninja +, python3 +, spice-protocol +, gettext +, openssl +, libpulseaudio +, pixman +, gobject-introspection +, libjpeg_turbo +, zlib +, cyrus_sasl +, usbredir +, libsoup +, polkit +, acl +, usbutils +, vala +, gtk3 +, epoxy +, libdrm +, gst_all_1 +, phodav +, libopus +, gtk-doc +, json-glib +, lz4 +, libcacard +, perl +, docbook_xsl +, withPolkit ? true +}: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -25,18 +56,15 @@ # KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" # ''; -with stdenv.lib; +stdenv.mkDerivation rec { + pname = "spice-gtk"; + version = "0.37"; -let - inherit (python2Packages) python pygtk; -in stdenv.mkDerivation rec { - name = "spice-gtk-0.35"; - - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; + url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.bz2"; + sha256 = "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"; }; postPatch = '' @@ -45,27 +73,50 @@ in stdenv.mkDerivation rec { --replace 'ACL_HELPER_PATH"/' '"' ''; - buildInputs = [ - spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile - ] ++ optionals withPolkit [ polkit acl usbutils ] ; + nativeBuildInputs = [ + docbook_xsl + gettext + gobject-introspection + gtk-doc + libsoup + meson + ninja + perl + pkgconfig + python3 + python3.pkgs.pyparsing + python3.pkgs.six + vala + ]; - nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobject-introspection ]; + buildInputs = [ + cyrus_sasl + epoxy + gst_all_1.gst-plugins-base + gtk3 + json-glib + libcacard + libdrm + libjpeg_turbo + lz4 + openssl + libopus + phodav + pixman + spice-protocol + usbredir + zlib + ] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - configureFlags = [ - "--with-gtk3" - "--enable-introspection" - "--enable-vala" - "--enable-celt051" + mesonFlags = [ + "-Dauto_features=enabled" + "-Dcelt051=disabled" + "-Dpulse=disabled" # is deprecated upstream ]; - dontDisableStatic = true; # Needed by the coroutine test - - enableParallelBuilding = true; - - meta = { + meta = with stdenv.lib; { description = "A GTK+3 SPICE widget"; longDescription = '' spice-gtk is a GTK+3 SPICE widget. It features glib-based From aba04ea5f32ead4e5a5fef07696fcb1ff3b802da Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 May 2019 21:39:45 -0400 Subject: [PATCH 324/637] spice-protocol: 0.12.15 -> 0.14.0 https://gitlab.freedesktop.org/spice/spice-protocol/blob/v0.14.0/CHANGELOG.md --- pkgs/development/libraries/spice-protocol/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 18ec02b4acf..c32f336939c 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.15"; + pname = "spice-protocol"; + version = "0.14.0"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb"; + url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; + sha256 = "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n"; }; postInstall = '' From e3da5d4c8eedbb22582211a856560fe6badb8911 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 22:45:22 -0400 Subject: [PATCH 325/637] spice: 0.14.0 -> 0.14.2, meson --- .../libraries/spice/correct-meson.patch | 26 ++++++ pkgs/development/libraries/spice/default.nix | 89 +++++++++++++++---- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 97 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/libraries/spice/correct-meson.patch diff --git a/pkgs/development/libraries/spice/correct-meson.patch b/pkgs/development/libraries/spice/correct-meson.patch new file mode 100644 index 00000000000..d3422cb915b --- /dev/null +++ b/pkgs/development/libraries/spice/correct-meson.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 8b8ae8bb..e58c436c 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ + # project definition + # + project('spice', 'c', +- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), ++ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(), + license : 'LGPLv2.1', + meson_version : '>= 0.48') + +diff --git a/server/meson.build b/server/meson.build +index 34d8eef1..988ccab2 100644 +--- a/server/meson.build ++++ b/server/meson.build +@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.') + major = '@0@'.format(version_info[0]) + minor = '@0@'.format(version_info[1]) + micro = version_info[2].to_int() +-if not version_info[3].contains('git') ++if not version_info.contains('git') + micro += 1 + endif + micro = '@0@'.format(micro) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index dadbe57dccd..3e785f55dad 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,38 +1,89 @@ -{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib -, openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl -, libcacard, lz4 }: - -with stdenv.lib; +{ stdenv +, substituteAll +, fetchurl +, meson +, ninja +, pkgconfig +, pixman +, celt_0_5_1 +, alsaLib +, openssl +, libXrandr +, libXfixes +, libXext +, libXrender +, libXinerama +, libjpeg +, zlib +, spice-protocol +, python3 +, glib +, cyrus_sasl +, libcacard +, lz4 +}: stdenv.mkDerivation rec { - name = "spice-0.14.0"; + pname = "spice"; + version = "0.14.2"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; + url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; + sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"; }; - buildInputs = [ pixman celt alsaLib openssl libjpeg zlib - libXrandr libXfixes libXrender libXext libXinerama - python pyparsing glib cyrus_sasl libcacard lz4 ]; + patches = [ + # submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4 + ./correct-meson.patch + ]; - nativeBuildInputs = [ pkgconfig spice-protocol ]; + postPatch = '' + patchShebangs build-aux + ''; + + + nativeBuildInputs = [ + meson + ninja + pkgconfig + spice-protocol + python3 + python3.pkgs.six + python3.pkgs.pyparsing + ]; + + buildInputs = [ + alsaLib + celt_0_5_1 + cyrus_sasl + glib + libXext + libXfixes + libXinerama + libXrandr + libXrender + libcacard + libjpeg + lz4 + openssl + pixman + python3.pkgs.pyparsing + zlib + ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - configureFlags = [ - "--with-sasl" - "--enable-smartcard" - "--enable-client" - "--enable-lz4" + mesonFlags = [ + "-Dauto_features=enabled" + "-Dopus=disabled" + "-Dgstreamer=no" ]; postInstall = '' ln -s spice-server $out/include/spice ''; - meta = { + meta = with stdenv.lib; { description = "Complete open source solution for interaction with virtualized desktop devices"; longDescription = '' The Spice project aims to provide a complete open source solution for interaction diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904fc2a01a7..ec99adfa952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13002,10 +13002,7 @@ in sphinxsearch = callPackage ../servers/search/sphinxsearch { }; - spice = callPackage ../development/libraries/spice { - celt = celt_0_5_1; - inherit (pythonPackages) pyparsing; - }; + spice = callPackage ../development/libraries/spice { }; spice-gtk = callPackage ../development/libraries/spice-gtk { }; From edcda4bf5d7d98240c2c246906fceb5cefff755d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 May 2019 22:57:10 -0400 Subject: [PATCH 326/637] spice: cleanup features * disabled celt for opus * enabled gstreamer support --- pkgs/development/libraries/spice/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 3e785f55dad..902bc6a5560 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -5,7 +5,6 @@ , ninja , pkgconfig , pixman -, celt_0_5_1 , alsaLib , openssl , libXrandr @@ -21,6 +20,9 @@ , cyrus_sasl , libcacard , lz4 +, libopus +, gst_all_1 +, orc }: stdenv.mkDerivation rec { @@ -54,9 +56,9 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib - celt_0_5_1 cyrus_sasl glib + gst_all_1.gst-plugins-base libXext libXfixes libXinerama @@ -64,8 +66,10 @@ stdenv.mkDerivation rec { libXrender libcacard libjpeg + libopus lz4 openssl + orc pixman python3.pkgs.pyparsing zlib @@ -75,8 +79,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dauto_features=enabled" - "-Dopus=disabled" - "-Dgstreamer=no" + "-Dgstreamer=1.0" + "-Dcelt051=disabled" ]; postInstall = '' From 0bedafd57c2a3a6eed875f2120e7d463b782aff6 Mon Sep 17 00:00:00 2001 From: ryan4729 <40183301+ryan4729@users.noreply.github.com> Date: Sun, 19 May 2019 00:41:15 -0700 Subject: [PATCH 327/637] libsForQt5.quazip: fix darwin build (#61355) * libsForQt5.quazip: fix darwin build * libsForQt5.quazip: update license --- pkgs/development/libraries/quazip/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index b53335f45c3..addf9a1dbd6 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake }: +{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + qmakeFlags = [ "quazip" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; - meta = { + meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.lgpl21Plus; homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ - platforms = stdenv.lib.platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From c978bb04ddd78e140a7a39dc81e3ea0f44331d3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 03:23:03 -0500 Subject: [PATCH 328/637] kdiff3: 1.8 -> 1.8.1 (hotfix) https://cgit.kde.org/kdiff3.git/log/?h=1.8.1 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index ea50e69fa53..aa53aeb4206 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8"; + version = "1.8.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54"; + sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; From 915c2de37091518daa06f1f9248c8239715ccab9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 03:49:56 -0500 Subject: [PATCH 329/637] rustc: 1.34.0 -> 1.34.2, security https://blog.rust-lang.org/2019/05/14/Rust-1.34.2.html --- pkgs/development/compilers/rust/rustc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 9b980043100..59264ca6efa 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,11 +17,11 @@ let llvmShared = llvm_7.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; - version = "1.34.0"; + version = "1.34.2"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s"; + sha256 = "0mig0prkmlnpbba1cmi17vlsl88ikv5pi26zjy2kcr64l62lm6n6"; }; __darwinAllowLocalNetworking = true; From b62a4c0d7029cd3067eb9b18e2e90a2e68625282 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:10:51 +0200 Subject: [PATCH 330/637] pythonPackages.intelhex: 2.1 -> 2.2.1 --- pkgs/development/python-modules/intelhex/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 82b5880f465..6ed21597aff 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , fetchurl }: buildPythonPackage rec { pname = "intelhex"; - version = "2.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0k5l1mn3gv1vb0jd24ygxksx8xqr57y1ivgyj37jsrwpzrp167kw"; + sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; }; patches = [ - (fetchurl { - url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch; - sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9"; + # patch the tests to check for the correct version string (2.2.1) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; + sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; }) ]; From fbfc8b173243542999224fcec9d579d37db90ec2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:11:18 +0200 Subject: [PATCH 331/637] pythonPackages.pyspinel: init at 1.0.0a3 --- .../python-modules/pyspinel/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pyspinel/default.nix diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix new file mode 100644 index 00000000000..990e2b28bd8 --- /dev/null +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, future, pyserial, ipaddress }: + +buildPythonPackage rec { + pname = "pyspinel"; + version = "1.0.0a3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0914a662d57a14bce9df21f22711b5c9b2fef37cf461be54ed35c6e229060fd4"; + }; + + propagatedBuildInputs = [ pyserial ipaddress future ]; + + doCheck = false; + + meta = { + description = "Interface to the OpenThread Network Co-Processor (NCP)"; + homepage = "https://github.com/openthread/pyspinel"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc281887d8b..ec988ca4000 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -780,6 +780,8 @@ in { slurm = pkgs.slurm; }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; + pyssim = callPackage ../development/python-modules/pyssim { }; pystache = callPackage ../development/python-modules/pystache { }; From 4ca821fbce3aa0938779d043c8e0b5d8dc32e80e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:11:41 +0200 Subject: [PATCH 332/637] pythonPackages.piccata: init at 1.0.1 --- .../python-modules/piccata/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/piccata/default.nix diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix new file mode 100644 index 00000000000..bd00b2f6d55 --- /dev/null +++ b/pkgs/development/python-modules/piccata/default.nix @@ -0,0 +1,19 @@ +{ buildPythonPackage, fetchPypi, lib, ipaddress }: + +buildPythonPackage rec { + pname = "piccata"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + }; + + propagatedBuildInputs = [ ipaddress ]; + + meta = { + description = "Simple CoAP (RFC7252) toolkit"; + homepage = "https://github.com/NordicSemiconductor/piccata"; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec988ca4000..08bbd4b52c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -605,6 +605,8 @@ in { phonopy = callPackage ../development/python-modules/phonopy { }; + piccata = callPackage ../development/python-modules/piccata {}; + pims = callPackage ../development/python-modules/pims { }; plantuml = callPackage ../tools/misc/plantuml { }; From ef22dd015dd537717f1f28e793fc98a19009329c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:12:09 +0200 Subject: [PATCH 333/637] pythonPackages.pc-ble-driver-py: init at 0.11.4 --- .../pc-ble-driver-py/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pc-ble-driver-py/default.nix diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix new file mode 100644 index 00000000000..d21d9d07150 --- /dev/null +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -0,0 +1,51 @@ +{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, + python, cmake, git, swig, boost, udev, + setuptools, enum34, wrapt, future }: + +buildPythonPackage rec { + pname = "pc-ble-driver-py"; + version = "0.11.4"; + disabled = python.isPy3k; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-ble-driver-py"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + }; + + nativeBuildInputs = [ cmake swig git setuptools ]; + buildInputs = [ boost udev ]; + propagatedBuildInputs = [ enum34 wrapt future ]; + + patches = [ + # build system expects case-insensitive file system + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch"; + sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy"; + }) + ]; + + postPatch = '' + # do not force static linking of boost + sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake + + cd python + ''; + + preBuild = '' + pushd ../build + cmake .. + make -j $NIX_BUILD_CORES + popd + ''; + + meta = with stdenv.lib; { + description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; + homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08bbd4b52c1..91b191341d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -593,6 +593,8 @@ in { pathlib = callPackage ../development/python-modules/pathlib { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pdf2image = callPackage ../development/python-modules/pdf2image { }; pdfminer = callPackage ../development/python-modules/pdfminer_six { }; From 131d9e53a2e49b02f4996edde25936b6d8cc270a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 19 May 2019 12:12:32 +0200 Subject: [PATCH 334/637] nrfutil: init at 5.2.0 --- .../tools/misc/nrfutil/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/misc/nrfutil/default.nix diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix new file mode 100644 index 00000000000..0a6155e649e --- /dev/null +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -0,0 +1,33 @@ +{ stdenv, python2Packages, fetchFromGitHub }: + +with python2Packages; buildPythonApplication rec { + pname = "nrfutil"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "pc-nrfutil"; + rev = "v${version}"; + sha256 = "1hajjgz8r4fjbwqr22p5dvb6k83dpxf8k7mhx20gkbrrx9ivqh79"; + }; + + propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa + protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ]; + + checkInputs = [ nose behave ]; + + postPatch = '' + # remove version bound on pyyaml + sed -i /pyyaml/d requirements.txt + + mkdir test-reports + ''; + + meta = with stdenv.lib; { + description = "Device Firmware Update tool for nRF chips"; + homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac9475e278..26cd39388bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9397,6 +9397,8 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nrfutil = callPackage ../development/tools/misc/nrfutil { }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { }; From c2bde0102b1d0146eefa47b6b3bf5c903786f02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 16 Nov 2018 15:10:53 +0100 Subject: [PATCH 335/637] pgloader: re-init at 3.6.1 --- pkgs/development/tools/pgloader/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/pgloader/default.nix diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix new file mode 100644 index 00000000000..47b426604da --- /dev/null +++ b/pkgs/development/tools/pgloader/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: +stdenv.mkDerivation rec { + pname = "pgloader"; + version = "3.6.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; + sha256 = "1sm8xmq30d1biin5br0y3vrv4fydbrzfqglz1hnvrkdyxrg7d6f9"; + }; + + nativeBuildInputs = [ git makeWrapper ]; + buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; + + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; + + buildPhase = '' + export PATH=$PATH:$out/bin + export HOME=$TMPDIR + + make pgloader + ''; + + dontStrip = true; + enableParallelBuilding = false; + + installPhase = '' + install -Dm755 bin/pgloader "$out/bin/pgloader" + wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" + ''; + + meta = with stdenv.lib; { + homepage = https://pgloader.io/; + description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.postgresql; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0e1c87c7c..eeccab50b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3435,6 +3435,8 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; + pgloader = callPackage ../development/tools/pgloader { }; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; From 5db7dbf8073ba3864ddcebeaf8a573d5daf003f4 Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Sun, 19 May 2019 12:55:48 +0200 Subject: [PATCH 336/637] plasma-applet-volumewin7mixer: v23 -> v24 --- .../misc/plasma-applet-volumewin7mixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 6c23d160f47..b44169adea8 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plasma-applet-volumewin7mixer-${version}"; - version = "23"; + version = "24"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc"; + sha256 = "1pms71229y7fv3zs38a0l9mdcg5qkcdv9yrcvdm6xqpdyk21jbz2"; }; patches = [ ./cmake.patch ]; From 65d289c8e27b06d63106d8552e4ae4363d8b5292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 19 May 2019 08:52:12 -0300 Subject: [PATCH 337/637] zuki-themes: 3.32-1 -> 3.32-3 --- pkgs/data/themes/zuki/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 2e74e2819e3..69399bdb0eb 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.32-1"; + version = "3.32-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0x6ghc7n5y7p0agm2yp7rygz9154f58s891zxzhd07wc2c4mzp0s"; + sha256 = "1al1fb7pqrcdi4g6llz8ka4sc9hsprv2ba0kkc21r6vajs0qp83n"; }; - buildInputs = [ gdk_pixbuf librsvg ]; + nativeBuildInputs = [ meson ninja sassc ]; + + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - installPhase = '' - install -dm 755 $out/share/themes - cp -a Zuki* $out/share/themes/ - ''; - meta = with stdenv.lib; { description = "Themes for GTK3, gnome-shell and more"; homepage = https://github.com/lassekongo83/zuki-themes; From 1f44657241b0d8df2a4c4c677d5573b673e8ee2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 19 May 2019 09:36:08 -0300 Subject: [PATCH 338/637] stilo-themes: init at 3.32-3 --- pkgs/data/themes/stilo/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/themes/stilo/default.nix diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix new file mode 100644 index 00000000000..48f29ad3111 --- /dev/null +++ b/pkgs/data/themes/stilo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "stilo-themes"; + version = "3.32-3"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcndr5mfa91f0ln0az3m79pidjy882v65w5fi5w05kykrmvv81z"; + }; + + nativeBuildInputs = [ meson ninja sassc ]; + + buildInputs = [ gdk_pixbuf librsvg gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + meta = with stdenv.lib; { + description = "Minimalistic GTK themes"; + homepage = https://github.com/lassekongo83/stilo-themes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea68589358..380789a96bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16515,6 +16515,8 @@ in spleen = callPackage ../data/fonts/spleen { }; + stilo-themes = callPackage ../data/themes/stilo { }; + sudo-font = callPackage ../data/fonts/sudo { }; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; From 8f60b7c905c2d19e7edfc1f78491c9ea1aad0d9d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Mon, 12 Jun 2017 14:23:39 -0400 Subject: [PATCH 339/637] lifelines: init at 2018-10-13-unstable --- pkgs/applications/misc/lifelines/default.nix | 29 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/lifelines/default.nix diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix new file mode 100644 index 00000000000..7207dea9d52 --- /dev/null +++ b/pkgs/applications/misc/lifelines/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lifelines"; + version = "unstable-2019-05-07"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "43f29285ed46fba322b6a14322771626e6b02c59"; + sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y"; + }; + + buildInputs = [ + gettext + libiconv + ncurses + perl + ]; + nativeBuildInputs = [ autoreconfHook bison ]; + + meta = with stdenv.lib; { + description = "Genealogy tool with ncurses interface"; + homepage = "https://lifelines.github.io/lifelines/"; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6fc8edca06..402f0ea7e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18680,6 +18680,8 @@ in libvmi = callPackage ../development/libraries/libvmi { }; + lifelines = callPackage ../applications/misc/lifelines { }; + liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) dconf; }; From 9c17484327eed89b15b907e7b2357a80bb8d2a99 Mon Sep 17 00:00:00 2001 From: kjuvi Date: Sun, 19 May 2019 17:14:05 +0200 Subject: [PATCH 340/637] spark: 2.2.1 -> 2.4.3 --- pkgs/applications/networking/cluster/spark/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 6401194eac2..3572bfe7f5b 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -7,7 +7,7 @@ let sha256 = { "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf"; - "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; + "2.4.3" = "1dvvr1q3dz961bl7qigxngrp4ssrbll3g1s6nkra6gyr83pis96c"; }.${version}; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac9475e278..90537d1c737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8535,8 +8535,8 @@ in self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = spark_22; - spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; + spark = spark_24; + spark_24 = callPackage ../applications/networking/cluster/spark { version = "2.4.3"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ From 15a2343eb3f5e11fc8d7e2ac0b462390649b3a18 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 10:17:43 -0500 Subject: [PATCH 341/637] minify: 2.0.0 -> 2.5.0, module https://github.com/tdewolff/minify/releases/tag/v2.5.0 --- pkgs/development/web/minify/default.nix | 24 +++++--- pkgs/development/web/minify/deps.nix | 74 ------------------------- 2 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 pkgs/development/web/minify/deps.nix diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index e63f609fc2b..76434809cb5 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,18 +1,24 @@ -{ buildGoPackage, fetchFromGitHub }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { - name = "minify-${version}"; - version = "v2.0.0"; - rev = "41f3effd65817bac8acea89d49b3982211803a4d"; +buildGoModule rec { + pname = "minify"; + version = "2.5.0"; goPackagePath = "github.com/tdewolff/minify"; src = fetchFromGitHub { - inherit rev; owner = "tdewolff"; - repo = "minify"; - sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq"; + repo = pname; + rev = "v${version}"; + sha256 = "1ja26fs7klzggmfqvz5nzj9icaa8r8h4a91qg8rj4gx5cnvwx38d"; }; - goDeps = ./deps.nix; + modSha256 = "0kff2nj66bifbfi8srcvcsipbddw43mvjdwlq0lz04qak524pbvr"; + + meta = with lib; { + description = "Minifiers for web formats"; + license = licenses.mit; + homepage = https://go.tacodewolff.nl/minify; + platforms = platforms.all; + }; } diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix deleted file mode 100644 index 4efaec46d57..00000000000 --- a/pkgs/development/web/minify/deps.nix +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; - sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; - }; - } - { - goPackagePath = "github.com/tdewolff/buffer"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/buffer"; - rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5"; - sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "34d5c1160d4503da4b456e5094609f2331d6dde3"; - sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"; - }; - } - { - goPackagePath = "github.com/tdewolff/strconv"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/strconv"; - rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3"; - sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"; - }; - } - { - goPackagePath = "github.com/matryer/try"; - fetch = { - type = "git"; - url = "https://github.com/matryer/try"; - rev = "93d30e50512f879b73829eb79867df38084bcd31"; - sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; - sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; - }; - } -] From f4695724a8c161ac17a77cfa777d7aaf6428cc58 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 19 May 2019 13:11:52 -0400 Subject: [PATCH 342/637] linux_hardkernel_4_14: 4.14.102-156 -> 4.14.120-160 --- 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 3fcb2fcbb24..df741d9a029 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, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.102-156"; + version = "4.14.120-160"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.102"; + modDirVersion = "4.14.120"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "12af0n1lg2w2qm9aq1v8w3x8npaka60ks9xp6jwaw0l06j23ryyv"; + sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr"; }; defconfig = "odroidxu4_defconfig"; From 45afc645c7ba3571363e1bcc5d4b29fda92ec292 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 May 2019 22:46:12 +0200 Subject: [PATCH 343/637] phpPackages.phpstan: 0.11.6 -> 0.11.7 Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.7 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f07f3d69238..f680f095275 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -367,12 +367,12 @@ let }; phpstan = mkDerivation rec { - version = "0.11.6"; + version = "0.11.7"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "016zm9ynh0zi40kclvzql7zxs3pl69cacln2c7n3gsicpswr0qa4"; + sha256 = "0148ygnmj8wwal432isfq3zhf7qw902sfd2llwl6nw4wf0a6kf73"; }; phases = [ "installPhase" ]; From f654606e873c43cf32ac51a7436ea03b3a586dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 19 May 2019 23:10:05 +0200 Subject: [PATCH 344/637] matrix-synapse: 0.99.3.2 -> 0.99.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e181b850ea4..824aacb599d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.3.2"; + version = "0.99.4"; src = fetchPypi { inherit pname version; - sha256 = "0jcmav15ms3859174zpqf11hb7xdql4fgqmxlxpxjllzipq4fwiz"; + sha256 = "136041apawi05mzc0s4s2chrwgql6l9f1i2iinrgi9dabwlb1qpc"; }; patches = [ From 784812cc5c2f580d21a873d3b5c450f4ec20a096 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 19 May 2019 08:06:24 -0400 Subject: [PATCH 345/637] flare: init at 1.10 --- pkgs/games/flare/default.nix | 24 ++++++++++++++++++++++++ pkgs/games/flare/engine.nix | 24 ++++++++++++++++++++++++ pkgs/games/flare/game.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 73 insertions(+) create mode 100644 pkgs/games/flare/default.nix create mode 100644 pkgs/games/flare/engine.nix create mode 100644 pkgs/games/flare/game.nix diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix new file mode 100644 index 00000000000..5ae656d1fc1 --- /dev/null +++ b/pkgs/games/flare/default.nix @@ -0,0 +1,24 @@ +{ lib, buildEnv, callPackage, makeWrapper }: + +buildEnv { + name = "flare-1.10"; + + paths = [ + (callPackage ./engine.nix {}) + (callPackage ./game.nix {}) + ]; + + buildInputs = [ makeWrapper ]; + postBuild = '' + mkdir -p $out/bin + makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare" + ''; + + meta = with lib; { + description = "Fantasy action RPG using the FLARE engine"; + homepage = "http://flarerpg.org/"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.gpl3 licenses.cc-by-sa-30 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix new file mode 100644 index 00000000000..8b620835f85 --- /dev/null +++ b/pkgs/games/flare/engine.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf }: + +stdenv.mkDerivation rec { + pname = "flare-engine"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "flareteam"; + repo = pname; + rev = "v${version}"; + sha256 = "0fm7jmxl86h8199nazdi9ivsrhcv9gcymhz1l5c6l2f4d0aqdqiq"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]; + + meta = with stdenv.lib; { + description = "Free/Libre Action Roleplaying Engine"; + homepage = "https://github.com/flareteam/flare-engine"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.gpl3 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix new file mode 100644 index 00000000000..b10d7dfedb0 --- /dev/null +++ b/pkgs/games/flare/game.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "flare-game"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "flareteam"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfra4ww8za08vcgza2jvh3jrwi6zryk4ljyj32lpp9v4ws9hdh4"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Fantasy action RPG using the FLARE engine"; + homepage = "https://github.com/flareteam/flare-game"; + maintainers = [ maintainers.aanderse ]; + license = [ licenses.cc-by-sa-30 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50cd07c2f1b..b50fccce0be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2865,6 +2865,8 @@ in flannel = callPackage ../tools/networking/flannel { }; + flare = callPackage ../games/flare { }; + flashbench = callPackage ../os-specific/linux/flashbench { }; flatpak = callPackage ../development/libraries/flatpak { }; From 16e37f0c7f0d293b5b11ae02a0171de160020168 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 19 May 2019 15:20:34 -0700 Subject: [PATCH 346/637] chit: 0.1.13 -> 0.1.14 --- pkgs/development/tools/chit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index c0fa754e1e9..b312b888e90 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -6,13 +6,13 @@ with rustPlatform; buildRustPackage rec { pname = "chit"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "peterheesterman"; repo = pname; rev = version; - sha256 = "1qp5ad83lvfz9l4ihz1l500p8bgf7q0z1k4f3i13nd5n7i3ksdjc"; + sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv"; }; cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw"; From f6d2df3f2ab4e7b52bc8b570ca79a1fc5cfe1435 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 19 May 2019 19:22:14 -0400 Subject: [PATCH 347/637] buildbot: 2.1.0 -> 2.3.0 (#61723) --- .../python-modules/buildbot/default.nix | 19 +++++-------------- .../python-modules/buildbot/pkg.nix | 4 ++-- .../python-modules/buildbot/plugins.nix | 10 +++++----- .../python-modules/buildbot/worker.nix | 4 ++-- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 268c08ced84..066d7058fed 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, @@ -25,21 +25,12 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.1.0"; + version = "2.3.0"; - /*src = fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w"; - };*/ - # Temporarily use GitHub source because PyPi archive is missing some files - # needed for the tests to pass. This has been fixed upstream. - # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d - src = fetchFromGitHub { - owner = "buildbot"; - repo = "buildbot"; - rev = "v${version}"; - sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65"; - } + "/master"; + sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257"; + }; propagatedBuildInputs = [ # core diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 35524040da9..f95d71dc290 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.1.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i"; + sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 2f73fbc81a4..d15b33912ae 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v"; + sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39"; }; meta = with lib; { @@ -28,7 +28,7 @@ src = fetchPypi { inherit pname version; - sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h"; + sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -48,7 +48,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27"; + sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -68,7 +68,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya"; + sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -88,7 +88,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c"; + sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index f888448db21..c8ebdf34b86 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -2,11 +2,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.1.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps"; + sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93"; }; propagatedBuildInputs = [ twisted future ]; From fd87a294537ef23edafa45d5e7cc8194b84490ad Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Sat, 18 May 2019 11:01:43 -0600 Subject: [PATCH 348/637] x264: 20170731-2245 -> 20190517-2245; add myself as maintainer - yasm has been replaced by nasm - both 10-bit and 8-bit are in the same binary now - patchPhase replaced with postPatch to allow patching with overrides - enableParallelBuilding enabled, long build and doesn't seem to cause issues - dev output added --- pkgs/development/libraries/x264/default.nix | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 276f509772c..9998add0d93 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,36 +1,37 @@ -{stdenv, fetchurl, yasm, enable10bit ? false}: +{ stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - version = "20170731-2245"; - name = "x264-${version}"; + pname = "x264"; + version = "20190517-2245"; src = fetchurl { url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; + sha256 = "1xv41z04km3rf374xk3ny7v8ibr211ph0j5am0909ln63mphc48f"; }; - patchPhase = '' - sed -i s,/bin/bash,${stdenv.shell}, configure version.sh + postPatch = '' + patchShebangs . ''; - outputs = [ "out" "lib" ]; # leaving 52 kB of headers + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" ]; preConfigure = '' - # `AS' is set to the binutils assembler, but we need yasm + # `AS' is set to the binutils assembler, but we need nasm unset AS ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" - ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; - buildInputs = [ yasm ]; + nativeBuildInputs = [ nasm ]; meta = with stdenv.lib; { description = "Library for encoding H264/AVC video streams"; homepage = http://www.videolan.org/developers/x264.html; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt tadeokondrak ]; }; } From c03630a579acb251bfe710d2eabbac9cab255b72 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 May 2019 20:35:41 -0500 Subject: [PATCH 349/637] redhat-official-fonts: init at 2.2.0 --- pkgs/data/fonts/redhat-official/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/redhat-official/default.nix diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix new file mode 100644 index 00000000000..c05b9c69aef --- /dev/null +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip }: + +let version = "2.2.0"; in +fetchzip rec { + name = "redhat-official-${version}"; + url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; + + meta = with lib; { + homepage = https://github.com/RedHatOfficial/RedHatFont; + description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f89abd8858..0619b566035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16420,6 +16420,8 @@ in qogir-theme = callPackage ../data/themes/qogir { }; + redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; From c5d08e471ce514eb8d1f135177b7d7e1b01bd90b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 May 2019 19:31:37 -0700 Subject: [PATCH 350/637] acl2: 8.1 -> 8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acl2/versions --- pkgs/development/interpreters/acl2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index cc88b32119e..a88d07d1655 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,15 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd"; + "8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3"; }; revs = { "8.0" = "8.0"; - "8.1" = "8.1"; + "8.2" = "8.2"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "acl2-devel"; From af29de6cf2fb7c902cb0d600e779b1ee0a7359c0 Mon Sep 17 00:00:00 2001 From: Evax Software Date: Mon, 20 May 2019 08:34:33 +0200 Subject: [PATCH 351/637] passff-host: 1.0.2 -> 1.2.1 --- pkgs/tools/security/passff-host/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index 1bb621eab36..a97bc57ad45 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "passff-host-${version}"; - version = "1.0.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "passff"; repo = "passff-host"; rev = version; - sha256 = "1zks34rg9i8vphjrj1h80y5rijadx33z911qxa7pslf7ahmjqdv3"; + sha256 = "0ydfwvhgnw5c3ydx2gn5d7ys9g7cxlck57vfddpv6ix890v21451"; }; buildInputs = [ python3 ]; patchPhase = '' - sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py + sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py ''; - preBuild = "cd src"; - postBuild = "cd .."; - installPhase = '' install -D bin/testing/passff.py $out/share/passff-host/passff.py cp bin/testing/passff.json $out/share/passff-host/passff.json From acc3eec8da6427da2e879923db6efee8f765a685 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 20 May 2019 10:39:24 +0200 Subject: [PATCH 352/637] openvpn: fix pkcs11 helper --- pkgs/tools/networking/openvpn/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 3bcb1460a70..732687ecfa1 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig , iproute, lzo, openssl, pam , useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null , pkcs11Support ? false, pkcs11helper ? null, @@ -33,6 +33,13 @@ in stdenv.mkDerivation rec { ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; + patches = [ + ( fetchpatch { + url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch"; + sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm"; + }) + ]; + configureFlags = optionals stdenv.isLinux [ "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] From 883d6262e4a7fdcd1480e885a61feb7f4214c651 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 1 May 2019 05:18:25 +0800 Subject: [PATCH 353/637] solc: 0.5.7 -> 0.5.8 Also add more complete set of tests and disable shared build on MacOS. --- pkgs/development/compilers/solc/default.nix | 50 +++++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 8f005d475dc..a4fb9b6c6d8 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, ncurses, python2 , z3Support ? true, z3 ? null }: @@ -6,14 +6,15 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.7"; - rev = "6da8b019e4a155d1f70abe7a3acc0f9765480a9e"; - sha256 = "0ii868r0ra6brjnn453kxqvw76p4bwjbvdyqfcn6v1bl2h4s60ir"; + version = "0.5.8"; + rev = "23d335f28e4055e67c3b22466ac7c4e41dc48344"; + sha256 = "10fa4qwfr3gfvxkzzjfs0w2fyij67cczklpj2x5hghcg08amkq37"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; }; + buildSharedLibs = stdenv.hostPlatform.isLinux; in stdenv.mkDerivation { name = "solc-${version}"; @@ -24,9 +25,7 @@ stdenv.mkDerivation { inherit rev sha256; }; - patches = [ - ./patches/shared-libs-install.patch - ]; + patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; postPatch = '' touch prerelease.txt @@ -37,18 +36,41 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" + ] ++ stdenv.lib.optionals buildSharedLibs [ "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" ]; - doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:./test/tools/yulInterpreter:$LD_LIBRARY_PATH " + - "./test/soltest -p true -- --no-ipc --no-smt --testpath ../test"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ stdenv.lib.optionals z3Support [ z3 ]; + buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ]; + checkInputs = [ ncurses python2 ]; + + # Test fails on darwin for unclear reason + doCheck = stdenv.hostPlatform.isLinux; + + checkPhase = '' + while IFS= read -r -d ''' dir + do + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$dir + export LD_LIBRARY_PATH + done < <(find . -type d -print0) + + pushd .. + # IPC tests need aleth avaliable, so we disable it + sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh + for i in ./scripts/*.sh; do + patchShebangs "$i" + done + for i in ./scripts/*.py; do + patchShebangs "$i" + done + for i in ./test/*.sh; do + patchShebangs "$i" + done + TERM=xterm ./scripts/tests.sh + popd + ''; outputs = [ "out" "dev" ]; @@ -57,7 +79,7 @@ stdenv.mkDerivation { homepage = https://github.com/ethereum/solidity; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dbrock akru lionello ]; + maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; inherit version; }; } From 9d8c27e4f4b129f910a992d77b1c740c0a783f08 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 3 Feb 2019 16:01:42 -0400 Subject: [PATCH 354/637] steam: provide pidof and lsusb for Steam VR --- pkgs/games/steam/chrootenv.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 598ddc48563..0082b97eb22 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -28,6 +28,9 @@ let iana-etc # Steam Play / Proton python3 + # Steam VR + procps + usbutils ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus ++ extraPkgs pkgs; From a3e7e1bbc8e4fea44fa2bdaac74a2371f1989a82 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 21 Apr 2019 23:05:07 +0200 Subject: [PATCH 355/637] nixos/syncthing: add options for declarative device/folder config --- .../modules/services/networking/syncthing.nix | 260 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/syncthing-init.nix | 30 ++ 3 files changed, 291 insertions(+) create mode 100644 nixos/tests/syncthing-init.nix diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 114a64dfb17..89dae7bb3f8 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -5,6 +5,57 @@ with lib; let cfg = config.services.syncthing; defaultUser = "syncthing"; + + devices = mapAttrsToList (name: device: { + deviceID = device.id; + inherit (device) name addresses introducer; + }) cfg.declarative.devices; + + folders = mapAttrsToList ( _: folder: { + inherit (folder) path id label type; + devices = map (device: { deviceId = cfg.declarative.devices.${device}.id; }) folder.devices; + rescanIntervalS = folder.rescanInterval; + fsWatcherEnabled = folder.watch; + fsWatcherDelayS = folder.watchDelay; + ignorePerms = folder.ignorePerms; + }) cfg.declarative.folders; + + # get the api key by parsing the config.xml + getApiKey = pkgs.writers.writeDash "getAPIKey" '' + ${pkgs.libxml2}/bin/xmllint \ + --xpath 'string(configuration/gui/apikey)'\ + ${cfg.configDir}/config.xml + ''; + + updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' + set -efu + # wait for syncthing port to open + until ${pkgs.curl}/bin/curl -Ss ${cfg.guiAddress} -o /dev/null; do + sleep 1 + done + + API_KEY=$(${getApiKey}) + OLD_CFG=$(${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + ${cfg.guiAddress}/rest/system/config) + + # generate the new config by merging with the nixos config options + NEW_CFG=$(echo "$OLD_CFG" | ${pkgs.jq}/bin/jq -s '.[] as $in | $in * { + "devices": (${builtins.toJSON devices}${optionalString (! cfg.declarative.overrideDevices) " + $in.devices"}), + "folders": (${builtins.toJSON folders}${optionalString (! cfg.declarative.overrideFolders) " + $in.folders"}) + }') + + # POST the new config to syncthing + echo "$NEW_CFG" | ${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + ${cfg.guiAddress}/rest/system/config -d @- + + # restart syncthing after sending the new config + ${pkgs.curl}/bin/curl -Ss \ + -H "X-API-Key: $API_KEY" \ + -X POST \ + ${cfg.guiAddress}/rest/system/restart + ''; in { ###### interface options = { @@ -16,6 +67,187 @@ in { available on http://127.0.0.1:8384/. ''; + declarative = { + cert = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users cert.pem file, will be copied into the syncthing's + configDir + ''; + }; + + key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to users key.pem file, will be copied into the syncthing's + configDir + ''; + }; + + overrideDevices = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the devices which are not configured via the + declarative.devices option. + If set to false, devices added via the webinterface will + persist but will have to be deleted manually. + ''; + }; + + devices = mkOption { + default = {}; + description = '' + Peers/devices which syncthing should communicate with. + ''; + example = [ + { + name = "bigbox"; + id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + addresses = [ "tcp://192.168.0.10:51820" ]; + } + ]; + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + + name = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + Name of the device + ''; + }; + + addresses = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The addresses used to connect to the device. + If this is let empty, dynamic configuration is attempted + ''; + }; + + id = mkOption { + type = types.str; + description = '' + The id of the other peer, this is mandatory. It's documented at + https://docs.syncthing.net/dev/device-ids.html + ''; + }; + + introducer = mkOption { + type = types.bool; + default = false; + description = '' + If the device should act as an introducer and be allowed + to add folders on this computer. + ''; + }; + + }; + })); + }; + + overrideFolders = mkOption { + type = types.bool; + default = true; + description = '' + Whether to delete the folders which are not configured via the + declarative.folders option. + If set to false, folders added via the webinterface will persist + but will have to be deleted manually. + ''; + }; + + folders = mkOption { + default = {}; + description = '' + folders which should be shared by syncthing. + ''; + type = types.attrsOf (types.submodule ({ config, ... }: { + options = { + + path = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The path to the folder which should be shared. + ''; + }; + + id = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The id of the folder. Must be the same on all devices. + ''; + }; + + label = mkOption { + type = types.str; + default = config._module.args.name; + description = '' + The label of the folder. + ''; + }; + + devices = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The devices this folder should be shared with. Must be defined + in the declarative.devices attribute. + ''; + }; + + rescanInterval = mkOption { + type = types.int; + default = 3600; + description = '' + How often the folders should be rescaned for changes. + ''; + }; + + type = mkOption { + type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; + default = "sendreceive"; + description = '' + Whether to send only changes from this folder, only receive them + or propagate both. + ''; + }; + + watch = mkOption { + type = types.bool; + default = true; + description = '' + Whether the folder should be watched for changes by inotify. + ''; + }; + + watchDelay = mkOption { + type = types.int; + default = 10; + description = '' + The delay after an inotify event is triggered. + ''; + }; + + ignorePerms = mkOption { + type = types.bool; + default = true; + description = '' + Whether to propagate permission changes. + ''; + }; + + }; + })); + }; + }; + guiAddress = mkOption { type = types.str; default = "127.0.0.1:8384"; @@ -151,6 +383,23 @@ in { RestartForceExitStatus="3 4"; User = cfg.user; Group = cfg.group; + ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null) + "+${pkgs.writers.writeBash "syncthing-copy-keys" '' + mkdir -p ${cfg.configDir} + chown ${cfg.user}:${cfg.group} ${cfg.configDir} + chmod 700 ${cfg.configDir} + ${optionalString (cfg.declarative.cert != null) '' + cp ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem + chown ${cfg.user}:${cfg.group} ${cfg.configDir}/cert.pem + chmod 400 ${cfg.configDir}/cert.pem + ''} + ${optionalString (cfg.declarative.key != null) '' + cp ${toString cfg.declarative.key} ${cfg.configDir}/key.pem + chown ${cfg.user}:${cfg.group} ${cfg.configDir}/key.pem + chmod 400 ${cfg.configDir}/key.pem + ''} + ''}" + ; ExecStart = '' ${cfg.package}/bin/syncthing \ -no-browser \ @@ -159,6 +408,17 @@ in { ''; }; }; + syncthing-init = { + after = [ "syncthing.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + RemainAfterExit = true; + Type = "oneshot"; + ExecStart = updateConfig; + }; + }; syncthing-resume = { wantedBy = [ "suspend.target" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c31d9d78da6..5be7c4292e5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -231,6 +231,7 @@ in strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; + syncthing-init = handleTest ./syncthing-init.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix new file mode 100644 index 00000000000..811a466ff94 --- /dev/null +++ b/nixos/tests/syncthing-init.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ lib, pkgs, ... }: let + + testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + +in { + name = "syncthing-init"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lassulus ]; + + machine = { + services.syncthing = { + enable = true; + declarative = { + devices.testDevice = { + id = testId; + }; + folders.testFolder = { + path = "/tmp/test"; + devices = [ "testDevice" ]; + }; + }; + }; + }; + + testScript = '' + $machine->waitForUnit("syncthing-init.service"); + $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /${testId}/ or die; + $machine->succeed("cat /var/lib/syncthing/config.xml") =~ /testFolder/ or die; + ''; +}) + From baac84c2c407b76f7ddbdff92f27d681b7d4e223 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 16 May 2019 15:01:32 +0200 Subject: [PATCH 356/637] Sylk: init at 2.1.0 --- pkgs/applications/networking/Sylk/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/Sylk/default.nix diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix new file mode 100644 index 00000000000..36f6279c209 --- /dev/null +++ b/pkgs/applications/networking/Sylk/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: + +let + pname = "Sylk"; + version = "2.1.0"; +in + +appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; + sha256 = "1ifi8qr6f84dcssxhv5ar1s48nsqxiv2j1blc82248hmq5is24mf"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "Sylk WebRTC client"; + homepage = "http://sylkserver.com/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zimbatm ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0619b566035..58fcf2ea380 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6028,6 +6028,8 @@ in systrayhelper = callPackage ../tools/misc/systrayhelper {}; + Sylk = callPackage ../applications/networking/Sylk {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { From 9a81e9cd9e469920c2a4c753bc403cb8b79afaf7 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 18 May 2019 19:08:09 -0700 Subject: [PATCH 357/637] xinetd: exec xinetd on launch I noticed xinetd process doesn't get exec'd on launch, exec here so the bash process doesn't stick around. Signed-off-by: William Casarin --- nixos/modules/services/networking/xinetd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 00224502780..2d7cd5cebb4 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -146,7 +146,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.xinetd ]; - script = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; + script = "exec xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; }; }; } From 11fc7674b94ce09d998e31ebc93568ac93a557c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 15:40:08 -0500 Subject: [PATCH 358/637] pijul: 0.11.0 -> 0.12.0 https://pijul.org/posts/2019-04-23-pijul-0.12/ * add new dep on nettle, all the crypto libraries :) * libclang needed * clang input is not quite right AFAIK, but fixes the build. idea from other package, seems to resolve problems finding headers via libclang? --- .../version-management/pijul/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b97123926eb..4f716251153 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }: +{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5"; + sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig clang ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} @@ -20,12 +20,14 @@ buildRustPackage rec { $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish ''; - buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin + LIBCLANG_PATH = libclang + "/lib"; + + buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); doCheck = false; - cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz"; + cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58fcf2ea380..c41cf93d897 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19114,7 +19114,9 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul {}; + pijul = callPackage ../applications/version-management/pijul { + inherit (llvmPackages) clang libclang; + }; ping = callPackage ../applications/networking/ping { }; From d2de73f42cecae81c7224aadd77a30120792b21b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 9 Apr 2019 15:42:19 +0200 Subject: [PATCH 359/637] python3Packages.django_2_2: init at 2.2.1 This introduces Django-2.2, the new LTR version of django. For the time being, django-1.11 continues to be LTR in nixpkgs django-2.2 is introduced to prepare the migration. --- .../development/python-modules/django/2_2.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/django/2_2.nix diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix new file mode 100644 index 00000000000..8f3065633a1 --- /dev/null +++ b/pkgs/development/python-modules/django/2_2.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, sqlparse, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ; + + propagatedBuildInputs = [ pytz sqlparse ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc281887d8b..335ce2e8209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2433,6 +2433,8 @@ in { gdal = self.gdal; }; + django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; From 115d1babce27c3512f133261ff7d5192d15dcff3 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 18 May 2019 12:03:01 -0400 Subject: [PATCH 360/637] pythonPackages.zxcvbn-python: 4.4.24 -> 4.4.27 --- .../python-modules/zxcvbn-python/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 8287c05f743..94e8fc977e0 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -1,24 +1,24 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: +{ lib, buildPythonPackage, fetchFromGitHub +, pytest_3 }: buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.24"; + version = "4.4.27"; - - src = fetchPypi { - inherit pname version; - sha256 = "900b28cc5e96be4091d8778f19f222832890264e338765a1c1c09fca2db64b2d"; + src = fetchFromGitHub { + owner = "dwolfhub"; + repo = pname; + rev = "v${version}"; + sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; }; - # No tests in archive - doCheck = false; + checkInputs = [ + pytest_3 + ]; meta = { description = "Python implementation of Dropbox's realistic password strength estimator, zxcvbn"; homepage = https://github.com/dwolfhub/zxcvbn-python; license = with lib.licenses; [ mit ]; }; -} \ No newline at end of file +} From 9b43c29047f3e19d22564edee7bd2f3fb3f2e611 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sun, 19 May 2019 14:25:52 +0200 Subject: [PATCH 361/637] cri-o: init at version v1.14.1 This commits adds the CRI-O package, which includes the `crio` binary as well as `conmon` and `pause`. The configuration is not part of this package because it would be included in a service. Signed-off-by: Sascha Grunert --- maintainers/maintainer-list.nix | 9 ++- .../virtualization/cri-o/default.nix | 75 +++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/virtualization/cri-o/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a88e5a5307..778277f3651 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1746,13 +1746,13 @@ github = "fps"; name = "Florian Paul Schmidt"; }; - + fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; name = "Michael Gough"; }; - + fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; @@ -4397,6 +4397,11 @@ github = "sargon"; name = "Daniel Ehlers"; }; + saschagrunert = { + email = "mail@saschagrunert.de"; + github = "saschagrunert"; + name = "Sascha Grunert"; + }; sauyon = { email = "s@uyon.co"; github = "sauyon"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix new file mode 100644 index 00000000000..6e2790ef859 --- /dev/null +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -0,0 +1,75 @@ +{ flavor ? "" +, ldflags ? "" +, stdenv +, btrfs-progs +, buildGoPackage +, fetchFromGitHub +, glibc +, gpgme +, libapparmor +, libassuan +, libgpgerror +, libseccomp +, libselinux +, lvm2 +, pkgconfig +}: + +buildGoPackage rec { + project = "cri-o"; + version = "1.14.1"; + name = "${project}-${version}${flavor}"; + + goPackagePath = "github.com/${project}/${project}"; + + src = fetchFromGitHub { + owner = "cri-o"; + repo = "cri-o"; + rev = "v${version}"; + sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk"; + }; + + outputs = [ "bin" "out" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror + libseccomp libselinux lvm2 ] + ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + + makeFlags = ''BUILDTAGS="apparmor seccomp selinux + containers_image_ostree_stub"''; + + buildPhase = '' + pushd go/src/${goPackagePath} + + # Build conmon and pause + go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \ + -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config + + pushd conmon + ../bin/crio-config + popd + + make -C conmon + make -C pause + + # Build the crio binary + go build -tags ${makeFlags} -o bin/crio -buildmode=pie \ + -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio + ''; + installPhase = '' + install -Dm755 bin/crio $bin/bin/crio${flavor} + + mkdir -p $bin/libexec/crio + install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor} + install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} + ''; + + meta = with stdenv.lib; { + homepage = https://cri-o.io; + description = ''Open Container Initiative-based implementation of the + Kubernetes Container Runtime Interface''; + license = licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + }; +} From 1a046e14a009fb3bca1f56f58d4bc82325165d49 Mon Sep 17 00:00:00 2001 From: Juanjo Presa Date: Fri, 10 May 2019 15:41:09 +0200 Subject: [PATCH 362/637] maintainers: add juaningan --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cd264bd5a77..9161dd04ae1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2445,6 +2445,11 @@ github = "jtojnar"; name = "Jan Tojnar"; }; + juaningan = { + email = "juaningan@gmail.com"; + github = "juaningan"; + name = "Juan Rodal"; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; From 912856f40fb39168dd7bfb47823a27a69707c910 Mon Sep 17 00:00:00 2001 From: Juanjo Presa Date: Fri, 10 May 2019 15:34:29 +0200 Subject: [PATCH 363/637] pythonPackages.pysonos: init at 0.0.13 --- .../python-modules/pysonos/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pysonos/default.nix diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix new file mode 100644 index 00000000000..7e9414d5207 --- /dev/null +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, xmltodict +, requests +, ifaddr + +# Test dependencies +, pytest_3, pylint, flake8, graphviz +, mock, sphinx, sphinx_rtd_theme +}: + +buildPythonPackage rec { + pname = "pysonos"; + version = "0.0.13"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0azkbd20qdzdilv5pi4qngw7pjjcsv269dim7xh3qv7s9bp0xik8"; + }; + + propagatedBuildInputs = [ xmltodict requests ifaddr ]; + + checkInputs = [ + pytest_3 pylint flake8 graphviz + mock sphinx sphinx_rtd_theme + ]; + + meta = { + homepage = https://github.com/amelchio/pysonos; + description = "A SoCo fork with fixes for Home Assistant"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ juaningan ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ae7784c640..3bd431a757a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4008,6 +4008,8 @@ in { pyserial = callPackage ../development/python-modules/pyserial {}; + pysonos = callPackage ../development/python-modules/pysonos {}; + pymongo = callPackage ../development/python-modules/pymongo {}; pyperclip = callPackage ../development/python-modules/pyperclip { }; From dd917dc71a4b36a1040cb99c1c1d2720e8c0baec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 May 2019 11:22:10 +0200 Subject: [PATCH 364/637] nixos/release-notes: mention length of release support I took the date for 19.03 from the announcement: https://discourse.nixos.org/t/nixos-19-03-release/2652 --- nixos/doc/manual/release-notes/rl-1903.xml | 7 ++++++- nixos/doc/manual/release-notes/rl-1909.xml | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index e9c6cd7e9ac..8ff1681d3b4 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-19.03"> - Release 19.03 (“Koiâ€, 2019/03/??) + Release 19.03 (“Koiâ€, 2019/04/11)
+ + + End of support is planned for end of October 2019, handing over to 19.09. + + The default Python 3 interpreter is now CPython 3.7 instead of CPython diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index ead8f3abd8b..b78c3e08b79 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -19,7 +19,9 @@ - + + End of support is planned for end of April 2020, handing over to 20.03. +
From e94d85737383ccbb6e221945646dce4551190e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 May 2019 13:31:16 +0200 Subject: [PATCH 365/637] home-assistant: run parse-requirements.py --- pkgs/servers/home-assistant/component-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 12240320979..c7f1bb475c1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -209,7 +209,7 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ ]; "fints" = ps: with ps; [ fints ]; - "fitbit" = ps: with ps; [ aiohttp-cors ]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; "flexit" = ps: with ps; [ ]; "flic" = ps: with ps; [ ]; @@ -455,8 +455,8 @@ "nello" = ps: with ps; [ ]; "ness_alarm" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; - "netatmo" = ps: with ps; [ aiohttp-cors ]; - "netatmo_public" = ps: with ps; [ aiohttp-cors ]; + "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ]; + "netatmo_public" = ps: with ps; [ aiohttp-cors pyatmo ]; "netdata" = ps: with ps; [ ]; "netgear" = ps: with ps; [ ]; "netgear_lte" = ps: with ps; [ ]; @@ -637,7 +637,7 @@ "somfy_mylink" = ps: with ps; [ ]; "sonarr" = ps: with ps; [ ]; "songpal" = ps: with ps; [ ]; - "sonos" = ps: with ps; [ ]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; "soundtouch" = ps: with ps; [ libsoundtouch ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; From 42c8cb61c616f6981a13af82847ed34a0ce0c062 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 May 2019 06:34:25 +0200 Subject: [PATCH 366/637] xmind: 7.5-update1 -> 8-update8 The latest version of XMind doesn't support a prebuilt debian package anymore, hence a manual installation of the ZIP is needed. The new configuration for the Java GUI had to be patched as it relied on several paths in the ZIP that won't work anymore in a Nix-based environment. Additionally the following changes were made: * Manual creation of a desktop item and an icon (we're using the one from AUR for now). Those files were available in the old `.deb`, but that isn't supported for the latest XMind version. * Created a patch fro `XMind.ini` to use writable paths in $HOME and fix the path to the plugins in the store path. * Created a custom startup script which ensures the creation of `$HOME/.xmind` and copies the relevant files from the store path into it. Such a behavior was available in the old `.deb` as well, but not anymore with the new ZIP. --- pkgs/applications/misc/xmind/default.nix | 69 +++++++++++++------ .../misc/xmind/java-env-config-fixes.patch | 40 +++++++++++ 2 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/misc/xmind/java-env-config-fixes.patch diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index a12f3dc304b..fc5abf10989 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -1,20 +1,23 @@ -{ stdenv, lib, dpkg, fetchurl, gtk2, jre, libXtst, makeWrapper }: +{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: stdenv.mkDerivation rec { name = "xmind-${version}"; - version = "7.5-update1"; + version = "8-update8"; - src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_i386.deb"; - sha256 = "04kr6pw0kwy715bp9wcnqnw1k5wl65xa87lhljrskm291p402jy1"; - } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_amd64.deb"; - sha256 = "1j2ynhk7p3m3vd6c4mjwpnlzqgfj5c4q3zydab3nfwncwx6gaqj9"; - } else throw "platform ${stdenv.hostPlatform.system} not supported!"; + src = fetchzip { + url = "https://xmind.net/xmind/downloads/${name}-linux.zip"; + stripRoot = false; + sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn"; + }; - nativeBuildInputs = [ dpkg makeWrapper ]; + srcIcon = fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind"; + sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; + }; - unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + patches = [ ./java-env-config-fixes.patch ]; + + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; dontPatchELF = true; @@ -22,12 +25,27 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ gtk2 libXtst ]; - installPhase = '' - mkdir -p $out - cp -r usr/lib/xmind $out/libexec - cp -r usr/bin usr/share $out - rm $out/libexec/XMind.ini - mv etc/XMind.ini $out/libexec + desktopItem = makeDesktopItem { + name = "XMind"; + exec = "XMind"; + icon = "xmind"; + desktopName = "XMind"; + comment = meta.description; + categories = "Office;"; + mimeType = "application/xmind;xscheme-handler/xmind"; + }; + + installPhase = let + targetDir = if stdenv.hostPlatform.system == "i686-linux" + then "XMind_i386" + else "XMind_amd64"; + in '' + mkdir -p $out/{bin,libexec/configuration/,share/{applications/,fonts/,icons/hicolor/scalable/apps/}} + cp -r ${targetDir}/{configuration,p2,XMind{,.ini}} $out/libexec + cp -r {plugins,features} $out/libexec/ + cp -r fonts $out/share/fonts/ + cp "${desktopItem}/share/applications/XMind.desktop" $out/share/applications/XMind.desktop + cp ${srcIcon} $out/share/icons/hicolor/scalable/apps/xmind.png patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ $out/libexec/XMind @@ -35,8 +53,17 @@ stdenv.mkDerivation rec { wrapProgram $out/libexec/XMind \ --prefix LD_LIBRARY_PATH : "${libPath}" - substituteInPlace "$out/bin/XMind" \ - --replace '/usr/lib/xmind' "$out/libexec" + # Inspired by https://aur.archlinux.org/cgit/aur.git/tree/?h=xmind + cat >$out/bin/XMind < Date: Sat, 4 May 2019 23:36:15 +0200 Subject: [PATCH 367/637] ngrok2: 2.3.18 -> 2.3.29 --- pkgs/tools/networking/ngrok-2/default.nix | 9 +++++-- pkgs/tools/networking/ngrok-2/versions.json | 30 ++++++++++----------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 89d6a9b454d..686bb1d7ebf 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, patchelfUnstable }: with stdenv.lib; @@ -24,13 +24,18 @@ stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ patchelfUnstable ]; + unpackPhase = "cp $src ngrok"; buildPhase = "chmod a+x ngrok"; installPhase = '' install -D ngrok $out/bin/ngrok - ''; + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/ngrok + ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json index 3d7aa8a56b6..591e54a6f81 100644 --- a/pkgs/tools/networking/ngrok-2/versions.json +++ b/pkgs/tools/networking/ngrok-2/versions.json @@ -1,32 +1,32 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/jqJ2Vvh67gW/ngrok-2.3.18-linux-386", - "sha256": "2bebb8f39a3c19ca03eaf786b97c92876216d2297046e85271478edef2cd6404", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/6i2VnqLBZqg/ngrok-2.3.29-linux-386", + "sha256": "c0859f783e66a661dc1490e0cec95dfcce0ae77deaf0aa1838613afcbd8f9451", + "version": "2.3.29" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/ik4d9aurG9/ngrok-2.3.18-linux-amd64", - "sha256": "75e19c343a208bf0e2d3b613d2fa3ce67abbf25c04a1d6be670598a4c25c1694", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/6ws4BqFTLXR/ngrok-2.3.29-linux-amd64", + "sha256": "625e85af6d366be4cc54ba296a6e66d3311b99db36e6ea5fe7f88941874daabb", + "version": "2.3.29" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/c2KRZoJ5cb6/ngrok-2.3.18-linux-arm", - "sha256": "af4cdb9f116104921d7fbeeac9124e545a45495b3623b2b46da996400c305d9c", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/3Qx4EX7AtXt/ngrok-2.3.29-linux-arm", + "sha256": "8a2ec453b407bb0983d22819f3b76044100870888cc976fbf76ced18e6f66fa7", + "version": "2.3.29" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/b2NBP9tpq2E/ngrok-2.3.18-linux-arm64", - "sha256": "9e5fa5b83dc65803291b59867c664085de248a4adb3d415c4dbba1dae90a0aaf", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/7qbe9PkG69E/ngrok-2.3.29-linux-arm64", + "sha256": "c49a9c95dc0128e8129f9b7291b5049a45d13f27bb309ca8af59e498f98b97d0", + "version": "2.3.29" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/879TXbRQQRV/ngrok-2.3.18-darwin-amd64", - "sha256": "abb643bdba7ade5dabd60488b866804d814a41d4d7144fa09e01c9260e93659d", - "version": "2.3.18" + "url": "https://bin.equinox.io/a/eqL9fYWPxoV/ngrok-2.3.29-darwin-amd64", + "sha256": "916ad7b4706e4c770eb58667c5beabf227daa1ad35bbbee41883eb2bce3f254b", + "version": "2.3.29" } } From 1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Mon, 20 May 2019 18:37:11 +1000 Subject: [PATCH 368/637] arandr: Use wrapGAppsHook This stops arandr from crashing if it tries to open a dialog box. Note: the hook doesn't play nicely with gobject-introspection unless strictDeps = false. See NixOS#56943. --- pkgs/tools/X11/arandr/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 5baba117157..51f2f5ec249 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, gobject-introspection, gtk3, xrandr, python3Packages }: +{ stdenv, fetchurl, python3Packages +, gobject-introspection, gsettings-desktop-schemas, gtk3 +, wrapGAppsHook, xrandr +}: let inherit (python3Packages) buildPythonApplication docutils pygobject3; @@ -17,13 +20,13 @@ in buildPythonApplication rec { # no tests doCheck = false; - buildInputs = [ docutils ]; - nativeBuildInputs = [ gobject-introspection gtk3 ]; - propagatedBuildInputs = [ xrandr pygobject3 ]; + # hook for gobject-introspection doesn't like strictDeps + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; - makeWrapperArgs = [ - "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" - ]; + buildInputs = [ docutils gsettings-desktop-schemas gtk3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { homepage = http://christian.amsuess.com/tools/arandr/; From 7531dc4366561b6798d4cf19d823b81bcd33abc2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 7 May 2019 12:27:48 -0400 Subject: [PATCH 369/637] pythonPackages.macropy: init at 1.10b2 --- .../python-modules/macropy/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/macropy/default.nix diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix new file mode 100644 index 00000000000..952740d7837 --- /dev/null +++ b/pkgs/development/python-modules/macropy/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, isPy27 +, pinqSupport ? false, sqlalchemy +, pyxlSupport ? false, pyxl3 +}: + +buildPythonPackage rec { + # https://github.com/lihaoyi/macropy/issues/94 + version = "1.1.0b2"; + pname = "macropy"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "lihaoyi"; + repo = pname; + rev = "v${version}"; + sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf"; + }; + + # js_snippets extra only works with python2 + propagatedBuildInputs = [ ] + ++ lib.optional pinqSupport sqlalchemy + ++ lib.optional pyxlSupport pyxl3; + + checkPhase = '' + ${python.interpreter} run_tests.py + ''; + + meta = with lib; { + homepage = https://github.com/lihaoyi/macropy; + description = "Macros in Python: quasiquotes, case classes, LINQ and more"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38d82984c48..efa2a6b1f6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,6 +492,8 @@ in { logzero = callPackage ../development/python-modules/logzero { }; + macropy = callPackage ../development/python-modules/macropy { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; manhole = callPackage ../development/python-modules/manhole { }; From 184c9dffb87a121e5847f9d0865afc404ed0da59 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 8 May 2019 10:50:38 -0400 Subject: [PATCH 370/637] pythonPackages.pyxl3: init at 1.0 --- .../python-modules/pyxl3/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyxl3/default.nix diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix new file mode 100644 index 00000000000..159645c425e --- /dev/null +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittest2 +, python +, isPy27 +}: + +buildPythonPackage rec { + pname = "pyxl3"; + version = "1.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "df413d86664e2d261f67749beffff07eb830ab8c7bbe631d11d4c42f3a5e5fde"; + }; + + checkInputs = [ unittest2 ]; + + checkPhase = '' + ${python.interpreter} tests/test_basic.py + ''; + + # tests require weird codec installation + # which is not necessary for major use of package + doCheck = false; + + meta = with lib; { + description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; + homepage = https://github.com/gvanrossum/pyxl3; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efa2a6b1f6c..df5ff76887c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4522,6 +4522,8 @@ in { pysendfile = callPackage ../development/python-modules/pysendfile { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + qpid-python = callPackage ../development/python-modules/qpid-python { }; xattr = callPackage ../development/python-modules/xattr { }; From 9856c9eb9b5a33e6392c21256ad996f601b146a1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 May 2019 09:30:05 -0400 Subject: [PATCH 371/637] pythonPackages.units: init at 0.07 --- .../python-modules/units/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/units/default.nix diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix new file mode 100644 index 00000000000..02a3fc940ae --- /dev/null +++ b/pkgs/development/python-modules/units/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "units"; + version = "0.07"; + + src = fetchPypi { + inherit pname version; + sha256 = "43eb3e073e1b11289df7b1c3f184b5b917ccad178b717b03933298716f200e14"; + }; + + meta = with lib; { + description = "Python support for quantities with units"; + homepage = https://bitbucket.org/adonohue/units/; + license = licenses.psfl; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4deb92358f4..1e260730d52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4800,6 +4800,8 @@ in { unidiff = callPackage ../development/python-modules/unidiff { }; + units = callPackage ../development/python-modules/units { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; From bfb64b92005c93acc96885e3a5531c1d6e249a5e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 May 2019 09:30:26 -0400 Subject: [PATCH 372/637] pythonPackages.stravalib: init at 0.10.2 --- .../python-modules/stravalib/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/stravalib/default.nix diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix new file mode 100644 index 00000000000..e8e4eb4bf35 --- /dev/null +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, arrow +, requests +, units +, pytz +, six +}: + +buildPythonPackage rec { + pname = "stravalib"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; + }; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + arrow + requests + units + pytz + six + ]; + + # tests require network access + # testing strava api + doCheck = false; + + meta = with lib; { + description = "Python library for interacting with Strava v3 REST API"; + homepage = https://github.com/hozn/stravalib; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e260730d52..e75b62bda2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4378,6 +4378,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + stravalib = callPackage ../development/python-modules/stravalib { }; + streamz = callPackage ../development/python-modules/streamz { }; structlog = callPackage ../development/python-modules/structlog { }; From 5711eb56926181c70c54a643fd2557512fb42def Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 20 May 2019 09:42:30 -0400 Subject: [PATCH 373/637] openraPackages.engines.bleed: fix hash (#61749) --- pkgs/games/openra/engines.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index a6eb363dcb7..2bdbce6d939 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -36,6 +36,6 @@ in { bleed = buildUpstreamOpenRAEngine { version = "8ee1102"; rev = "8ee11028d72cde7556b31d45f556b40be65b4b70"; - sha256 = "19fjzwgmfdf832c6b1x885kaiyck03kpiba0qpsxvps04i7b3vj4"; + sha256 = "0f1fpf37ms8d7fhlh3rjzsxsk9w23iyi3phs2i7g561292d5rk3l"; }; } From d84dbe5a91498e7d04f8aa549da3d1fbe07621e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 20 May 2019 10:59:15 -0400 Subject: [PATCH 374/637] zoom-us: 2.8.183302.0415 -> 2.8.222599.0519 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45d0dadbe90..b477a194faf 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.8.183302.0415"; + version = "2.8.222599.0519"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x"; + sha256 = "0bmrqxz41pxcz41dcdbwd2b0hjv8fvix09jwxrnca4d50jq9fx7j"; }; }; From 7711aed354537f5ff2661da63f20d9e500fec895 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 20 May 2019 11:04:31 -0400 Subject: [PATCH 375/637] oh-my-zsh: 2019-05-17 -> 2019-05-19 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 01fdfb7d1f4..4a705d52cd1 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-17"; + version = "2019-05-19"; name = "oh-my-zsh-${version}"; - rev = "5aa62461d91546ce1fd5dcc6531569d0e6e6f17f"; + rev = "f960e2be6f01abe5f185d668be661b57051322ac"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "0mg308h9k9lcv9flqwnynq2iiicl7b89arn7m97wwjijww1isdg6"; + sha256 = "1amn72cx9ay4kd707y8kxfvgq5mlqhvlvha28aai2gxcravb95vn"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 81d4e65891f92e8e72c244da663c83c1e40dc919 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 20 May 2019 11:20:37 -0400 Subject: [PATCH 376/637] linux: 5.1-rc7 -> 5.2-rc1 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7888ac6af44..e9cc370f4e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.1-rc7"; - modDirVersion = "5.1.0-rc7"; - extraMeta.branch = "5.1"; + version = "5.2-rc1"; + modDirVersion = "5.2.0-rc1"; + extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "05085j84kn3mf5s2hy8i9jgvnglpr9v918kmc9lmpn5vq7frh9s1"; + sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l"; }; # Should the testing kernels ever be built on Hydra? From 7f65d06c4f6b3e9760926ac65a0f78c700f445b9 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 17 May 2019 12:46:08 +0200 Subject: [PATCH 377/637] firefox: prepare for firefox 67.0 release Firefox now requires `llvm-objdump` during the build phase. The aarch64 patches do no longer apply. So far I am guessing that they have been merged. We should verify that. --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c0cfcf412c5..6e39904d27b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,7 +94,7 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] + ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; preConfigure = '' From f353c0e95873927345b0298b7cc949cc9234cf27 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 20 May 2019 19:09:17 +0200 Subject: [PATCH 378/637] firefox: 66.0.5 -> 67.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 61df0c61fab..ceacf0d41c6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "66.0.5"; + ffversion = "67.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "18bcpbwzhc2fi6cqhxhh6jiw5akhzr7qqs6s8irjbvh7q8f3z2n046vrlvpblhbkc2kv1n0s14n49yzv432adqwa9qi8d57jnxyfqkf"; + sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051"; }; patches = [ From 394b43f1fd8a937798c99a9eb4a380f479c39d5b Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Wed, 15 May 2019 21:52:42 +0300 Subject: [PATCH 379/637] libfprint: added option to use fork for Lenovo ThinkPad --- .../libraries/libfprint/default.nix | 29 ++++++++++++++----- pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 3f3062e3c08..410496a7bb7 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 -, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 +, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }: + +assert thinkpad -> openssl != null; stdenv.mkDerivation rec { - name = "libfprint-${version}"; + pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.99.0"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; - sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; - }; + src = { + libfprint-thinkpad = + fetchFromGitHub { + owner = "3v1n0"; + repo = "libfprint"; + rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; + sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; + }; + libfprint = fetchurl { + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; + }; + }.${pname}; + + buildInputs = [ libusb pixman glib nss gtk3 ] + ++ stdenv.lib.optional thinkpad openssl; - buildInputs = [ libusb pixman glib nss gtk3 ]; nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2dab6fdba3..f9655363a90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11299,6 +11299,9 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; + libfprint-thinkpad = libfprint.override { + thinkpad = true; + }; libfpx = callPackage ../development/libraries/libfpx { }; From 432944cdb375a19493970010a77146711c02e753 Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Wed, 15 May 2019 23:56:58 +0300 Subject: [PATCH 380/637] fprintd: added option to use fork for Lenovo ThinkPad --- nixos/modules/services/security/fprintd.nix | 12 +++++++++++- pkgs/tools/security/fprintd/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 9ed7f2a2efd..8ece1ca1901 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -25,6 +25,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.fprintd; + defaultText = "pkgs.fprintd"; + example = "pkgs.fprintd-thinkpad"; + description = '' + fprintd package to use. + ''; + }; + }; }; @@ -38,7 +48,7 @@ in environment.systemPackages = [ pkgs.fprintd ]; - systemd.packages = [ pkgs.fprintd ]; + systemd.packages = [ cfg.package ]; }; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 65eec89a09f..b43be1a6924 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }: +{ thinkpad ? false +, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null +, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-${version}"; + pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.8.1"; src = fetchurl { @@ -10,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; }; - buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; + buildInputs = [ glib dbus-glib polkit nss pam systemd ] + ++ stdenv.lib.optional thinkpad libfprint-thinkpad + ++ stdenv.lib.optional (!thinkpad) libfprint; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9655363a90..fb8c8be60a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,6 +2981,9 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; + fprintd-thinkpad = fprintd.override { + thinkpad = true; + }; franz = callPackage ../applications/networking/instant-messengers/franz { }; From e53479a048a005453b4bd6661f5f078ee91fc00b Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 17:13:27 +0200 Subject: [PATCH 381/637] perlPackages.StringRandom: init at 0.30 Co-authored-by: Robin Gloster --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2726810819..d20f4cf920b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14141,6 +14141,14 @@ let }; }; + StringRandom = buildPerlModule rec { + name = "String-Random-0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; + }; + }; + StringRewritePrefix = buildPerlPackage { name = "String-RewritePrefix-0.007"; src = fetchurl { From 0e32aedbd31f24feba80716396f24a4c37bc197c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Oct 2017 16:07:44 +0200 Subject: [PATCH 382/637] perlPackages.NetWhoisIP: init at 1.19 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d20f4cf920b..ce43433c383 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11658,6 +11658,22 @@ let }; }; + NetWhoisIP = buildPerlPackage rec { + name = "Net-Whois-IP-1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BS/BSCHMITZ/${name}.tar.gz"; + sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; + }; + + propagatedBuildInputs = [ RegexpIPv6 LWPProtocolhttps ]; + doCheck = false; + + # https://rt.cpan.org/Public/Bug/Display.html?id=99377 + postPatch = '' + substituteInPlace IP.pm --replace " AutoLoader" "" + ''; + }; + NetWorks = buildPerlPackage { name = "Net-Works-0.22"; src = fetchurl { From 870b6e06d322114cc9fb6071cebf3c708a86070f Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 17:26:08 +0200 Subject: [PATCH 383/637] perlPackages.NetNetmask: init at 1.9104 Co-authored-by: Robin Gloster --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ce43433c383..1439ab71619 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11426,6 +11426,18 @@ let }; }; + NetNetmask = buildPerlPackage rec { + name = "Net-Netmask-1.9104"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMASLAK/${name}.tar.gz"; + sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; + }; + buildInputs = [ Test2Suite TestUseAllModules ]; + meta = { + description = "Parse, manipulate and lookup IP network blocks"; + }; + }; + NetOAuth = buildPerlModule { name = "Net-OAuth-0.28"; src = fetchurl { From c29a5296189d0bd60a3fa01853828ae4d2a5ddad Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 17:34:47 +0200 Subject: [PATCH 384/637] dnsenum: init at 1.2.4.2 Co-authored-by: Robin Gloster --- pkgs/tools/security/dnsenum/default.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/dnsenum/default.nix diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/tools/security/dnsenum/default.nix new file mode 100644 index 00000000000..d764e8a71ae --- /dev/null +++ b/pkgs/tools/security/dnsenum/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: + +stdenv.mkDerivation rec { + pname = "dnsenum"; + version = "1.2.4.2"; + + src = fetchFromGitHub { + owner = "fwaeytens"; + repo = pname; + rev = version; + sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v"; + }; + + propagatedBuildInputs = with perlPackages; [ + perl NetDNS NetIP NetNetmask StringRandom XMLWriter NetWhoisIP WWWMechanize + ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -vD dnsenum.pl $out/bin/dnsenum + install -vD dns.txt -t $out/share + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/fwaeytens/dnsenum"; + description = "A tool to enumerate DNS information"; + maintainers = with maintainers; [ c0bw3b globin ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 011f472e354..d29110acc9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2437,6 +2437,8 @@ in dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; + dnsenum = callPackage ../tools/security/dnsenum { }; + dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnsperf = callPackage ../tools/networking/dnsperf { }; From 092791c8b1c9794270ea7d3f0029726f829acb70 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 18:03:40 +0200 Subject: [PATCH 385/637] dnsrecon: init at 0.9.1 Co-authored-by: Robin Gloster --- pkgs/tools/security/dnsrecon/default.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/dnsrecon/default.nix diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix new file mode 100644 index 00000000000..06270723f4d --- /dev/null +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "dnsrecon"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "darkoperator"; + repo = pname; + rev = version; + sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy"; + }; + + format = "other"; + + pythonPath = with python3.pkgs; [ + dns netaddr lxml + ]; + + postPatch = '' + substituteInPlace dnsrecon.py \ + --replace "namelist.txt" "../share/namelist.txt" \ + --replace "0.9.0" "${version}" + ''; + + installPhase = '' + runHook preInstall + + install -vD dnsrecon.py $out/bin/dnsrecon + install -vD namelist.txt subdomains-*.txt -t $out/share + install -vd $out/${python3.sitePackages}/ + cp -R lib tools msf_plugin $out/${python3.sitePackages} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "DNS Enumeration Script"; + homepage = "https://github.com/darkoperator/dnsrecon"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ c0bw3b globin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d29110acc9d..cb36d903329 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2443,6 +2443,8 @@ in dnsperf = callPackage ../tools/networking/dnsperf { }; + dnsrecon = callPackage ../tools/security/dnsrecon { }; + dnstop = callPackage ../tools/networking/dnstop { }; dhcp = callPackage ../tools/networking/dhcp { }; From 78d09f168a881f3c13da9a4c20dcd93296a4d335 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 18:45:17 +0200 Subject: [PATCH 386/637] fierce: init at 1.3.0 Co-authored-by: Robin Gloster --- pkgs/tools/security/fierce/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/security/fierce/default.nix diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix new file mode 100644 index 00000000000..abc1bacd212 --- /dev/null +++ b/pkgs/tools/security/fierce/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "fierce"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mschwager"; + repo = pname; + rev = version; + sha256 = "0cdp9rpabazyfnks30rsf3qfdi40z1bkspxk4ds9bm82kpq33jxy"; + }; + + propagatedBuildInputs = [ python3.pkgs.dns ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mschwager/fierce"; + description = "DNS reconnaissance tool for locating non-contiguous IP space"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ c0bw3b globin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb36d903329..8ae05a4f7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2879,6 +2879,8 @@ in fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fierce = callPackage ../tools/security/fierce { }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { From 17815ba47ecaf3ad9c78708dc9b8a50d22f32fab Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 19 May 2019 18:50:11 +0200 Subject: [PATCH 387/637] theharvester: 2.7.1 -> 3.0.6 --- pkgs/tools/security/theharvester/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 0c0cf29f977..4a1e92e6104 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -1,21 +1,20 @@ -{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, makeWrapper, python3Packages }: stdenv.mkDerivation rec { pname = "theHarvester"; - version = "2.7.1"; - name = "${pname}-${version}"; + version = "3.0.6"; src = fetchFromGitHub { owner = "laramies"; - repo = "${pname}"; - rev = "25553762d2d93a39083593adb08a34d5f5142c60"; - sha256 = "0gnm598y6paz0knwvdv1cx0w6ngdbbpzkdark3q5vs66yajv24w4"; + repo = pname; + rev = version; + sha256 = "0f33a7sfb5ih21yp1wspb03fxsls1m14yizgrw0srfirm2a6aa0c"; }; nativeBuildInputs = [ makeWrapper ]; # add dependencies - propagatedBuildInputs = [ python2Packages.requests ]; + propagatedBuildInputs = with python3Packages; [ requests beautifulsoup4 plotly ]; installPhase = '' # create dirs From 73b959d1b19f184fdfad0f756407a8de6b3f11fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 20 May 2019 20:48:45 +0200 Subject: [PATCH 388/637] ubridge: 0.9.15 -> 0.9.16 --- pkgs/tools/networking/ubridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index 715a480e28d..f6afddaba38 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ubridge-${version}"; - version = "0.9.15"; + version = "0.9.16"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "0fl07zyall04map6v2l1bclqh8y3rrhsx61s2v0sr8b00j201jg4"; + sha256 = "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"; }; postPatch = '' From a43fb1def6fe72fcc751eecc124714bba6e36221 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 20 May 2019 21:06:33 +0200 Subject: [PATCH 389/637] androidStudioPackages.{beta,dev,canary}: 3.5.0.13 -> 3.5.0.14 --- 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 d53ccb1fdbd..af5adca20ed 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = latestVersion; latestVersion = { # canary & dev - version = "3.5.0.13"; # "Android Studio 3.5 Beta 1" - build = "191.5529924"; - sha256Hash = "0i710n2wr0a8lvxf1mg6a5pmdh1l72wa0hwyricyixi0mylwwc6l"; + version = "3.5.0.14"; # "Android Studio 3.5 Beta 2" + build = "191.5549111"; + sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf"; }; in rec { # Attributes are named by their corresponding release channels From 3a2ccb570dedd7eb17226c01078b981a5129c7ea Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Mon, 20 May 2019 21:51:33 +0200 Subject: [PATCH 390/637] Revert "pstree: remove and alias to psmisc" This reverts commit 4f8bf685f83c2e3ed15840e39578fed479257c17. Reason: psmisc is Linux-platforms only --- pkgs/applications/misc/pstree/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/pstree/default.nix diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix new file mode 100644 index 00000000000..3cd52af6d32 --- /dev/null +++ b/pkgs/applications/misc/pstree/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pstree-2.39"; + + src = fetchurl { + urls = [ + "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" + "https://distfiles.macports.org/pstree/${name}.tar.gz" + ]; + sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; + }; + + unpackPhase = "unpackFile \$src; sourceRoot=."; + + buildPhase = "pwd; $CC -o pstree pstree.c"; + installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; + + meta = { + description = "Show the set of running processes as a tree"; + license = "GPL"; + maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 52464121ee5..628e19ce82b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -256,7 +256,6 @@ mapAliases ({ # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; procps-ng = procps; # added 2018-06-08 - pstree = psmisc; # added 2019-05-05 pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qt_gstreamer = qt-gstreamer; # added 2017-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de6f3e83283..28775aca01b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19572,6 +19572,8 @@ in psol = callPackage ../development/libraries/psol { }; + pstree = callPackage ../applications/misc/pstree { }; + ptask = callPackage ../applications/misc/ptask { }; pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; From ea7052b17f2c2d517bc4a43261935d9ad4b2f289 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 20 May 2019 21:44:46 +0200 Subject: [PATCH 391/637] monkeysphere: 0.43 -> 0.44 --- pkgs/tools/security/monkeysphere/default.nix | 12 +++++------ .../security/monkeysphere/monkeysphere.patch | 21 ------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index af507dbf993..ed1cda8030f 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -2,7 +2,7 @@ , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg, coreutils # For the tests: -, bash, openssh, which, socat, cpio, hexdump, openssl +, bash, openssh, which, socat, cpio, hexdump, procps, openssl }: let @@ -14,14 +14,14 @@ let }); in stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.43"; + version = "0.44"; # The patched OpenSSH binary MUST NOT be used (except in the check phase): disallowedRequisites = [ opensshUnsafe ]; src = fetchurl { url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; - sha256 = "18i7qpvp5qb7mmd0z5rqai550rya9l3nbsq2hamwkl3smqsjdqc0"; + sha256 = "1ah7hy8r9gj96pni8azzjb85454qky5l17m3pqn37854l6grgika"; }; patches = [ ./monkeysphere.patch ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] ++ stdenv.lib.optional doCheck - ([ gnupg opensshUnsafe which socat cpio hexdump lockfileProgs ] ++ + ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); makeFlags = '' @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { postFixup = let wrapperArgs = runtimeDeps: "--prefix PERL5LIB : " - + (with perlPackages; makePerlPath [ + + (with perlPackages; makePerlPath [ # Optional (only required for keytrans) CryptOpenSSLRSA CryptOpenSSLBignum ]) @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] - + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ] + + wrapPrograms [ gnupg lockfileProgs ] [ "monkeysphere" ] + '' # These 4 programs depend on the program name ($0): for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index 0a05635d6a8..8cdd85017b9 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -10,15 +10,6 @@ diff --git a/Makefile b/Makefile -e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \ -e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' -diff --git a/src/share/checkperms b/src/share/checkperms ---- a/src/share/checkperms -+++ b/src/share/checkperms -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/usr/bin/perl - - # checkperms: ensure as best we can that a given file can only be - # modified by the given user (or the superuser, naturally). This diff --git a/src/share/keytrans b/src/share/keytrans --- a/src/share/keytrans +++ b/src/share/keytrans @@ -28,17 +19,5 @@ diff --git a/src/share/keytrans b/src/share/keytrans # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -diff --git a/tests/basic b/tests/basic ---- a/tests/basic -+++ b/tests/basic -@@ -343,7 +340,7 @@ if [ "$MONKEYSPHERE_TEST_USE_ED25519" = true ]; then - echo "### generating ed25519 key for testuser..." - # from the imported secret key - USER_FPR=8A4B353B4CBA6F30625498BAE00B5EEEBA79B482 -- gpg --quick-add-key "$USER_FPR" ed25519 auth 2d -+ gpg --no-tty --quick-add-key "$USER_FPR" ed25519 auth 2d - else - echo "### generating standard monkeysphere key for testuser..." - monkeysphere gen-subkey -- 2.16.3 From 6c82bfb725d2d2c6e5137829cf33c2d79e360ff5 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Mon, 20 May 2019 21:54:22 +0200 Subject: [PATCH 392/637] pstree: refresh sources Previous first URL was gone ; + refactor + enhance meta (homepage, license, maintainer) + define priority wrt psmisc --- pkgs/applications/misc/pstree/default.nix | 33 ++++++++++++++++------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 3cd52af6d32..7aaa8a8c38d 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,25 +1,38 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pstree-2.39"; + pname = "pstree"; + version = "2.39"; src = fetchurl { urls = [ - "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - "https://distfiles.macports.org/pstree/${name}.tar.gz" + "https://distfiles.macports.org/${pname}/${pname}-${version}.tar.gz" + "https://fossies.org/linux/misc/${pname}-${version}.tar.gz" + "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz" ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; - unpackPhase = "unpackFile \$src; sourceRoot=."; + sourceRoot = "."; + buildPhase = '' + runHook preBuild + $CC $NIX_CFLAGS -o pstree pstree.c + runHook postBuild + ''; - buildPhase = "pwd; $CC -o pstree pstree.c"; - installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; + installPhase = '' + runHook preInstall + install -Dm0555 ${pname} -t $out/bin + install -Dm0444 ${pname}.1 -t $out/share/man/man1 + runHook postInstall + ''; - meta = { + meta = with stdenv.lib; { description = "Show the set of running processes as a tree"; - license = "GPL"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + homepage = "http://www.thp.uni-duisburg.de/pstree/"; + license = licenses.gpl2; + maintainers = [ maintainers.c0bw3b ]; + platforms = platforms.unix; + priority = 5; # Lower than psmisc also providing pstree on Linux platforms }; } From ac37e639ae8bd2b747939c42d02933196ff9847d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 20 May 2019 19:32:55 -0400 Subject: [PATCH 393/637] gnome3.eog: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/eog/blob/3.32.2/NEWS --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 7fd092c1efa..5c896ec01fc 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "165axw63c2l5qk5k2xs7g9d97xnxf5a4br0hdb8s3bpv7lf5nw8q"; + sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; From 4ee5fff97ccc432e0f8bbdc616d7a7b169fbbbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Apr 2019 23:31:21 +0200 Subject: [PATCH 394/637] hotspot: 1.0.0 -> 1.2.0 --- .../development/tools/analysis/hotspot/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 6544046b16d..89ffbff3db7 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -5,24 +5,24 @@ fetchFromGitHub, kconfigwidgets, ki18n, + kio, kitemmodels, kitemviews, + kwindowsystem, libelf, qtbase, threadweaver, }: stdenv.mkDerivation rec { - name = "hotspot-${version}"; - version = "1.0.0"; # don't forget to bump `rev` below when you change this + pname = "hotspot"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; - # TODO: For some reason, `fetchSubmodules` doesn't work when using `rev = "v${version}";`, - # so using an explicit commit instead. See #15559 - rev = "352687bf620529e9887616651f123f922cb421a4"; - sha256 = "09ly15yafpk31p3w7h2xixf1xdmx803w9fyb2aq7mhmc7pcxqjsx"; + rev = "v${version}"; + sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; fetchSubmodules = true; }; @@ -32,8 +32,10 @@ stdenv.mkDerivation rec { extra-cmake-modules kconfigwidgets ki18n + kio kitemmodels kitemviews + kwindowsystem libelf qtbase threadweaver From 463f25226c54515e7b0a122981bfc48fe9bd2e54 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 May 2019 19:00:00 -0500 Subject: [PATCH 395/637] pythonPackages.fire: fix python 3.7 build --- pkgs/development/python-modules/fire/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 70538407f2e..c44083e4c29 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, hypothesis, mock +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock , python-Levenshtein, pytest }: buildPythonPackage rec { @@ -20,6 +20,13 @@ buildPythonPackage rec { py.test ''; + patches = [ + # Add Python 3.7 support. Remove with the next release + (fetchpatch { + url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch"; + sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0"; + }) + ]; meta = with stdenv.lib; { description = "A library for automatically generating command line interfaces"; From 5ac417126edaa2e26abd6bb38625f320677e1cce Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Apr 2019 23:23:59 -0500 Subject: [PATCH 396/637] kdepim-runtime: qca-qt5, qtnetworkauth --- pkgs/applications/kde/kdepim-runtime.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index fa090d50354..19aba8dcb3a 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -5,7 +5,8 @@ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns + pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns, + qca-qt5, qtnetworkauth }: mkDerivation { @@ -19,7 +20,7 @@ mkDerivation { akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtspeech qtxmlpatterns + pimcommon libkgapi qtspeech qtxmlpatterns qca-qt5 qtnetworkauth ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; From dd80af47564c998d3e21cf4e35850ad901a7afcd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 22 Apr 2019 17:17:16 -0400 Subject: [PATCH 397/637] rttr: init at 0.9.6 --- pkgs/development/libraries/rttr/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/rttr/default.nix diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix new file mode 100644 index 00000000000..74b8e381f93 --- /dev/null +++ b/pkgs/development/libraries/rttr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, ninja }: + +stdenv.mkDerivation rec { + pname = "rttr"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "${pname}org"; + repo = pname; + rev = "v${version}"; + sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_UNIT_TESTS=OFF" + "-DBUILD_PACKAGE=OFF" + ]; + + meta = with stdenv.lib; { + description = "C++ Reflection Library"; + homepage = https://www.rttr.org; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c923ff2d9b4..9a0ef80606d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12932,6 +12932,8 @@ in rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rttr = callPackage ../development/libraries/rttr { }; + rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; From ca74410fedd973f4df70d7f58b93d21fa2c358ce Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 22 Apr 2019 17:25:18 -0400 Subject: [PATCH 398/637] kdenlive: add missing deps --- pkgs/applications/kde/kdenlive.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 9da12b248c5..a42210e6e40 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -25,6 +25,9 @@ , qtquickcontrols , qtscript , qtwebkit +, rttr +, kpurpose +, kdeclarative }: mkDerivation { @@ -57,6 +60,9 @@ mkDerivation { shared-mime-info libv4l ffmpeg + rttr + kpurpose + kdeclarative ]; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. From 895e78c9bc51d63b5cb0b9a49fd6b0a60bb5d497 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 23 Apr 2019 11:05:38 +0200 Subject: [PATCH 399/637] qt5.qtnetworkauth: init --- pkgs/development/libraries/qt-5/5.11/default.nix | 1 + pkgs/development/libraries/qt-5/5.12/default.nix | 1 + pkgs/development/libraries/qt-5/5.9/default.nix | 1 + pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix | 7 +++++++ 4 files changed, 10 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 0014a1452aa..f43329d3553 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -106,6 +106,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index d84596bd054..ef0cf97a428 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -110,6 +110,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index d1e9af29926..9baca8124bd 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -108,6 +108,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix new file mode 100644 index 00000000000..3d36f30b9ee --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase }: + +qtModule { + name = "qtnetworkauth"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; +} From 1443dc6abe219c5d92943a2f5705ae0d0af5666d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Apr 2019 00:16:38 -0500 Subject: [PATCH 400/637] kdepim-runtime: disable facebook, fix build --- pkgs/applications/kde/kdepim-runtime.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 19aba8dcb3a..f56fd0b999e 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -24,4 +24,9 @@ mkDerivation { ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; + + # build failure, not worth fixing, rc anyway + postPatch = '' + sed -i resources/CMakeLists.txt -e '/facebook/d' + ''; } From 0cfb078b377b9c18312eb72ee7c145ecd1d22013 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 22 Apr 2019 09:32:37 +0200 Subject: [PATCH 401/637] kcalc: add kcrash dependency --- pkgs/applications/kde/kcalc.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 2d902c220af..3cb89cb4daa 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications, - kxmlgui, + gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit, + knotifications, kxmlgui, }: mkDerivation { @@ -13,6 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui + gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications + kxmlgui ]; } From ec4448a37676aba5ef50ec89a883f4acaefd81ae Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Thu, 2 May 2019 22:35:32 +0200 Subject: [PATCH 402/637] kmail: fix compilation --- pkgs/applications/kde/kmail.nix | 1 + pkgs/applications/kde/kmail.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/kde/kmail.patch diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index acb200c5970..a58b3b8c45d 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -26,4 +26,5 @@ mkDerivation { libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; + patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch new file mode 100644 index 00000000000..71a23be2d83 --- /dev/null +++ b/pkgs/applications/kde/kmail.patch @@ -0,0 +1,24 @@ +diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt +index 48ed076..9c56896 100644 +--- a/agents/archivemailagent/CMakeLists.txt ++++ b/agents/archivemailagent/CMakeLists.txt +@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) + add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) + target_link_libraries(archivemailagent + KF5::MailCommon ++ KF5::Libkdepim + KF5::I18n + KF5::Notifications + KF5::IconThemes +diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt +index a56b730..83604cf 100644 +--- a/agents/followupreminderagent/CMakeLists.txt ++++ b/agents/followupreminderagent/CMakeLists.txt +@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent + KF5::AkonadiMime + KF5::AkonadiAgentBase + KF5::DBusAddons ++ KF5::FollowupReminder + KF5::XmlGui + KF5::KIOWidgets + KF5::Notifications From 044cd208b7507afc4d086493de392c35dfb88298 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 22 Apr 2019 16:18:49 +0200 Subject: [PATCH 403/637] kdepim-runtime: replace sed by a proper patch - remove unused qca-qt5 --- pkgs/applications/kde/default.nix | 2 +- .../kde/kdepim-runtime/00-no-facebook.patch | 12 ++++++++++++ .../default.nix} | 13 ++++--------- pkgs/applications/kde/kdepim-runtime/series | 1 + .../libraries/qt-5/modules/qtnetworkauth.nix | 1 - 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch rename pkgs/applications/kde/{kdepim-runtime.nix => kdepim-runtime/default.nix} (73%) create mode 100644 pkgs/applications/kde/kdepim-runtime/series diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 239d71fdfaf..a2e10ee2c02 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,7 +102,7 @@ let kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; - kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch new file mode 100644 index 00000000000..46722ff5fba --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch @@ -0,0 +1,12 @@ +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index 99f7dbf..03e953b 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -45,7 +45,6 @@ add_subdirectory( imap ) + if (Libkolabxml_FOUND) + add_subdirectory( kolab ) + endif() +-add_subdirectory( facebook ) + add_subdirectory( maildir ) + + add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime/default.nix similarity index 73% rename from pkgs/applications/kde/kdepim-runtime.nix rename to pkgs/applications/kde/kdepim-runtime/default.nix index f56fd0b999e..6d7bd0daa96 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, copyPathsToStore, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns, - qca-qt5, qtnetworkauth + pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, }: mkDerivation { @@ -15,18 +14,14 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtspeech qtxmlpatterns qca-qt5 qtnetworkauth + pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; - - # build failure, not worth fixing, rc anyway - postPatch = '' - sed -i resources/CMakeLists.txt -e '/facebook/d' - ''; } diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series new file mode 100644 index 00000000000..cc3e104775f --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/series @@ -0,0 +1 @@ +00-no-facebook.patch diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 3d36f30b9ee..e6ef428cc3c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -3,5 +3,4 @@ qtModule { name = "qtnetworkauth"; qtInputs = [ qtbase ]; - outputs = [ "out" "dev" "bin" ]; } From 265ab92415496ceb3f14cdcab092eacc70613667 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 17 May 2019 10:11:25 +0200 Subject: [PATCH 404/637] kde_applications: 19.04.0 -> 19.04.1 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1720 ++++++++++++++++---------------- 2 files changed, 861 insertions(+), 861 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index c81ea2398b0..bd96cb96693 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.04.0/ ) +WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 7780e74e7e1..43deb08c39f 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-19.04.0.tar.xz"; - sha256 = "c0a2c4259b51293d21487cfe2295df6e8dcfb7ab50eb1a698f531dc7d3253e9a"; - name = "akonadi-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz"; + sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc"; + name = "akonadi-19.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-calendar-19.04.0.tar.xz"; - sha256 = "5a2897a1e96897159a3e2980f407c4c225434efd45167ad699a14aaa2ec445fd"; - name = "akonadi-calendar-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz"; + sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48"; + name = "akonadi-calendar-19.04.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-calendar-tools-19.04.0.tar.xz"; - sha256 = "f9869574d880c53bfb87319348d75d8169ffb38bfdeb3b6066f25074409321ef"; - name = "akonadi-calendar-tools-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz"; + sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531"; + name = "akonadi-calendar-tools-19.04.1.tar.xz"; }; }; akonadiconsole = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadiconsole-19.04.0.tar.xz"; - sha256 = "5118720b6e0ecdf689c7b7f005f732386d0b7a6258cc11fb44fcaac5cc9518a8"; - name = "akonadiconsole-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz"; + sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262"; + name = "akonadiconsole-19.04.1.tar.xz"; }; }; akonadi-contacts = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-contacts-19.04.0.tar.xz"; - sha256 = "65dd20c467daf8d6107a1856c7f112eb937438b5884fe62a09a1763214a7442a"; - name = "akonadi-contacts-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz"; + sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc"; + name = "akonadi-contacts-19.04.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-import-wizard-19.04.0.tar.xz"; - sha256 = "541b858278d56a5d41858bfa644656d4f04bf6e5a52ce8014d207d64812d6d22"; - name = "akonadi-import-wizard-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz"; + sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7"; + name = "akonadi-import-wizard-19.04.1.tar.xz"; }; }; akonadi-mime = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-mime-19.04.0.tar.xz"; - sha256 = "b06ca4140b10548b9aecd188bd9b72405af2f4097c80e9b4e9aa3e863750b6da"; - name = "akonadi-mime-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz"; + sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8"; + name = "akonadi-mime-19.04.1.tar.xz"; }; }; akonadi-notes = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-notes-19.04.0.tar.xz"; - sha256 = "a9aa05ca2b5f846fed51e4c32907eedc6893a40ab3b9d4832e11bab118664e5f"; - name = "akonadi-notes-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz"; + sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277"; + name = "akonadi-notes-19.04.1.tar.xz"; }; }; akonadi-search = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akonadi-search-19.04.0.tar.xz"; - sha256 = "6046a540ace526cbb8c0909762ad333426266afbf58a59ecc71cb923298e84bb"; - name = "akonadi-search-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz"; + sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6"; + name = "akonadi-search-19.04.1.tar.xz"; }; }; akregator = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/akregator-19.04.0.tar.xz"; - sha256 = "5104b0b66ac3917c7cb78f4a6cca952f7e4360cfcd0aa7ce1575d0551470fcee"; - name = "akregator-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz"; + sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1"; + name = "akregator-19.04.1.tar.xz"; }; }; analitza = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/analitza-19.04.0.tar.xz"; - sha256 = "ac8bf7d66f8a2fc7198238f23d82efd1021943ffe8bd5915808e31b800a802f6"; - name = "analitza-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz"; + sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381"; + name = "analitza-19.04.1.tar.xz"; }; }; ark = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ark-19.04.0.tar.xz"; - sha256 = "35e8e516a8554e086264d9a9a4fa66c2b47fa227eb9e512a1d0d24172cd07a84"; - name = "ark-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz"; + sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6"; + name = "ark-19.04.1.tar.xz"; }; }; artikulate = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/artikulate-19.04.0.tar.xz"; - sha256 = "527ebdb2db6eab3e05810c5e56d53611d80bd23508563457b459e4e32a68ef08"; - name = "artikulate-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz"; + sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432"; + name = "artikulate-19.04.1.tar.xz"; }; }; audiocd-kio = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/audiocd-kio-19.04.0.tar.xz"; - sha256 = "0f347be9c873eb75144d2b8f3f2e28d2e52be4c1a0f59a19be99edd867f17371"; - name = "audiocd-kio-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz"; + sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98"; + name = "audiocd-kio-19.04.1.tar.xz"; }; }; baloo-widgets = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/baloo-widgets-19.04.0.tar.xz"; - sha256 = "ab3d83bb1f2007620273d1a3eb580d821e0655aaf7e3efd2dc81087a24d1c275"; - name = "baloo-widgets-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz"; + sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6"; + name = "baloo-widgets-19.04.1.tar.xz"; }; }; blinken = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/blinken-19.04.0.tar.xz"; - sha256 = "5d470c7f0d232ea01c99fbe1ed08e103291e80c3cfe74e245aba1c2009573eed"; - name = "blinken-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz"; + sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca"; + name = "blinken-19.04.1.tar.xz"; }; }; bomber = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/bomber-19.04.0.tar.xz"; - sha256 = "4f82f3f42aff36de837f7c9ddc5986f6c73cb50de122b46320dba0a0b03f9a7d"; - name = "bomber-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz"; + sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe"; + name = "bomber-19.04.1.tar.xz"; }; }; bovo = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/bovo-19.04.0.tar.xz"; - sha256 = "2cfccb09087a32d8a75f6dd763168e2ef5928f55b58505a542bc36fdac8e141e"; - name = "bovo-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz"; + sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763"; + name = "bovo-19.04.1.tar.xz"; }; }; calendarsupport = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/calendarsupport-19.04.0.tar.xz"; - sha256 = "d767f077a9d41a9c6d266c4b5fe7bedd6f4eb7b71824e7544cf3a1df11ce362f"; - name = "calendarsupport-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz"; + sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535"; + name = "calendarsupport-19.04.1.tar.xz"; }; }; cantor = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/cantor-19.04.0.tar.xz"; - sha256 = "ef0381a65cd2f3a3bb68a7211140077fc1a9bf31ed5302fa368fd874c8441bf4"; - name = "cantor-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz"; + sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1"; + name = "cantor-19.04.1.tar.xz"; }; }; cervisia = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/cervisia-19.04.0.tar.xz"; - sha256 = "011d9b38a82508ae73328dc56723af11fa8403c0dcf5b7d7703118d79f2ad8f4"; - name = "cervisia-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz"; + sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b"; + name = "cervisia-19.04.1.tar.xz"; }; }; dolphin = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/dolphin-19.04.0.tar.xz"; - sha256 = "f3f45b9048c283252067eebfad8c6e1efc6bc64d43fcba78b933850ea4762375"; - name = "dolphin-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz"; + sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a"; + name = "dolphin-19.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/dolphin-plugins-19.04.0.tar.xz"; - sha256 = "c2898e0a64d5a9eab2a4bd661694b75805adfd0a925f1a21f894892264f96469"; - name = "dolphin-plugins-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz"; + sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105"; + name = "dolphin-plugins-19.04.1.tar.xz"; }; }; dragon = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/dragon-19.04.0.tar.xz"; - sha256 = "42bde9f6a4f3dfe7a6b2bfa35502474c2866e2649695302d602a97f00842fcf2"; - name = "dragon-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz"; + sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8"; + name = "dragon-19.04.1.tar.xz"; }; }; eventviews = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/eventviews-19.04.0.tar.xz"; - sha256 = "ed34f228012ad2d45b0f07da469633118f35c28b1ddc7157149f4a5ab999500c"; - name = "eventviews-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz"; + sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763"; + name = "eventviews-19.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ffmpegthumbs-19.04.0.tar.xz"; - sha256 = "6b96cea0c142651cb586eb40d88792329f8da9a777d9a457ba76d0e94ddf4995"; - name = "ffmpegthumbs-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz"; + sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae"; + name = "ffmpegthumbs-19.04.1.tar.xz"; }; }; filelight = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/filelight-19.04.0.tar.xz"; - sha256 = "22eaa8f0e9e69652240554687b2cecb55449e67caac6055c2d868f3089d835ad"; - name = "filelight-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz"; + sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd"; + name = "filelight-19.04.1.tar.xz"; }; }; granatier = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/granatier-19.04.0.tar.xz"; - sha256 = "d83e91a5056e4caf1e522921025cb79355c0c2d53b7f0e98444d37291d80d63a"; - name = "granatier-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz"; + sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22"; + name = "granatier-19.04.1.tar.xz"; }; }; grantlee-editor = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/grantlee-editor-19.04.0.tar.xz"; - sha256 = "ac888f2f2ccd4b289deac1d2df4415124e14bf183db1ff1088e88fa782f9f342"; - name = "grantlee-editor-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz"; + sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a"; + name = "grantlee-editor-19.04.1.tar.xz"; }; }; grantleetheme = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/grantleetheme-19.04.0.tar.xz"; - sha256 = "6896a7e1db662bea03b6bdd9f92214b5fa50dfbebbbaa7b3156ddb87ccd55a3e"; - name = "grantleetheme-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz"; + sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b"; + name = "grantleetheme-19.04.1.tar.xz"; }; }; gwenview = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/gwenview-19.04.0.tar.xz"; - sha256 = "c7d422bddf031fa9d5a23459c65ea6dbb5919e964cc194178a864ee98912b46d"; - name = "gwenview-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz"; + sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c"; + name = "gwenview-19.04.1.tar.xz"; }; }; incidenceeditor = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/incidenceeditor-19.04.0.tar.xz"; - sha256 = "c34fd55acd2f92705e43628fd0c9c4a550c73d45f30beba71dc75698143cbd5f"; - name = "incidenceeditor-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz"; + sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58"; + name = "incidenceeditor-19.04.1.tar.xz"; }; }; juk = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/juk-19.04.0.tar.xz"; - sha256 = "952366e14526701109e83c1979c2a7b3dfdf3c054ecb86c9b5a6cf9825196f60"; - name = "juk-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz"; + sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51"; + name = "juk-19.04.1.tar.xz"; }; }; k3b = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/k3b-19.04.0.tar.xz"; - sha256 = "ab0293d0dab2048dcacd4fc54ee2e12d2f55adcecde7cd02e4c31ffd5917ee39"; - name = "k3b-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz"; + sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942"; + name = "k3b-19.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kaccounts-integration-19.04.0.tar.xz"; - sha256 = "d7b257f6b7278361690b2c1d948c92bdb8b14f741ce96ef35f37c8eea3feb687"; - name = "kaccounts-integration-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz"; + sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433"; + name = "kaccounts-integration-19.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kaccounts-providers-19.04.0.tar.xz"; - sha256 = "4eb74ef042c30ea44f5391f8798d9ceca44d46bf46480355160af61bcb6236d7"; - name = "kaccounts-providers-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz"; + sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011"; + name = "kaccounts-providers-19.04.1.tar.xz"; }; }; kaddressbook = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kaddressbook-19.04.0.tar.xz"; - sha256 = "821708c0a33063de050682c7768faeb51a467de9c4314901761449c09a8a3265"; - name = "kaddressbook-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz"; + sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd"; + name = "kaddressbook-19.04.1.tar.xz"; }; }; kajongg = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kajongg-19.04.0.tar.xz"; - sha256 = "832e76252321900f3bb3d3a96bb9f9a93235260803621c06d112b7cc48bd1555"; - name = "kajongg-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz"; + sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475"; + name = "kajongg-19.04.1.tar.xz"; }; }; kalarm = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kalarm-19.04.0.tar.xz"; - sha256 = "ed8f656e4aebb78d78f068ccde605489090ed0467452629784472b685fae331a"; - name = "kalarm-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz"; + sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd"; + name = "kalarm-19.04.1.tar.xz"; }; }; kalarmcal = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kalarmcal-19.04.0.tar.xz"; - sha256 = "ec0790d2b04bcd3a37a221bdbf4a10f94ff7dd8ac0228e773ce9fac14bbebf6e"; - name = "kalarmcal-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz"; + sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646"; + name = "kalarmcal-19.04.1.tar.xz"; }; }; kalgebra = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kalgebra-19.04.0.tar.xz"; - sha256 = "a46c4fc2b0891183d0a3b859182eef8d49206b81cbf6d2c6ed6d5448f2663a4a"; - name = "kalgebra-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz"; + sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f"; + name = "kalgebra-19.04.1.tar.xz"; }; }; kalzium = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kalzium-19.04.0.tar.xz"; - sha256 = "16fe2873dfad5de78b9a07a4c528e8ac747a54eced9feaa65f1c9fccc23b0d03"; - name = "kalzium-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz"; + sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5"; + name = "kalzium-19.04.1.tar.xz"; }; }; kamera = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kamera-19.04.0.tar.xz"; - sha256 = "b6b5891e886f543140d1ea6775ec1f1f4575e698d34af04fd65acbafa7e42392"; - name = "kamera-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz"; + sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f"; + name = "kamera-19.04.1.tar.xz"; }; }; kamoso = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kamoso-19.04.0.tar.xz"; - sha256 = "200c805ba80a89026edcd02d4cd6d058eff1d537eb3da28807cb2162cc014765"; - name = "kamoso-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz"; + sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796"; + name = "kamoso-19.04.1.tar.xz"; }; }; kanagram = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kanagram-19.04.0.tar.xz"; - sha256 = "dda3ce8211957e016521597a923de92d261e32c31ebf84faa697bd26cf16647c"; - name = "kanagram-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz"; + sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38"; + name = "kanagram-19.04.1.tar.xz"; }; }; kapman = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kapman-19.04.0.tar.xz"; - sha256 = "f77dd3210bcdfb2d424f7a919848e25a4b4ae994d74b59111f352e41c2086324"; - name = "kapman-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz"; + sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400"; + name = "kapman-19.04.1.tar.xz"; }; }; kapptemplate = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kapptemplate-19.04.0.tar.xz"; - sha256 = "7983c4576c6168731958790851d732f8bd4f4313d2cd00a8bf4dd37a4b6a4bb4"; - name = "kapptemplate-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz"; + sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3"; + name = "kapptemplate-19.04.1.tar.xz"; }; }; kate = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kate-19.04.0.tar.xz"; - sha256 = "64c3c312a69d45624e3619309b86de796f67d30a864433a5c24aeb4e299bacc9"; - name = "kate-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz"; + sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f"; + name = "kate-19.04.1.tar.xz"; }; }; katomic = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/katomic-19.04.0.tar.xz"; - sha256 = "ea6e6642e16f985653caf2cd9dd61248e7038fb0246e9af4d4daec20401537a2"; - name = "katomic-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz"; + sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5"; + name = "katomic-19.04.1.tar.xz"; }; }; kbackup = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kbackup-19.04.0.tar.xz"; - sha256 = "84b8f7b05a1812deb128a85aa2d6f1010fb7b2f8cb51aa3771077ef20fd4b4ce"; - name = "kbackup-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz"; + sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f"; + name = "kbackup-19.04.1.tar.xz"; }; }; kblackbox = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kblackbox-19.04.0.tar.xz"; - sha256 = "9363167664b6b4e54325f9691333df912eefa1e19d387c9a2780626914b813f9"; - name = "kblackbox-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz"; + sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431"; + name = "kblackbox-19.04.1.tar.xz"; }; }; kblocks = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kblocks-19.04.0.tar.xz"; - sha256 = "c70a60f3a2e4c8f7756a1f9b1e025f8f91ec83c4f54feedf0ba05eea36b0037e"; - name = "kblocks-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz"; + sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390"; + name = "kblocks-19.04.1.tar.xz"; }; }; kblog = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kblog-19.04.0.tar.xz"; - sha256 = "719c6ce92c006231869dcad84b14e3db7c8b71eff60e234a94353e2ef580d577"; - name = "kblog-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz"; + sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93"; + name = "kblog-19.04.1.tar.xz"; }; }; kbounce = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kbounce-19.04.0.tar.xz"; - sha256 = "cd28d777db8ff1dc1437fb6456c2fdfe8b9005c0cea3ce05337fbf425803834f"; - name = "kbounce-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz"; + sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12"; + name = "kbounce-19.04.1.tar.xz"; }; }; kbreakout = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kbreakout-19.04.0.tar.xz"; - sha256 = "c4aa847def701be288e53ceb27c8c63c34aa527f8e64c91fb007d053b1119db8"; - name = "kbreakout-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz"; + sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad"; + name = "kbreakout-19.04.1.tar.xz"; }; }; kbruch = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kbruch-19.04.0.tar.xz"; - sha256 = "7762c233529b75859ab264bcfd9847acc06889b0ff96183a1af63effd40f3f38"; - name = "kbruch-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz"; + sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00"; + name = "kbruch-19.04.1.tar.xz"; }; }; kcachegrind = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcachegrind-19.04.0.tar.xz"; - sha256 = "7021ac1b133e86692dad92ff8de6a0467c2b488d7e5c2977ee4880c166e088ca"; - name = "kcachegrind-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz"; + sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2"; + name = "kcachegrind-19.04.1.tar.xz"; }; }; kcalc = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcalc-19.04.0.tar.xz"; - sha256 = "0384ebf83c62e74a2412f71f648bad112f91ef3ec6aa64fe55e63fd88a156593"; - name = "kcalc-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz"; + sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91"; + name = "kcalc-19.04.1.tar.xz"; }; }; kcalcore = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcalcore-19.04.0.tar.xz"; - sha256 = "0cdcfebabb9af96650b71ba6361a4557df35144f0b1041f004bff7510c6334b2"; - name = "kcalcore-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz"; + sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9"; + name = "kcalcore-19.04.1.tar.xz"; }; }; kcalutils = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcalutils-19.04.0.tar.xz"; - sha256 = "2841291555bf5ab85390e56b1c6c231bb6f1f5c9cbd12a634491781c3cfd83c8"; - name = "kcalutils-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz"; + sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec"; + name = "kcalutils-19.04.1.tar.xz"; }; }; kcharselect = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcharselect-19.04.0.tar.xz"; - sha256 = "788e6e97bb53216b4777fb19602d823a8e62f9ea25082f545e970a561fb3a78f"; - name = "kcharselect-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz"; + sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec"; + name = "kcharselect-19.04.1.tar.xz"; }; }; kcolorchooser = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcolorchooser-19.04.0.tar.xz"; - sha256 = "8f338ba51349cb056f25266d884ca318d3fd3933288ec96f9f17df6c842bc839"; - name = "kcolorchooser-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz"; + sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a"; + name = "kcolorchooser-19.04.1.tar.xz"; }; }; kcontacts = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcontacts-19.04.0.tar.xz"; - sha256 = "81ad5b3eada7c91b4b7ed09a0a17a146e87b3075925caa3d23b82c2a6f67f5b4"; - name = "kcontacts-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz"; + sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088"; + name = "kcontacts-19.04.1.tar.xz"; }; }; kcron = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kcron-19.04.0.tar.xz"; - sha256 = "58a84503da74d7c0e26ab14c95f92f57f0a9f0c5e1ce0fa4be30276728c8be35"; - name = "kcron-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz"; + sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951"; + name = "kcron-19.04.1.tar.xz"; }; }; kdav = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdav-19.04.0.tar.xz"; - sha256 = "dce315916a993dbff7f7748538da91944b20df3cb6fc042e0d145d53904ff5d9"; - name = "kdav-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz"; + sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737"; + name = "kdav-19.04.1.tar.xz"; }; }; kdebugsettings = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdebugsettings-19.04.0.tar.xz"; - sha256 = "7c06b1c5b1f14c3a67d34fda52494a8d47495b3473ecd9fe03e97cb1c88012c5"; - name = "kdebugsettings-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz"; + sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2"; + name = "kdebugsettings-19.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kde-dev-scripts-19.04.0.tar.xz"; - sha256 = "23b777143c9402bf089cd2f84c5ac363183b74dcf81be8c08d74d5d099e898e5"; - name = "kde-dev-scripts-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz"; + sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2"; + name = "kde-dev-scripts-19.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kde-dev-utils-19.04.0.tar.xz"; - sha256 = "ec2df1ab8b73f19ffc8ec7abeba0577b42d15bc372a19b456a2a04ebb4691031"; - name = "kde-dev-utils-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz"; + sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b"; + name = "kde-dev-utils-19.04.1.tar.xz"; }; }; kdeedu-data = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdeedu-data-19.04.0.tar.xz"; - sha256 = "ddba1b8f78b1614ac8b43b605a9021d611765dea6152e0997c84d4f9b17d9be6"; - name = "kdeedu-data-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz"; + sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30"; + name = "kdeedu-data-19.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdegraphics-mobipocket-19.04.0.tar.xz"; - sha256 = "37db302ed0d70766cf75e052f27150553b875428b68c886fe4d16452edd18939"; - name = "kdegraphics-mobipocket-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz"; + sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821"; + name = "kdegraphics-mobipocket-19.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdegraphics-thumbnailers-19.04.0.tar.xz"; - sha256 = "7af5fb986c493649a1eec9ba881f8b9c06c5d7459f0acc59e7ee7d185bc7ee70"; - name = "kdegraphics-thumbnailers-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz"; + sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e"; + name = "kdegraphics-thumbnailers-19.04.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdenetwork-filesharing-19.04.0.tar.xz"; - sha256 = "a88277659bc1dd5ddfea9dd63c3764a1f31d06235aa07c528c12a63a7605c943"; - name = "kdenetwork-filesharing-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz"; + sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd"; + name = "kdenetwork-filesharing-19.04.1.tar.xz"; }; }; kdenlive = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdenlive-19.04.0.tar.xz"; - sha256 = "274ae17b4376258ef83d810cb33677ca3224e205ea8b69982dd0fc4e5ee5878a"; - name = "kdenlive-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz"; + sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5"; + name = "kdenlive-19.04.1.tar.xz"; }; }; kdepim-addons = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdepim-addons-19.04.0.tar.xz"; - sha256 = "778e946e74f36d368f484226ccc6f9cbd548d1cb2b0c3536e87d9374c64ddd88"; - name = "kdepim-addons-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz"; + sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882"; + name = "kdepim-addons-19.04.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdepim-apps-libs-19.04.0.tar.xz"; - sha256 = "f335f736d854b56bab89814db44761c7e49b35e5266dddee78d22c6465e305c1"; - name = "kdepim-apps-libs-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz"; + sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d"; + name = "kdepim-apps-libs-19.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdepim-runtime-19.04.0.tar.xz"; - sha256 = "944e956d260ba5a735b3c94c6c075f207a9c38bf977ed19507b4dd0f3eaa4993"; - name = "kdepim-runtime-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz"; + sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744"; + name = "kdepim-runtime-19.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdesdk-kioslaves-19.04.0.tar.xz"; - sha256 = "8765a03f1a6930f28f053b920839e673dbc19bd1947900d84324be963147381a"; - name = "kdesdk-kioslaves-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz"; + sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16"; + name = "kdesdk-kioslaves-19.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdesdk-thumbnailers-19.04.0.tar.xz"; - sha256 = "195f539bec6e19de83e07dce117f7cd656f77199c2863a6a5738112d53843243"; - name = "kdesdk-thumbnailers-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz"; + sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442"; + name = "kdesdk-thumbnailers-19.04.1.tar.xz"; }; }; kdf = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdf-19.04.0.tar.xz"; - sha256 = "f1204fddefe5492c860a77ff2c343f9b885625b321a37673763d73510dd469fd"; - name = "kdf-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz"; + sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5"; + name = "kdf-19.04.1.tar.xz"; }; }; kdialog = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdialog-19.04.0.tar.xz"; - sha256 = "2cdd5a65046cfc09246bd1fbc8be818db486e35437f00e20e372d58988f04ace"; - name = "kdialog-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz"; + sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a"; + name = "kdialog-19.04.1.tar.xz"; }; }; kdiamond = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kdiamond-19.04.0.tar.xz"; - sha256 = "121ef36611bf7fe9a7d1d4700622a4cc8a349fe262b7c568026a4da55dfd4b26"; - name = "kdiamond-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz"; + sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3"; + name = "kdiamond-19.04.1.tar.xz"; }; }; keditbookmarks = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/keditbookmarks-19.04.0.tar.xz"; - sha256 = "23770a42aa72eb275b2b5a21f8e2f0959eec112ab048c6d89999ee156cd2ef65"; - name = "keditbookmarks-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz"; + sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db"; + name = "keditbookmarks-19.04.1.tar.xz"; }; }; kfind = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kfind-19.04.0.tar.xz"; - sha256 = "7eec5b096738bb28264bf870bdd85e24f97c62677be2d2a061f6c426ecfc3a47"; - name = "kfind-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz"; + sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd"; + name = "kfind-19.04.1.tar.xz"; }; }; kfloppy = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kfloppy-19.04.0.tar.xz"; - sha256 = "fafa66fddf5fe938b5666ef94ea4a1f41487cb3cc815fa6bc65332ee7574f7e1"; - name = "kfloppy-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz"; + sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75"; + name = "kfloppy-19.04.1.tar.xz"; }; }; kfourinline = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kfourinline-19.04.0.tar.xz"; - sha256 = "458bc34c169df064c8d974d6f27e18e3cc5f3e9fb069358817d00a590f2e200a"; - name = "kfourinline-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz"; + sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973"; + name = "kfourinline-19.04.1.tar.xz"; }; }; kgeography = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kgeography-19.04.0.tar.xz"; - sha256 = "ee126fc91ba164e0c095e7cef231a1389a4e1423256773c4e7d4b7306077eb41"; - name = "kgeography-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz"; + sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502"; + name = "kgeography-19.04.1.tar.xz"; }; }; kget = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kget-19.04.0.tar.xz"; - sha256 = "e1ec10f36f8b451c2cfc02108e00c6ab3e1115719342b9fa1f1f5829746fbeb9"; - name = "kget-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz"; + sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629"; + name = "kget-19.04.1.tar.xz"; }; }; kgoldrunner = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kgoldrunner-19.04.0.tar.xz"; - sha256 = "3d2eb37695328065ee5cf4c4ba4ee707ce514b4c7aab84c93cd3bef8d329b8ba"; - name = "kgoldrunner-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz"; + sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760"; + name = "kgoldrunner-19.04.1.tar.xz"; }; }; kgpg = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kgpg-19.04.0.tar.xz"; - sha256 = "2fb47d9d08cfca94dce1c4d19bce5d2955c3cd3ceec6265a8b537de612a53128"; - name = "kgpg-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz"; + sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb"; + name = "kgpg-19.04.1.tar.xz"; }; }; khangman = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/khangman-19.04.0.tar.xz"; - sha256 = "2a7120f7a54848dc017efdb86c22a964626029d9ca300d8e1488d385f10dc61c"; - name = "khangman-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz"; + sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27"; + name = "khangman-19.04.1.tar.xz"; }; }; khelpcenter = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/khelpcenter-19.04.0.tar.xz"; - sha256 = "5fc4f9553e8575055edf259baa3d0b0c663db5caf67dc392db9e519d6b85699f"; - name = "khelpcenter-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz"; + sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114"; + name = "khelpcenter-19.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kidentitymanagement-19.04.0.tar.xz"; - sha256 = "1ddce9330947fdfd970f07b60d6e9ff012e21a673262796ccb29e56e277b55a3"; - name = "kidentitymanagement-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz"; + sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a"; + name = "kidentitymanagement-19.04.1.tar.xz"; }; }; kig = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kig-19.04.0.tar.xz"; - sha256 = "781243a23a94d7a9882bd69ddfcd74a5b9df0ce28cd45488e62dcf54e3633234"; - name = "kig-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz"; + sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79"; + name = "kig-19.04.1.tar.xz"; }; }; kigo = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kigo-19.04.0.tar.xz"; - sha256 = "30f12515ec4d22d39c6c90690545e1975a3ba9917180503ef42cba40ffbd874c"; - name = "kigo-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz"; + sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad"; + name = "kigo-19.04.1.tar.xz"; }; }; killbots = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/killbots-19.04.0.tar.xz"; - sha256 = "0cc928a1956b72bc207feed237598b445b5a7d7d26a266ec88080c1510870359"; - name = "killbots-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz"; + sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938"; + name = "killbots-19.04.1.tar.xz"; }; }; kimagemapeditor = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kimagemapeditor-19.04.0.tar.xz"; - sha256 = "8d3ff906926fe8f82b21cf19d784dbddfcda15de9513feaa9defa6e4ff3b1869"; - name = "kimagemapeditor-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz"; + sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533"; + name = "kimagemapeditor-19.04.1.tar.xz"; }; }; kimap = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kimap-19.04.0.tar.xz"; - sha256 = "cda62c81c47011ad2adbf78222eab4528a62116487531ce1aa98f6100706d2fd"; - name = "kimap-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz"; + sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f"; + name = "kimap-19.04.1.tar.xz"; }; }; kio-extras = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kio-extras-19.04.0.tar.xz"; - sha256 = "0f3f2eaf40512cf4a61b09b94ca365d7d05c7b1a75f4e8afd047143a8e962d85"; - name = "kio-extras-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz"; + sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd"; + name = "kio-extras-19.04.1.tar.xz"; }; }; kirigami-gallery = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kirigami-gallery-19.04.0.tar.xz"; - sha256 = "c0ac9e9a07072d1a538d2535fd21dede86cc4ee9287c7b1ca3d6b8f8726a7155"; - name = "kirigami-gallery-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz"; + sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2"; + name = "kirigami-gallery-19.04.1.tar.xz"; }; }; kiriki = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kiriki-19.04.0.tar.xz"; - sha256 = "feb7b4fce0e6b1749bddd254a46a5d34bf5584a3d60aef460816380141ad630e"; - name = "kiriki-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz"; + sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b"; + name = "kiriki-19.04.1.tar.xz"; }; }; kiten = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kiten-19.04.0.tar.xz"; - sha256 = "53f5e4ef48b18989084858ab5c96b7dedf357cecf4dba3b2d2a967b4b4b8a742"; - name = "kiten-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz"; + sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4"; + name = "kiten-19.04.1.tar.xz"; }; }; kitinerary = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kitinerary-19.04.0.tar.xz"; - sha256 = "b56c93b7114cad54313471e6ab4cebde461a2b39859b47e9b8f7f146d3471889"; - name = "kitinerary-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz"; + sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318"; + name = "kitinerary-19.04.1.tar.xz"; }; }; kjumpingcube = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kjumpingcube-19.04.0.tar.xz"; - sha256 = "28fabf01d0a2481c54018d00985254acb107579c5afa93bbec7b3795c2a3f143"; - name = "kjumpingcube-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz"; + sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1"; + name = "kjumpingcube-19.04.1.tar.xz"; }; }; kldap = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kldap-19.04.0.tar.xz"; - sha256 = "2cddadf995a10b854b28e34c18db14c32ad985c18af466edde6a1b2a9a2d8a23"; - name = "kldap-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz"; + sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b"; + name = "kldap-19.04.1.tar.xz"; }; }; kleopatra = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kleopatra-19.04.0.tar.xz"; - sha256 = "8ad7ec0b99efabdbc270559098dfca64e39ddd30a64b13915c04988a9c8b8b70"; - name = "kleopatra-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz"; + sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67"; + name = "kleopatra-19.04.1.tar.xz"; }; }; klettres = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/klettres-19.04.0.tar.xz"; - sha256 = "c8a5596638ea7bbe7e26c246c5904840bf544e632e5649430bb32159aedefd60"; - name = "klettres-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz"; + sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847"; + name = "klettres-19.04.1.tar.xz"; }; }; klickety = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/klickety-19.04.0.tar.xz"; - sha256 = "2ad160e3ea0a6f11c828f3b4bcea8f75db4121dda6d6e498fa1fc095e82e80e5"; - name = "klickety-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz"; + sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af"; + name = "klickety-19.04.1.tar.xz"; }; }; klines = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/klines-19.04.0.tar.xz"; - sha256 = "139c0a4da7186e6e57228fcbe8666aa40e52ae01f328fea4d53ed8611ed54a96"; - name = "klines-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz"; + sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962"; + name = "klines-19.04.1.tar.xz"; }; }; kmag = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmag-19.04.0.tar.xz"; - sha256 = "c6725654846e83b383ff6c624683e4132538f2e812d8131cadefd6926316520e"; - name = "kmag-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz"; + sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874"; + name = "kmag-19.04.1.tar.xz"; }; }; kmahjongg = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmahjongg-19.04.0.tar.xz"; - sha256 = "519bf6bb0bc098f74467d3ec9b49c82d22241dfd518d004163565e86dbc21a36"; - name = "kmahjongg-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz"; + sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99"; + name = "kmahjongg-19.04.1.tar.xz"; }; }; kmail = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmail-19.04.0.tar.xz"; - sha256 = "c191057769513d51d6604e0f51e441e54770ac07a982175a5be29b7797d6f486"; - name = "kmail-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz"; + sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5"; + name = "kmail-19.04.1.tar.xz"; }; }; kmail-account-wizard = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmail-account-wizard-19.04.0.tar.xz"; - sha256 = "640d63ceca23644e2f358c7117eb54daa0fffc669628398f7930fe273d7944a9"; - name = "kmail-account-wizard-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz"; + sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8"; + name = "kmail-account-wizard-19.04.1.tar.xz"; }; }; kmailtransport = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmailtransport-19.04.0.tar.xz"; - sha256 = "35104e661fd501bd5848006dfd907f8cd1dfe88609ed4f9fbc4ce599a2f20c8f"; - name = "kmailtransport-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz"; + sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa"; + name = "kmailtransport-19.04.1.tar.xz"; }; }; kmbox = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmbox-19.04.0.tar.xz"; - sha256 = "cd37b698e4ad12317a6d1f7df786345f5df7112ea3d21c2c23545e48a67e8544"; - name = "kmbox-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz"; + sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0"; + name = "kmbox-19.04.1.tar.xz"; }; }; kmime = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmime-19.04.0.tar.xz"; - sha256 = "2081adec0e6972e513206bee69c0e165904670b7bcf34c52e7da07323537d513"; - name = "kmime-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz"; + sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775"; + name = "kmime-19.04.1.tar.xz"; }; }; kmines = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmines-19.04.0.tar.xz"; - sha256 = "56452ab18c74f2863efc99200a5facd53827382c06fc8534d095bffaca497566"; - name = "kmines-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz"; + sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12"; + name = "kmines-19.04.1.tar.xz"; }; }; kmix = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmix-19.04.0.tar.xz"; - sha256 = "f372d50ccdb496a3bb7a3f68c84c921c12d3d535a792400e701ed7c640e45f2a"; - name = "kmix-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz"; + sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea"; + name = "kmix-19.04.1.tar.xz"; }; }; kmousetool = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmousetool-19.04.0.tar.xz"; - sha256 = "89e383a395ec5f1c7d25cc5fb45ecb73a3a0931919a2be533634d77c01cb3fa9"; - name = "kmousetool-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz"; + sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624"; + name = "kmousetool-19.04.1.tar.xz"; }; }; kmouth = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmouth-19.04.0.tar.xz"; - sha256 = "32666760ed76dd2dc816df52c990cb3b8487346ac37bf065e4b109fb6661ebc3"; - name = "kmouth-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz"; + sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068"; + name = "kmouth-19.04.1.tar.xz"; }; }; kmplot = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kmplot-19.04.0.tar.xz"; - sha256 = "fb981354dd6fea18e83003df957f65a9580d458b377adde88a838d4db9a97ee6"; - name = "kmplot-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz"; + sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206"; + name = "kmplot-19.04.1.tar.xz"; }; }; knavalbattle = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/knavalbattle-19.04.0.tar.xz"; - sha256 = "1e6fbd202092230017c268cd825438debf766e3cc810244b63dc8690b5a69585"; - name = "knavalbattle-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz"; + sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc"; + name = "knavalbattle-19.04.1.tar.xz"; }; }; knetwalk = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/knetwalk-19.04.0.tar.xz"; - sha256 = "84b03a6b7c3ff6634402b016089a54ed0116ace221fdfb04ad3d2a8997f68b4b"; - name = "knetwalk-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz"; + sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b"; + name = "knetwalk-19.04.1.tar.xz"; }; }; knights = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/knights-19.04.0.tar.xz"; - sha256 = "53eb3214550fc104755ffe076c970cf5499c9553b543d83df42a3b5f5d8d309a"; - name = "knights-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz"; + sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e"; + name = "knights-19.04.1.tar.xz"; }; }; knotes = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/knotes-19.04.0.tar.xz"; - sha256 = "e2f98d029105d18c5c14b774782287e281e2367eebeb84d52727a5156abe4092"; - name = "knotes-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz"; + sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9"; + name = "knotes-19.04.1.tar.xz"; }; }; kolf = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kolf-19.04.0.tar.xz"; - sha256 = "431b31dc6290214be5f5df1d3c6a8eb4a910b4f72135840d4ec3fa6945319c81"; - name = "kolf-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz"; + sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7"; + name = "kolf-19.04.1.tar.xz"; }; }; kollision = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kollision-19.04.0.tar.xz"; - sha256 = "f218ef5691235155911b4d03cd301ee6caa0bde6eb324cd55117e722002b0927"; - name = "kollision-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz"; + sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9"; + name = "kollision-19.04.1.tar.xz"; }; }; kolourpaint = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kolourpaint-19.04.0.tar.xz"; - sha256 = "d6cd087ba34a1a8fec9349dea06c1b71a70f6e8455adb41d4820a376eb2ed141"; - name = "kolourpaint-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz"; + sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46"; + name = "kolourpaint-19.04.1.tar.xz"; }; }; kompare = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kompare-19.04.0.tar.xz"; - sha256 = "49453b90e21d3b2acd766aac244f579e2dc446ec8abf854ceb2faf34fc3e647f"; - name = "kompare-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz"; + sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261"; + name = "kompare-19.04.1.tar.xz"; }; }; konqueror = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/konqueror-19.04.0.tar.xz"; - sha256 = "8da6fdd7de037bed79b6341e670a7491d371d084c59fdbefb4ffae0d2da82e4c"; - name = "konqueror-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz"; + sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92"; + name = "konqueror-19.04.1.tar.xz"; }; }; konquest = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/konquest-19.04.0.tar.xz"; - sha256 = "5361a865fefc0dac19e166d282188b732cfbe4389afe095c38c8d30b56f7ff6f"; - name = "konquest-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz"; + sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab"; + name = "konquest-19.04.1.tar.xz"; }; }; konsole = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/konsole-19.04.0.tar.xz"; - sha256 = "62d53840f6cac4686feafa7f75d641bb56867b7dfc12e6ce95afa7e796e37cef"; - name = "konsole-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz"; + sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8"; + name = "konsole-19.04.1.tar.xz"; }; }; kontact = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kontact-19.04.0.tar.xz"; - sha256 = "710d72ba01afa2aea89efca61f6c25245c0db04dc675b8871f7109a42a945cca"; - name = "kontact-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz"; + sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714"; + name = "kontact-19.04.1.tar.xz"; }; }; kontactinterface = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kontactinterface-19.04.0.tar.xz"; - sha256 = "268005d61e97dab34f200b0e7a461afddb32a88ccc7c553b6c967865a6915392"; - name = "kontactinterface-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz"; + sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2"; + name = "kontactinterface-19.04.1.tar.xz"; }; }; kopete = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kopete-19.04.0.tar.xz"; - sha256 = "88068ceb8735e1b7ecaac9a9e4c36d40629b53d514c987823c987cfac6dc99df"; - name = "kopete-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz"; + sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85"; + name = "kopete-19.04.1.tar.xz"; }; }; korganizer = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/korganizer-19.04.0.tar.xz"; - sha256 = "3e8c69db9f504e3ec80307d1552af21440621c0e480abf874a5a73482800bcaf"; - name = "korganizer-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz"; + sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67"; + name = "korganizer-19.04.1.tar.xz"; }; }; kpat = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kpat-19.04.0.tar.xz"; - sha256 = "bcd295a3df422b5cfa8258bb3cd0be7e4405f44604681d98589f2982c44414a1"; - name = "kpat-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz"; + sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896"; + name = "kpat-19.04.1.tar.xz"; }; }; kpimtextedit = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kpimtextedit-19.04.0.tar.xz"; - sha256 = "b4c640ee8ae5c4356bc26819763721580ca87477eb39258c1eaacdffbfc5311a"; - name = "kpimtextedit-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz"; + sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1"; + name = "kpimtextedit-19.04.1.tar.xz"; }; }; kpkpass = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kpkpass-19.04.0.tar.xz"; - sha256 = "0121e03af506451a39b34a2f0ca063228454a40f71d9706dea3cee644a4c8f28"; - name = "kpkpass-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz"; + sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7"; + name = "kpkpass-19.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kqtquickcharts-19.04.0.tar.xz"; - sha256 = "c8a270932f11fc5ee9270c77205b1a93edfe73c2e629a602940acb15d853803f"; - name = "kqtquickcharts-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz"; + sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72"; + name = "kqtquickcharts-19.04.1.tar.xz"; }; }; krdc = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/krdc-19.04.0.tar.xz"; - sha256 = "2a1ac548992eaaff82cafe386eef0a611b96f06ce3887a363b25d6ca17c6eacc"; - name = "krdc-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz"; + sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19"; + name = "krdc-19.04.1.tar.xz"; }; }; kreversi = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kreversi-19.04.0.tar.xz"; - sha256 = "a715d068eaf381a26e1f432f2d6b3f3ffffb388282b484cd8ad0833acf429d82"; - name = "kreversi-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz"; + sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9"; + name = "kreversi-19.04.1.tar.xz"; }; }; krfb = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/krfb-19.04.0.tar.xz"; - sha256 = "321b1b296dfbd69e64048fbf991aec1a9d8c251e9f0084a396081f62287c6b40"; - name = "krfb-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz"; + sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b"; + name = "krfb-19.04.1.tar.xz"; }; }; kross-interpreters = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kross-interpreters-19.04.0.tar.xz"; - sha256 = "e910e76e58603077177b7835bed2b9562b266e2fc0ab78c8b2642edc752ccd27"; - name = "kross-interpreters-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz"; + sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe"; + name = "kross-interpreters-19.04.1.tar.xz"; }; }; kruler = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kruler-19.04.0.tar.xz"; - sha256 = "7d29eac1d7f4e39f7d754ebb9d68aba70ab3dc12e8241007de750572ce761d73"; - name = "kruler-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz"; + sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53"; + name = "kruler-19.04.1.tar.xz"; }; }; kshisen = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kshisen-19.04.0.tar.xz"; - sha256 = "c7d2799105c71d5d0077383c9b24a52ae85705c39977c8dc167a2594651c17eb"; - name = "kshisen-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz"; + sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6"; + name = "kshisen-19.04.1.tar.xz"; }; }; ksirk = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksirk-19.04.0.tar.xz"; - sha256 = "3dcd578050807aa37652e5e589ddff7a5aec46c82309db85aab588bd3060d5a0"; - name = "ksirk-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz"; + sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e"; + name = "ksirk-19.04.1.tar.xz"; }; }; ksmtp = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksmtp-19.04.0.tar.xz"; - sha256 = "c92b8b6b9de60bca7b9bb7befdd519041625188a955e55b63860d9de4b3e0bab"; - name = "ksmtp-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz"; + sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb"; + name = "ksmtp-19.04.1.tar.xz"; }; }; ksnakeduel = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksnakeduel-19.04.0.tar.xz"; - sha256 = "e9ca727c7e7cef21e9bedbb1504b2023baac9ab5ba0b624dc91e1bf716eb8335"; - name = "ksnakeduel-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz"; + sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046"; + name = "ksnakeduel-19.04.1.tar.xz"; }; }; kspaceduel = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kspaceduel-19.04.0.tar.xz"; - sha256 = "486b8d84f3070b7795456ec5847d7b5a9bb3c2b5d3e1c4bcdfedff18b8d735a7"; - name = "kspaceduel-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz"; + sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7"; + name = "kspaceduel-19.04.1.tar.xz"; }; }; ksquares = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksquares-19.04.0.tar.xz"; - sha256 = "c5a7dc34619f1ee4d621c3371b65bdcd46cf3433c183b4bc85c8a7586b6e85b4"; - name = "ksquares-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz"; + sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773"; + name = "ksquares-19.04.1.tar.xz"; }; }; ksudoku = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksudoku-19.04.0.tar.xz"; - sha256 = "4f5cff274741326bff02108fef4996f289c56ff026fd6e2921e4a2bf492a14cb"; - name = "ksudoku-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz"; + sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b"; + name = "ksudoku-19.04.1.tar.xz"; }; }; ksystemlog = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ksystemlog-19.04.0.tar.xz"; - sha256 = "6a9f389b04fac92b0e2955e86e4a45aa73494f6dd24c9a6704826b469414fb5d"; - name = "ksystemlog-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz"; + sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4"; + name = "ksystemlog-19.04.1.tar.xz"; }; }; kteatime = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kteatime-19.04.0.tar.xz"; - sha256 = "8672fa70912e9bf4488d5258258a14babbf65ee160dc537ab665ff2136a0c490"; - name = "kteatime-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz"; + sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0"; + name = "kteatime-19.04.1.tar.xz"; }; }; ktimer = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktimer-19.04.0.tar.xz"; - sha256 = "d772292fa447aec07ff763d7bdfc351fbf2fd7d09160a574ec36ff2905ea5b79"; - name = "ktimer-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz"; + sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809"; + name = "ktimer-19.04.1.tar.xz"; }; }; ktnef = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktnef-19.04.0.tar.xz"; - sha256 = "bc3e826bc831ffac5b3b92cef14fca3f4b077d30652ce2ebdcffa07dafd58c56"; - name = "ktnef-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz"; + sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93"; + name = "ktnef-19.04.1.tar.xz"; }; }; ktouch = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktouch-19.04.0.tar.xz"; - sha256 = "707fca9ee9d0d217683e2bb562f5f8f984ddbd0ed7274b022a43bdc176898390"; - name = "ktouch-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz"; + sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2"; + name = "ktouch-19.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-accounts-kcm-19.04.0.tar.xz"; - sha256 = "e7c11f4310dd4cb119336fb569cc9799dbdd3d7f4b87af9e265f8fc4439ec7f8"; - name = "ktp-accounts-kcm-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz"; + sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045"; + name = "ktp-accounts-kcm-19.04.1.tar.xz"; }; }; ktp-approver = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-approver-19.04.0.tar.xz"; - sha256 = "ec273b9eabcedd47c97fa60c68a3037115b9b06a91892d32871e8ded4c04cdfe"; - name = "ktp-approver-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz"; + sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd"; + name = "ktp-approver-19.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-auth-handler-19.04.0.tar.xz"; - sha256 = "db459ed02c5ed37ce41ec9728d931ca1ab987c43d1b48f501d38b40e1e4f19e9"; - name = "ktp-auth-handler-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz"; + sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65"; + name = "ktp-auth-handler-19.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-call-ui-19.04.0.tar.xz"; - sha256 = "b63ef1f0bcaed631f9106a355dd60e48edb6e7e39bb6bd0603b504fc33949427"; - name = "ktp-call-ui-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz"; + sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f"; + name = "ktp-call-ui-19.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-common-internals-19.04.0.tar.xz"; - sha256 = "12e3e0733eef78a649fa1e55f2f3d228b581fb1a0ba401e154dd57d4eb286eaa"; - name = "ktp-common-internals-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz"; + sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1"; + name = "ktp-common-internals-19.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-contact-list-19.04.0.tar.xz"; - sha256 = "745a1b403e3e1bfd0604521709f44634ab15a053b45f5c390d9a8e80fa405668"; - name = "ktp-contact-list-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz"; + sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9"; + name = "ktp-contact-list-19.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-contact-runner-19.04.0.tar.xz"; - sha256 = "12d9e3cf2a230e590c9e3e17462b8e061641a70840492971434b131c15594773"; - name = "ktp-contact-runner-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz"; + sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f"; + name = "ktp-contact-runner-19.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-desktop-applets-19.04.0.tar.xz"; - sha256 = "ba5d0422156e0ea38db1abeb317310266fd96b2b259a40df4233880d15037d8c"; - name = "ktp-desktop-applets-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz"; + sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75"; + name = "ktp-desktop-applets-19.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-filetransfer-handler-19.04.0.tar.xz"; - sha256 = "3088b79a79b35fc52f38ae2941e9f1ca8a80a1eed1c3bcdfd489b2e069febcfd"; - name = "ktp-filetransfer-handler-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz"; + sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189"; + name = "ktp-filetransfer-handler-19.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-kded-module-19.04.0.tar.xz"; - sha256 = "3409e3ec270f0ba2f558b6e6a84e9948936c128cc536fc6c16c4dd5bd8a3c94b"; - name = "ktp-kded-module-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz"; + sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66"; + name = "ktp-kded-module-19.04.1.tar.xz"; }; }; ktp-send-file = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-send-file-19.04.0.tar.xz"; - sha256 = "f0be593d3101cbc5027e7dcc23a767d2e3e753d140afe97d5790db20eea07226"; - name = "ktp-send-file-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz"; + sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a"; + name = "ktp-send-file-19.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktp-text-ui-19.04.0.tar.xz"; - sha256 = "78ac51d23e54d6044b70083db8d2c6972643a207a7f475cde15292e08b6b6469"; - name = "ktp-text-ui-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz"; + sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5"; + name = "ktp-text-ui-19.04.1.tar.xz"; }; }; ktuberling = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/ktuberling-19.04.0.tar.xz"; - sha256 = "984c29562bd20f93117e7d79aa120dd906e6d4490ae5d2b52ad03f7bbfb85ace"; - name = "ktuberling-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz"; + sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb"; + name = "ktuberling-19.04.1.tar.xz"; }; }; kturtle = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kturtle-19.04.0.tar.xz"; - sha256 = "89e836a2737c98caf1ceb16b7ac648262d6a6770ac5bb5b0d9fbfed4abeeda7d"; - name = "kturtle-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz"; + sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d"; + name = "kturtle-19.04.1.tar.xz"; }; }; kubrick = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kubrick-19.04.0.tar.xz"; - sha256 = "72adc4e07df6062dd444c4bb9571429acf9c2ee68e273bc42c7925b1c06aad5e"; - name = "kubrick-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz"; + sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7"; + name = "kubrick-19.04.1.tar.xz"; }; }; kwalletmanager = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kwalletmanager-19.04.0.tar.xz"; - sha256 = "5cc25daaa8511694b01ba4b0a7ca39f8f2eef9fce10e99411ae287013fc27734"; - name = "kwalletmanager-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz"; + sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d"; + name = "kwalletmanager-19.04.1.tar.xz"; }; }; kwave = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kwave-19.04.0.tar.xz"; - sha256 = "510b99740c87ade2e644b8b62ece9ac46721e636aeb83f253939d4d191d03a52"; - name = "kwave-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz"; + sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6"; + name = "kwave-19.04.1.tar.xz"; }; }; kwordquiz = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/kwordquiz-19.04.0.tar.xz"; - sha256 = "a6433b5a2497398ed790965ef5469b53e406882f93b5a05e574d05cb193ef866"; - name = "kwordquiz-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz"; + sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158"; + name = "kwordquiz-19.04.1.tar.xz"; }; }; libgravatar = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libgravatar-19.04.0.tar.xz"; - sha256 = "ee62597fffa534b45f89056028d1d9ff871c7da7093d11a128a6decfb5312d12"; - name = "libgravatar-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz"; + sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522"; + name = "libgravatar-19.04.1.tar.xz"; }; }; libkcddb = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkcddb-19.04.0.tar.xz"; - sha256 = "d15cef6fe986daba5ea051fda7146c784d993e83ca495faf58fad586ca370c32"; - name = "libkcddb-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz"; + sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51"; + name = "libkcddb-19.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkcompactdisc-19.04.0.tar.xz"; - sha256 = "7236af70872c7b20070d9c096a8d4da45cdf62874d6d1314b183edf8b0d701d6"; - name = "libkcompactdisc-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz"; + sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee"; + name = "libkcompactdisc-19.04.1.tar.xz"; }; }; libkdcraw = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkdcraw-19.04.0.tar.xz"; - sha256 = "30df02047c0f1b97a7c90c8eb5f7a3c5d322f13e0158395d3f9798ff21ed529e"; - name = "libkdcraw-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz"; + sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c"; + name = "libkdcraw-19.04.1.tar.xz"; }; }; libkdegames = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkdegames-19.04.0.tar.xz"; - sha256 = "2965e4a313609f6408becb13e54e26bfe14b37b58e7737e051129896f6e8bcd3"; - name = "libkdegames-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz"; + sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c"; + name = "libkdegames-19.04.1.tar.xz"; }; }; libkdepim = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkdepim-19.04.0.tar.xz"; - sha256 = "099c7bd90e540c6996f333393afa4831c94b6fbe65f7800bde712ebae4ba8a8e"; - name = "libkdepim-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz"; + sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45"; + name = "libkdepim-19.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkeduvocdocument-19.04.0.tar.xz"; - sha256 = "bb0300ca6a89c7174714b005032380b81e6e7bfdf3a3bab82b6f42fc0693045e"; - name = "libkeduvocdocument-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz"; + sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59"; + name = "libkeduvocdocument-19.04.1.tar.xz"; }; }; libkexiv2 = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkexiv2-19.04.0.tar.xz"; - sha256 = "9fcafa932631429af1693642415d2f202ad29338b63949b5e8661135eb69dc19"; - name = "libkexiv2-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz"; + sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae"; + name = "libkexiv2-19.04.1.tar.xz"; }; }; libkgapi = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkgapi-19.04.0.tar.xz"; - sha256 = "014084b04ee76939a318f711259bbb540037b45fe57a25b200ed4095b74970dc"; - name = "libkgapi-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz"; + sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e"; + name = "libkgapi-19.04.1.tar.xz"; }; }; libkgeomap = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkgeomap-19.04.0.tar.xz"; - sha256 = "12cf73da1d406b8f6efe88c1d1bc56ecf3260bbe41759c4dec061df627e990e9"; - name = "libkgeomap-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz"; + sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a"; + name = "libkgeomap-19.04.1.tar.xz"; }; }; libkipi = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkipi-19.04.0.tar.xz"; - sha256 = "6fc176e72e829dafe19e17a1d97b032f464d837621989751efe38cdd03d7d285"; - name = "libkipi-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz"; + sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020"; + name = "libkipi-19.04.1.tar.xz"; }; }; libkleo = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkleo-19.04.0.tar.xz"; - sha256 = "fbd97ae860c0361fca8bfa8a80a2d19e96779eb8d436a9a32c10cfe9767d8981"; - name = "libkleo-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz"; + sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529"; + name = "libkleo-19.04.1.tar.xz"; }; }; libkmahjongg = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkmahjongg-19.04.0.tar.xz"; - sha256 = "1ab4461ba92de0cc56bd349a859d5c647f816b20923692237e7f3098ba9dd76e"; - name = "libkmahjongg-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz"; + sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb"; + name = "libkmahjongg-19.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libkomparediff2-19.04.0.tar.xz"; - sha256 = "ffb3370aa869831f86dc009353abd72a5f0c7a7d1c570d5fecf9747131247464"; - name = "libkomparediff2-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz"; + sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3"; + name = "libkomparediff2-19.04.1.tar.xz"; }; }; libksane = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libksane-19.04.0.tar.xz"; - sha256 = "15a4f14ddb26e7e0ed54926c54941b29eebba1fabb2e75ad9f5cd48b9b673f58"; - name = "libksane-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz"; + sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417"; + name = "libksane-19.04.1.tar.xz"; }; }; libksieve = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/libksieve-19.04.0.tar.xz"; - sha256 = "451d71d6c6e8cdfe0ef540cbcca94dae57260563e1e435b41f7070ecb86f6312"; - name = "libksieve-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz"; + sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff"; + name = "libksieve-19.04.1.tar.xz"; }; }; lokalize = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/lokalize-19.04.0.tar.xz"; - sha256 = "e2e8cd6f9bb0e59ffd4b88e5513b757df3b63892ce90e7000c872e896ef74266"; - name = "lokalize-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz"; + sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1"; + name = "lokalize-19.04.1.tar.xz"; }; }; lskat = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/lskat-19.04.0.tar.xz"; - sha256 = "c3358e62eb8a0c428c32f1ac759f5ead15d4ab552b1ae5b273e6927d14bb0ad1"; - name = "lskat-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz"; + sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf"; + name = "lskat-19.04.1.tar.xz"; }; }; mailcommon = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/mailcommon-19.04.0.tar.xz"; - sha256 = "cd599079d290f540c83919182eab7e2d236a939a3405d1f882385822fc5d3682"; - name = "mailcommon-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz"; + sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f"; + name = "mailcommon-19.04.1.tar.xz"; }; }; mailimporter = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/mailimporter-19.04.0.tar.xz"; - sha256 = "d5649d24aca659fbb00284a70aef868e31a56a9c688a0457945ec0d31c7a22ed"; - name = "mailimporter-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz"; + sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696"; + name = "mailimporter-19.04.1.tar.xz"; }; }; marble = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/marble-19.04.0.tar.xz"; - sha256 = "7405c76970d6ec500e5dc99ea2926cc11571e69f29c2e79f025f0f3ec4048960"; - name = "marble-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz"; + sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61"; + name = "marble-19.04.1.tar.xz"; }; }; mbox-importer = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/mbox-importer-19.04.0.tar.xz"; - sha256 = "0fba78f2feee2ec7c11e64511195546b9c34695c091632494c1d77c2555eb888"; - name = "mbox-importer-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz"; + sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a"; + name = "mbox-importer-19.04.1.tar.xz"; }; }; messagelib = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/messagelib-19.04.0.tar.xz"; - sha256 = "1fb76bcd7aa9792095519c585dbb93552726e3cfe514446eb52edf5ed1517a1a"; - name = "messagelib-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz"; + sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad"; + name = "messagelib-19.04.1.tar.xz"; }; }; minuet = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/minuet-19.04.0.tar.xz"; - sha256 = "3bdf5470a154b2be4bfcd97db7374ef81ca8eefba3bb12030dd6d39f1466cc78"; - name = "minuet-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz"; + sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0"; + name = "minuet-19.04.1.tar.xz"; }; }; okular = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/okular-19.04.0.tar.xz"; - sha256 = "1947b394dfd8da9c7cc4234e308e2476ffa44dc58542d246eafc8397d8991b6e"; - name = "okular-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz"; + sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e"; + name = "okular-19.04.1.tar.xz"; }; }; palapeli = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/palapeli-19.04.0.tar.xz"; - sha256 = "21f8b6b109d6cc61acbb0ee01aa31982bb6e27e8894e4f00407f52904d177a2b"; - name = "palapeli-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz"; + sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b"; + name = "palapeli-19.04.1.tar.xz"; }; }; parley = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/parley-19.04.0.tar.xz"; - sha256 = "243f7f1a89bb603c059b0610a9bb7f51627540d439b4026d736062b693879ed2"; - name = "parley-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz"; + sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f"; + name = "parley-19.04.1.tar.xz"; }; }; picmi = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/picmi-19.04.0.tar.xz"; - sha256 = "edb10bc29d6817dffeb51762c5fa793ee8de3b3a70c2c6616012f5a043799d86"; - name = "picmi-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz"; + sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c"; + name = "picmi-19.04.1.tar.xz"; }; }; pimcommon = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/pimcommon-19.04.0.tar.xz"; - sha256 = "b25d10571e55ab11b758ad6b1040ef2d148b4b5b913f41665c355df25bceb12e"; - name = "pimcommon-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz"; + sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72"; + name = "pimcommon-19.04.1.tar.xz"; }; }; pim-data-exporter = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/pim-data-exporter-19.04.0.tar.xz"; - sha256 = "ae1c3bbfffebb85533b0bbf4b0f8b54c06e29fcdf7284295c89ab43d196a6ac3"; - name = "pim-data-exporter-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz"; + sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd"; + name = "pim-data-exporter-19.04.1.tar.xz"; }; }; pim-sieve-editor = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/pim-sieve-editor-19.04.0.tar.xz"; - sha256 = "0843df57695ca4dc359d048a7e3bf2b6bb66bd10d861714d316baa8ecb387dd1"; - name = "pim-sieve-editor-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz"; + sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10"; + name = "pim-sieve-editor-19.04.1.tar.xz"; }; }; poxml = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/poxml-19.04.0.tar.xz"; - sha256 = "c0a24557cc7e243790c5273fb2a4ff585a3e89cc994772a52979015d2e57a985"; - name = "poxml-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz"; + sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9"; + name = "poxml-19.04.1.tar.xz"; }; }; print-manager = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/print-manager-19.04.0.tar.xz"; - sha256 = "f9dfe61ba341013ae59892cd6715b7c00ee6777ca4d2e81deeda1cf2d283f6ba"; - name = "print-manager-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz"; + sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa"; + name = "print-manager-19.04.1.tar.xz"; }; }; rocs = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/rocs-19.04.0.tar.xz"; - sha256 = "65557205a86ddc682c9f9378731b1cf0dacd170742a5bdf110eeeef8ae4b26c8"; - name = "rocs-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz"; + sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61"; + name = "rocs-19.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/signon-kwallet-extension-19.04.0.tar.xz"; - sha256 = "eb93120d2acfbac4b823bc301b3724d250dc7e7041eef347c1337c7df84c0c40"; - name = "signon-kwallet-extension-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz"; + sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38"; + name = "signon-kwallet-extension-19.04.1.tar.xz"; }; }; spectacle = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/spectacle-19.04.0.tar.xz"; - sha256 = "2c4d891d5850e13d912ad0885086170f45178ed5fb4d0ccfef7b22a9a76c35a8"; - name = "spectacle-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz"; + sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c"; + name = "spectacle-19.04.1.tar.xz"; }; }; step = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/step-19.04.0.tar.xz"; - sha256 = "c37cbd4a7179d796dd4458dbdd98e48d59c5f0278f19026a4f5cc2b50e140319"; - name = "step-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz"; + sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05"; + name = "step-19.04.1.tar.xz"; }; }; svgpart = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/svgpart-19.04.0.tar.xz"; - sha256 = "6dbec1dcb6853c06f7cb10677a2c99678b398b4a658eb4206a146f24b0fa158a"; - name = "svgpart-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz"; + sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624"; + name = "svgpart-19.04.1.tar.xz"; }; }; sweeper = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/sweeper-19.04.0.tar.xz"; - sha256 = "7ed57321ba601725291e1cfa6cdfe2060ad0405d42124dc8d8d44d137b852f72"; - name = "sweeper-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz"; + sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637"; + name = "sweeper-19.04.1.tar.xz"; }; }; umbrello = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/umbrello-19.04.0.tar.xz"; - sha256 = "7c37363a92bd91f2a515438068ba6f1c8747269ddaf2eda5a7998539ece4468d"; - name = "umbrello-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz"; + sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2"; + name = "umbrello-19.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.04.0"; + version = "19.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.04.0/src/zeroconf-ioslave-19.04.0.tar.xz"; - sha256 = "e1f7465f200d1c7c53c56a8ebf9a463022a27d6c244d0d1768ff58763e5b53dc"; - name = "zeroconf-ioslave-19.04.0.tar.xz"; + url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz"; + sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87"; + name = "zeroconf-ioslave-19.04.1.tar.xz"; }; }; } From 6d2cc1363f26b652e8bec460e889bee16dd89c3d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 17 May 2019 10:14:29 +0200 Subject: [PATCH 405/637] kdeFrameworks: 5.57 -> 5.58 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 07df956e7a4..afab8a4e9a4 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 09556297da2..17473db9eeb 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/attica-5.57.0.tar.xz"; - sha256 = "a13682bccaca3529df6e3b54e1d4e48fb3d1654fe1b142701e73ce9fe0b87655"; - name = "attica-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; + sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; + name = "attica-5.58.0.tar.xz"; }; }; baloo = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/baloo-5.57.0.tar.xz"; - sha256 = "32ab4ed2d295fe734a4a475403dea72e2feef27f662ae64c841c410eb7bb3dd3"; - name = "baloo-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; + sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; + name = "baloo-5.58.0.tar.xz"; }; }; bluez-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/bluez-qt-5.57.0.tar.xz"; - sha256 = "43e1be1882832cef88186255a6b692d9fd1366bad09db0c2075a126b0fc0df65"; - name = "bluez-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; + sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; + name = "bluez-qt-5.58.0.tar.xz"; }; }; breeze-icons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/breeze-icons-5.57.0.tar.xz"; - sha256 = "c3ba92acb5bfcff66f41232ebc6e8c893dab78ac59a713fa4bfa2a0e097f4ed2"; - name = "breeze-icons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; + sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; + name = "breeze-icons-5.58.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/extra-cmake-modules-5.57.0.tar.xz"; - sha256 = "aa53f8953792b452672f275c2ea9b96ab2adf3e13d9645c3451b06dbc8055b18"; - name = "extra-cmake-modules-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; + sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; + name = "extra-cmake-modules-5.58.0.tar.xz"; }; }; frameworkintegration = { - version = "5.57.0"; + version = "5.58.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/frameworkintegration-5.57.0.tar.xz"; - sha256 = "9c5850c1d41900bcb81e7929d54856d0cdd2565a276e5e262f624eb1217cbb78"; - name = "frameworkintegration-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; + sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; + name = "frameworkintegration-5.58.1.tar.xz"; }; }; kactivities = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-5.57.0.tar.xz"; - sha256 = "442527db8710b9045dc574816bc9c32cad5f8a404e681fb030d7e9c2f3d77761"; - name = "kactivities-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; + sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; + name = "kactivities-5.58.0.tar.xz"; }; }; kactivities-stats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-stats-5.57.0.tar.xz"; - sha256 = "4c7a49905ec1b6e03831986b254d0fd091e44fe920fffa123c969765c6474ba3"; - name = "kactivities-stats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; + sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; + name = "kactivities-stats-5.58.0.tar.xz"; }; }; kapidox = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kapidox-5.57.0.tar.xz"; - sha256 = "16f53e4722adddaa8729b4cccc374d16bdbfdd987f8655d2b431a91b046fe2b2"; - name = "kapidox-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; + sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; + name = "kapidox-5.58.0.tar.xz"; }; }; karchive = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/karchive-5.57.0.tar.xz"; - sha256 = "e0e64e7e88c8df96f894de20aff4d12925e0d362c5134df83473ea48c0432783"; - name = "karchive-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; + sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; + name = "karchive-5.58.0.tar.xz"; }; }; kauth = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kauth-5.57.0.tar.xz"; - sha256 = "9d6b9135cc47710b28e2a7731c4c5c1f6dba2b0e5fe982b9d2a82a11d7d497c2"; - name = "kauth-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; + sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; + name = "kauth-5.58.0.tar.xz"; }; }; kbookmarks = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kbookmarks-5.57.0.tar.xz"; - sha256 = "bf57f111e176ab2ecb79646b1f93cf5d84a8d3fcfb13b805b5140e75b42eb085"; - name = "kbookmarks-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; + sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; + name = "kbookmarks-5.58.0.tar.xz"; }; }; kcmutils = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcmutils-5.57.0.tar.xz"; - sha256 = "f3ee63a356e18be95a15141346356f3f43bb067d0326021d99f4b73ee4716fbb"; - name = "kcmutils-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; + sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; + name = "kcmutils-5.58.0.tar.xz"; }; }; kcodecs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcodecs-5.57.0.tar.xz"; - sha256 = "c98b98cf7258c03fa5131a987e278f348d52f792dcb9f2a5664fe35aadea6995"; - name = "kcodecs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; + sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; + name = "kcodecs-5.58.0.tar.xz"; }; }; kcompletion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcompletion-5.57.0.tar.xz"; - sha256 = "5ad8746a57cef2b12da5a97e296cbb0b708e8ecfb4253786a899fa86951395ec"; - name = "kcompletion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; + sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; + name = "kcompletion-5.58.0.tar.xz"; }; }; kconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfig-5.57.0.tar.xz"; - sha256 = "155b0dbba8772aa8ea3e75217029daa00ada8699e5a807154214f66b2462c010"; - name = "kconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; + sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; + name = "kconfig-5.58.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfigwidgets-5.57.0.tar.xz"; - sha256 = "771c5641a9ae465feaf00ffbb3f3c0433ad8d4a90355dc50d5b6b1b472912eb0"; - name = "kconfigwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; + sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; + name = "kconfigwidgets-5.58.0.tar.xz"; }; }; kcoreaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcoreaddons-5.57.0.tar.xz"; - sha256 = "7c2573de9b745e55fe61cff26941839cff0d2e40b6c5d791c24c9d6cc8cf7485"; - name = "kcoreaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; + sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; + name = "kcoreaddons-5.58.0.tar.xz"; }; }; kcrash = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcrash-5.57.0.tar.xz"; - sha256 = "4b12719a20f2ff0fe0a2656609d0aa277245cd2a9f764a7b6cfaa6da9d928dc0"; - name = "kcrash-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; + sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; + name = "kcrash-5.58.0.tar.xz"; }; }; kdbusaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdbusaddons-5.57.0.tar.xz"; - sha256 = "86946d97e74420637f59ea0fff93e303bcbdc5b1d5e1c6361e2d9a3ceb0e1259"; - name = "kdbusaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; + sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; + name = "kdbusaddons-5.58.0.tar.xz"; }; }; kdeclarative = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdeclarative-5.57.0.tar.xz"; - sha256 = "5335b39ac1cca34209c0420dab867b67ddb0e9ee483bdd6d4192269a1d5f654f"; - name = "kdeclarative-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; + sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; + name = "kdeclarative-5.58.0.tar.xz"; }; }; kded = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kded-5.57.0.tar.xz"; - sha256 = "04327dda12fa547bebb8e1b1bc26373e8f4174007dd629231403d59ce004201f"; - name = "kded-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; + sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; + name = "kded-5.58.0.tar.xz"; }; }; kdelibs4support = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kdelibs4support-5.57.0.tar.xz"; - sha256 = "e9d1c06191031b482ea01d891756d125ff32927239c36a3011fc7b8f17aca1b0"; - name = "kdelibs4support-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; + sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; + name = "kdelibs4support-5.58.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesignerplugin-5.57.0.tar.xz"; - sha256 = "9e85a4ac798122b459722773a6e81f639be6dfe9c9714a16704f555c88334393"; - name = "kdesignerplugin-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; + sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; + name = "kdesignerplugin-5.58.0.tar.xz"; }; }; kdesu = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesu-5.57.0.tar.xz"; - sha256 = "76d98db52f7f375991cd7ccbbf1dc100716f99a5792b71ef31a75cc33cf45b19"; - name = "kdesu-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; + sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; + name = "kdesu-5.58.0.tar.xz"; }; }; kdewebkit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdewebkit-5.57.0.tar.xz"; - sha256 = "809e9df4ac3ca8b59799c8781694092cb1793f03af0b87a347a1c6019f96a592"; - name = "kdewebkit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; + sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; + name = "kdewebkit-5.58.0.tar.xz"; }; }; kdnssd = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdnssd-5.57.0.tar.xz"; - sha256 = "5a61b942fd14c9d96370e19fd7a29594bfcbd3074e12625caac083206fce2789"; - name = "kdnssd-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; + sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; + name = "kdnssd-5.58.0.tar.xz"; }; }; kdoctools = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdoctools-5.57.0.tar.xz"; - sha256 = "649dbaff4f1559302e7da07f423a0bc9e3faa1c7a93dfeb170e50bf452d8def2"; - name = "kdoctools-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; + sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; + name = "kdoctools-5.58.0.tar.xz"; }; }; kemoticons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kemoticons-5.57.0.tar.xz"; - sha256 = "c07b69c9275c117507166622e185c2bf0f36e1e4e8ad7b25fa3e1d793da4711b"; - name = "kemoticons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; + sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; + name = "kemoticons-5.58.0.tar.xz"; }; }; kfilemetadata = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kfilemetadata-5.57.0.tar.xz"; - sha256 = "49e6c281fdffd4f5fe363c6cefdb6c3022ef57c935d7d6b135607cdde9b2d116"; - name = "kfilemetadata-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; + sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; + name = "kfilemetadata-5.58.0.tar.xz"; }; }; kglobalaccel = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kglobalaccel-5.57.0.tar.xz"; - sha256 = "46370dcd4f110e6ccde3b3bf9c075deb1f22ad54016137925e4aea97b03cc2fe"; - name = "kglobalaccel-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; + sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; + name = "kglobalaccel-5.58.0.tar.xz"; }; }; kguiaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kguiaddons-5.57.0.tar.xz"; - sha256 = "744eb0ec35c936c17c3d11a08d19014e2166c4a307370207e0f5a38f01a91ebd"; - name = "kguiaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; + sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; + name = "kguiaddons-5.58.0.tar.xz"; }; }; kholidays = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kholidays-5.57.0.tar.xz"; - sha256 = "f7db45906623c33dfbb297810082f8ff30c949e6a7d477f3b72de0521b0c9452"; - name = "kholidays-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; + sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; + name = "kholidays-5.58.0.tar.xz"; }; }; khtml = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/khtml-5.57.0.tar.xz"; - sha256 = "63d22fbc8cad3075a0b7ef195291c4b79ebc65da5de81b4885cac1063d783da3"; - name = "khtml-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; + sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; + name = "khtml-5.58.0.tar.xz"; }; }; ki18n = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ki18n-5.57.0.tar.xz"; - sha256 = "bbd60981c9a0c1f9d9a52c8dd86adef7c4c30caf603f806d8730febaa36f0dd9"; - name = "ki18n-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; + sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; + name = "ki18n-5.58.0.tar.xz"; }; }; kiconthemes = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kiconthemes-5.57.0.tar.xz"; - sha256 = "09abb03a97027948a1116bfb2ca9842d3f8fb2def83b0b02aaed194dd5bd16f3"; - name = "kiconthemes-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; + sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; + name = "kiconthemes-5.58.0.tar.xz"; }; }; kidletime = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kidletime-5.57.0.tar.xz"; - sha256 = "e99a07f814573526ed5141fc9e4bc2df12298df53a0d2787c3b7a4c3af915665"; - name = "kidletime-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; + sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; + name = "kidletime-5.58.0.tar.xz"; }; }; kimageformats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kimageformats-5.57.0.tar.xz"; - sha256 = "d7ce6c4737ae2846f015633e7479b60460d960a3a578777c2a884d499bd6cc14"; - name = "kimageformats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; + sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; + name = "kimageformats-5.58.0.tar.xz"; }; }; kinit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kinit-5.57.0.tar.xz"; - sha256 = "7d5ca84d7bd554531aa6d720d3dc41ac091cf047a52d097a23e5c8fad08b684c"; - name = "kinit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; + sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; + name = "kinit-5.58.0.tar.xz"; }; }; kio = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kio-5.57.0.tar.xz"; - sha256 = "d68151d58f1ed2e0724074c6bca42510dd3e19617baa4b4130198ad3a36a64ab"; - name = "kio-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; + sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; + name = "kio-5.58.0.tar.xz"; }; }; kirigami2 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kirigami2-5.57.0.tar.xz"; - sha256 = "3cdbea0e472293e85e625820f6b9e2d20f59cff263ed150904b6b2acad81062b"; - name = "kirigami2-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; + sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; + name = "kirigami2-5.58.0.tar.xz"; }; }; kitemmodels = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemmodels-5.57.0.tar.xz"; - sha256 = "b0eef30ce3e5f2fe9afb60d589bea16a0d0e4a57ffffb37ae0e14a54f1681464"; - name = "kitemmodels-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; + sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; + name = "kitemmodels-5.58.0.tar.xz"; }; }; kitemviews = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemviews-5.57.0.tar.xz"; - sha256 = "6b499a21c88d5998c903e8e4dd480c612b96e5e31d17430a507c07566febdd30"; - name = "kitemviews-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; + sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; + name = "kitemviews-5.58.0.tar.xz"; }; }; kjobwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kjobwidgets-5.57.0.tar.xz"; - sha256 = "4b98e7cd9b8d877326854addcee300071afc92f4378d3a94734e470271638002"; - name = "kjobwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; + sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; + name = "kjobwidgets-5.58.0.tar.xz"; }; }; kjs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjs-5.57.0.tar.xz"; - sha256 = "865fb86566a0ea904ab0a3bd6a63787161b28578660d475fc316c50c8a7b1e90"; - name = "kjs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; + sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; + name = "kjs-5.58.0.tar.xz"; }; }; kjsembed = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjsembed-5.57.0.tar.xz"; - sha256 = "741aae8db274febe7e5d0d10dc99271efc590b2465d2c4d4e4a9162d2b36e3b4"; - name = "kjsembed-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; + sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; + name = "kjsembed-5.58.0.tar.xz"; }; }; kmediaplayer = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kmediaplayer-5.57.0.tar.xz"; - sha256 = "521dcb4b3f9a67203e9eac27b8d777cb22557861b9fae0006c2aecda96d9bad4"; - name = "kmediaplayer-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; + sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; + name = "kmediaplayer-5.58.0.tar.xz"; }; }; knewstuff = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knewstuff-5.57.0.tar.xz"; - sha256 = "6a9d77a62b036b4ed0f32ffaa9f204db1403030d01dbe8fb055d02361db2f981"; - name = "knewstuff-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; + sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; + name = "knewstuff-5.58.0.tar.xz"; }; }; knotifications = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifications-5.57.0.tar.xz"; - sha256 = "7de068f4cf9bcefef54ae1cb180e2c0af9be951afbcaa960245507259620cf15"; - name = "knotifications-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; + sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; + name = "knotifications-5.58.0.tar.xz"; }; }; knotifyconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifyconfig-5.57.0.tar.xz"; - sha256 = "e7fe39ed72b7f79d8cafe6c30d5c62ade0f33be37a62d9e5b929064dd1750ac1"; - name = "knotifyconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; + sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; + name = "knotifyconfig-5.58.0.tar.xz"; }; }; kpackage = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpackage-5.57.0.tar.xz"; - sha256 = "2d2d497d50e8ce986d6de4462391122963d9b7605889fd20cd3ceb4dd6910814"; - name = "kpackage-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; + sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; + name = "kpackage-5.58.0.tar.xz"; }; }; kparts = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kparts-5.57.0.tar.xz"; - sha256 = "5a079986963d186e98a1174e19e490731012732ad5ad31a431a8f7a31c6b6ed2"; - name = "kparts-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; + sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; + name = "kparts-5.58.0.tar.xz"; }; }; kpeople = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpeople-5.57.0.tar.xz"; - sha256 = "7c239b80b7976e3bfa46338e05a048aecb9c1972548dc33cc8a17e66eb08a85c"; - name = "kpeople-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; + sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; + name = "kpeople-5.58.0.tar.xz"; }; }; kplotting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kplotting-5.57.0.tar.xz"; - sha256 = "c2c35030b1a2ca25f503c1a2df7ca225d156a9ea80f52883e136679aea6efc8e"; - name = "kplotting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; + sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; + name = "kplotting-5.58.0.tar.xz"; }; }; kpty = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpty-5.57.0.tar.xz"; - sha256 = "14a0f9d5ecc387c88d24270dbf4c128deb8ad18ab64b39766b335ad03a47c3b6"; - name = "kpty-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; + sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; + name = "kpty-5.58.0.tar.xz"; }; }; kross = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kross-5.57.0.tar.xz"; - sha256 = "3b0f92751bb70c64b2ac25b466f886cc8b02babf02c744bcc909aa3ce6915a66"; - name = "kross-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; + sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; + name = "kross-5.58.0.tar.xz"; }; }; krunner = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/krunner-5.57.0.tar.xz"; - sha256 = "40f52d4d883748f5b9a78b5bd7dd6aaa52eae88b89d7a33eafbcbb9ccf6f4805"; - name = "krunner-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; + sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; + name = "krunner-5.58.0.tar.xz"; }; }; kservice = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kservice-5.57.0.tar.xz"; - sha256 = "531940baa47273714fbc35941f2ef5fbdb801b7a5ed5fef5a8ff1d86bf1dae14"; - name = "kservice-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; + sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; + name = "kservice-5.58.0.tar.xz"; }; }; ktexteditor = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktexteditor-5.57.0.tar.xz"; - sha256 = "aa510656f632ef09c18af4263386265c293cb929f139786acd102881250314c3"; - name = "ktexteditor-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; + sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; + name = "ktexteditor-5.58.0.tar.xz"; }; }; ktextwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktextwidgets-5.57.0.tar.xz"; - sha256 = "b74036eea1ec19a22aa0e76cd1a8338f55e5c32a30dc47d602783c6bc5ba54bf"; - name = "ktextwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; + sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; + name = "ktextwidgets-5.58.0.tar.xz"; }; }; kunitconversion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kunitconversion-5.57.0.tar.xz"; - sha256 = "157f4d21e83a6e92e30894f472b65452ecd2183ac2e25e24f740e971befed383"; - name = "kunitconversion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; + sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; + name = "kunitconversion-5.58.0.tar.xz"; }; }; kwallet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwallet-5.57.0.tar.xz"; - sha256 = "ad089026f4d5b10d567d0fd56f8b63749acd214fb8029d43187ba42afaf36975"; - name = "kwallet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; + sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; + name = "kwallet-5.58.0.tar.xz"; }; }; kwayland = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwayland-5.57.0.tar.xz"; - sha256 = "f00d2997163f559cecf30f5e945d5456628a0d120acafba49fa14af28c22b1d6"; - name = "kwayland-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; + sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; + name = "kwayland-5.58.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwidgetsaddons-5.57.0.tar.xz"; - sha256 = "abd80a566e1003bca7c72d3a0dc1ee470bc9935d11371cfff0d960f11e1ef5c2"; - name = "kwidgetsaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; + sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; + name = "kwidgetsaddons-5.58.0.tar.xz"; }; }; kwindowsystem = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwindowsystem-5.57.0.tar.xz"; - sha256 = "0c8a009dde7ca1722810777b99aa4e1a3471687460c25e0f41645c9e11daf274"; - name = "kwindowsystem-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; + sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; + name = "kwindowsystem-5.58.0.tar.xz"; }; }; kxmlgui = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlgui-5.57.0.tar.xz"; - sha256 = "325124518e8fa4847c898dee193d96b76a7ba27d7c79d875f34c632f46fe1f90"; - name = "kxmlgui-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; + sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; + name = "kxmlgui-5.58.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlrpcclient-5.57.0.tar.xz"; - sha256 = "d47d5cc49f050dda3a26f7654226c0d124ca5ba5503a60e606307426bbe43b9d"; - name = "kxmlrpcclient-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; + sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; + name = "kxmlrpcclient-5.58.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/modemmanager-qt-5.57.0.tar.xz"; - sha256 = "030bfcfafd5079f25a165aaa5f52693a8fe4b3c15c1345a641716c4329e0929d"; - name = "modemmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; + sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; + name = "modemmanager-qt-5.58.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/networkmanager-qt-5.57.0.tar.xz"; - sha256 = "4d2da2556bfeef4be03833d707284573b469a1f6ad66ba73eae80835bd2e1982"; - name = "networkmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; + sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; + name = "networkmanager-qt-5.58.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/oxygen-icons5-5.57.0.tar.xz"; - sha256 = "2b12a9de3767d233b4b01bc97e23899d94c02b13fee4d20483d3f5d2baaaa1e5"; - name = "oxygen-icons5-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; + sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; + name = "oxygen-icons5-5.58.0.tar.xz"; }; }; plasma-framework = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/plasma-framework-5.57.0.tar.xz"; - sha256 = "b886aeee6691911ead25e6fd5631fa41ce2330b0fbbdc040717fa576bacae2ca"; - name = "plasma-framework-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; + sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; + name = "plasma-framework-5.58.0.tar.xz"; }; }; prison = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/prison-5.57.0.tar.xz"; - sha256 = "6613decb2e0b61af5af3a3a9995970c2fdaa72f36bcfd7e9db547017ee4ca235"; - name = "prison-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; + sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; + name = "prison-5.58.0.tar.xz"; }; }; purpose = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/purpose-5.57.0.tar.xz"; - sha256 = "4b38f1b88e6e621bc20c04a5f7bc7293fba6c851209167c5e794b6becaea244e"; - name = "purpose-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; + sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; + name = "purpose-5.58.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/qqc2-desktop-style-5.57.0.tar.xz"; - sha256 = "ff40fd6d48815c39e46e19eadf4048f04e79f34f7522a9ba655e6d4a1690546e"; - name = "qqc2-desktop-style-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; + sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; + name = "qqc2-desktop-style-5.58.0.tar.xz"; }; }; solid = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/solid-5.57.0.tar.xz"; - sha256 = "fbdb0678a5a1b9f902661b4823dbae4629a88708b729d827dd0598799f727209"; - name = "solid-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; + sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; + name = "solid-5.58.0.tar.xz"; }; }; sonnet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/sonnet-5.57.0.tar.xz"; - sha256 = "08e13a707b64055f512bba982ec5e69a9e7c62c02d1ee8b6fdc67c67b1265334"; - name = "sonnet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; + sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; + name = "sonnet-5.58.0.tar.xz"; }; }; syndication = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syndication-5.57.0.tar.xz"; - sha256 = "251b2333bd3e49f833ef5ac12e0d2540a7640c84625090a85d99715927653728"; - name = "syndication-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; + sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; + name = "syndication-5.58.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syntax-highlighting-5.57.0.tar.xz"; - sha256 = "e82261e791005a55414fc81a396ca33ee8c061acd66c2c351492d866b3592e9f"; - name = "syntax-highlighting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; + sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; + name = "syntax-highlighting-5.58.0.tar.xz"; }; }; threadweaver = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/threadweaver-5.57.0.tar.xz"; - sha256 = "83969d0f6e4a337fba6b554708f867654af86368066ccef75a4fde85569d1ee0"; - name = "threadweaver-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; + sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; + name = "threadweaver-5.58.0.tar.xz"; }; }; } From 11fce46ca03c45bad03d52bb41ef6fb547b97333 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 17 May 2019 10:16:19 +0200 Subject: [PATCH 406/637] plasma-5: 5.15.3 -> 5.15.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index cd2fa293e7d..034b57ec06a 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index cfafc4d1321..ac0a3494c22 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz"; - sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0"; - name = "bluedevil-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz"; + sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f"; + name = "bluedevil-5.15.5.tar.xz"; }; }; breeze = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz"; - sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b"; - name = "breeze-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz"; + sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4"; + name = "breeze-5.15.5.tar.xz"; }; }; breeze-grub = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz"; - sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64"; - name = "breeze-grub-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz"; + sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64"; + name = "breeze-grub-5.15.5.tar.xz"; }; }; breeze-gtk = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz"; - sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4"; - name = "breeze-gtk-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz"; + sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8"; + name = "breeze-gtk-5.15.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz"; - sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37"; - name = "breeze-plymouth-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz"; + sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8"; + name = "breeze-plymouth-5.15.5.tar.xz"; }; }; discover = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz"; - sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b"; - name = "discover-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz"; + sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854"; + name = "discover-5.15.5.tar.xz"; }; }; drkonqi = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz"; - sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx"; - name = "drkonqi-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz"; + sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e"; + name = "drkonqi-5.15.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz"; - sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym"; - name = "kactivitymanagerd-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz"; + sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db"; + name = "kactivitymanagerd-5.15.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz"; - sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg"; - name = "kde-cli-tools-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz"; + sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace"; + name = "kde-cli-tools-5.15.5.tar.xz"; }; }; kdecoration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz"; - sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh"; - name = "kdecoration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz"; + sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f"; + name = "kdecoration-5.15.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz"; - sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8"; - name = "kde-gtk-config-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz"; + sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185"; + name = "kde-gtk-config-5.15.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz"; - sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn"; - name = "kdeplasma-addons-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz"; + sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3"; + name = "kdeplasma-addons-5.15.5.tar.xz"; }; }; kgamma5 = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz"; - sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my"; - name = "kgamma5-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz"; + sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7"; + name = "kgamma5-5.15.5.tar.xz"; }; }; khotkeys = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz"; - sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5"; - name = "khotkeys-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz"; + sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127"; + name = "khotkeys-5.15.5.tar.xz"; }; }; kinfocenter = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz"; - sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr"; - name = "kinfocenter-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz"; + sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8"; + name = "kinfocenter-5.15.5.tar.xz"; }; }; kmenuedit = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz"; - sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab"; - name = "kmenuedit-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz"; + sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26"; + name = "kmenuedit-5.15.5.tar.xz"; }; }; kscreen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz"; - sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f"; - name = "kscreen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz"; + sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7"; + name = "kscreen-5.15.5.tar.xz"; }; }; kscreenlocker = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz"; - sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna"; - name = "kscreenlocker-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz"; + sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd"; + name = "kscreenlocker-5.15.5.tar.xz"; }; }; ksshaskpass = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz"; - sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s"; - name = "ksshaskpass-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz"; + sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e"; + name = "ksshaskpass-5.15.5.tar.xz"; }; }; ksysguard = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz"; - sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q"; - name = "ksysguard-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz"; + sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a"; + name = "ksysguard-5.15.5.tar.xz"; }; }; kwallet-pam = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz"; - sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793"; - name = "kwallet-pam-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz"; + sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e"; + name = "kwallet-pam-5.15.5.tar.xz"; }; }; kwayland-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz"; - sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h"; - name = "kwayland-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz"; + sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17"; + name = "kwayland-integration-5.15.5.tar.xz"; }; }; kwin = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz"; - sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw"; - name = "kwin-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz"; + sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805"; + name = "kwin-5.15.5.tar.xz"; }; }; kwrited = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz"; - sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v"; - name = "kwrited-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz"; + sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510"; + name = "kwrited-5.15.5.tar.xz"; }; }; libkscreen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz"; - sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj"; - name = "libkscreen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz"; + sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87"; + name = "libkscreen-5.15.5.tar.xz"; }; }; libksysguard = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz"; - sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj"; - name = "libksysguard-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz"; + sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0"; + name = "libksysguard-5.15.5.tar.xz"; }; }; milou = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz"; - sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01"; - name = "milou-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz"; + sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9"; + name = "milou-5.15.5.tar.xz"; }; }; oxygen = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz"; - sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb"; - name = "oxygen-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz"; + sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c"; + name = "oxygen-5.15.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz"; - sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar"; - name = "plasma-browser-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz"; + sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b"; + name = "plasma-browser-integration-5.15.5.tar.xz"; }; }; plasma-desktop = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz"; - sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91"; - name = "plasma-desktop-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz"; + sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741"; + name = "plasma-desktop-5.15.5.tar.xz"; }; }; plasma-integration = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz"; - sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735"; - name = "plasma-integration-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz"; + sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621"; + name = "plasma-integration-5.15.5.tar.xz"; }; }; plasma-nm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz"; - sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz"; - name = "plasma-nm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz"; + sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee"; + name = "plasma-nm-5.15.5.tar.xz"; }; }; plasma-pa = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz"; - sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125"; - name = "plasma-pa-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz"; + sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92"; + name = "plasma-pa-5.15.5.tar.xz"; }; }; plasma-sdk = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz"; - sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw"; - name = "plasma-sdk-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz"; + sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329"; + name = "plasma-sdk-5.15.5.tar.xz"; }; }; plasma-tests = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz"; - sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg"; - name = "plasma-tests-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz"; + sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827"; + name = "plasma-tests-5.15.5.tar.xz"; }; }; plasma-vault = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz"; - sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy"; - name = "plasma-vault-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz"; + sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5"; + name = "plasma-vault-5.15.5.tar.xz"; }; }; plasma-workspace = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz"; - sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59"; - name = "plasma-workspace-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz"; + sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973"; + name = "plasma-workspace-5.15.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz"; - sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4"; - name = "plasma-workspace-wallpapers-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz"; + sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945"; + name = "plasma-workspace-wallpapers-5.15.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz"; - sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190"; - name = "plymouth-kcm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz"; + sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa"; + name = "plymouth-kcm-5.15.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.3"; + version = "1-5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz"; - sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy"; - name = "polkit-kde-agent-1-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz"; + sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267"; + name = "polkit-kde-agent-1-5.15.5.tar.xz"; }; }; powerdevil = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz"; - sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14"; - name = "powerdevil-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz"; + sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06"; + name = "powerdevil-5.15.5.tar.xz"; }; }; sddm-kcm = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz"; - sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2"; - name = "sddm-kcm-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz"; + sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b"; + name = "sddm-kcm-5.15.5.tar.xz"; }; }; systemsettings = { - version = "5.15.3.2"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz"; - sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2"; - name = "systemsettings-5.15.3.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz"; + sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a"; + name = "systemsettings-5.15.5.tar.xz"; }; }; user-manager = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz"; - sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4"; - name = "user-manager-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz"; + sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431"; + name = "user-manager-5.15.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.3"; + version = "5.15.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz"; - sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7"; - name = "xdg-desktop-portal-kde-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz"; + sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50"; + name = "xdg-desktop-portal-kde-5.15.5.tar.xz"; }; }; } From bc5ecf3be7e9964291e4336508a898cb8dedbefc Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 20 May 2019 22:11:39 -0400 Subject: [PATCH 407/637] linux_testing_bcachefs: prune outdated patch No longer necessary since by the current revision it is already included. Closes https://github.com/NixOS/nixpkgs/issues/61775. --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 45e55e03c81..3718a8f636a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -12,15 +12,6 @@ buildLinux (args // rec { extraConfig = "BCACHEFS_FS m"; - kernelPatches = [ - { name = "export-bio_iov_iter_get_pages"; - patch = fetchpatch { - name = "export-bio_iov_iter_get_pages.patch"; - url = "https://evilpiepirate.org/git/bcachefs.git/patch/?id=bd8be01aa04eb9cc33fcdce89ac6e0fac0ae0fcf"; - sha256 = "0h5z98krx8077wwhiqp3bwc1h4nwnifxsn8mpxr2lcxnqmky3hz0"; - }; } - ]; - extraMeta = { branch = "master"; hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? From e527d1408e3d4521b6fd4c92510938daa4d0be0f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 20 May 2019 22:12:21 -0400 Subject: [PATCH 408/637] vscode-extensions.cpptools.ms-vscode: 0.23.0 -> 0.23.1 --- pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 89ed98cd0a7..37e5759c858 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.23.0"; - sha256 = "1c7qia60fgak5pisl1qzp2kvm1cs30b29rxpydk7j3lqcpqr5ixj"; + version = "0.23.1"; + sha256 = "08kfzvyl8vgjmhqzpp7pxw0gd87jr5g7z15ag4cpcil4inq4c8k3"; }; buildInputs = [ From 4ecde9b3b7d6f5d726396a24b4a83c552b4956cf Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 20 May 2019 22:13:01 -0400 Subject: [PATCH 409/637] vscode-extensions.WakaTime.vscode-wakatime: 2.1.0 -> 2.1.1 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 034866d5b2f..6d8e59ba095 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.0"; - sha256 = "0a23l8vaj0yghfh9lbi453vjghaxgjmphfjy2s4lgrvq38j4bv9n"; + version = "2.1.1"; + sha256 = "14qy073dfw0b4mk76l17il65r44jrz7pn1hvlj84562qp48b8skz"; }; postPatch = '' From 652045176c7babafdb488aa966ae30c5b02987e5 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 20 May 2019 12:24:43 +0900 Subject: [PATCH 410/637] nmap: fix build with new Darwin stdenv --- pkgs/tools/security/nmap/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bd593090965..3bc5758aad4 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, pkgconfig, openssl, lua5_3 +{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 , graphicalSupport ? false , libX11 ? null , gtk2 ? null @@ -27,7 +27,17 @@ in stdenv.mkDerivation rec { sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; }; - patches = ./zenmap.patch; + patches = [ ./zenmap.patch ] + ++ optionals stdenv.cc.isClang [( + # Fixes a compile error due an ambiguous reference to bind(2) in + # nping/EchoServer.cc, which is otherwise resolved to std::bind. + # Also fixes a missing include. + # https://github.com/nmap/nmap/pull/1363 + fetchpatch { + url = "https://github.com/nmap/nmap/commit/5bbe66f1bd8cbd3718f5805139e2e8139e6849bb.diff"; + sha256 = "088r8ylpc9hachsxs4r17cqfa1ncyspbjvkc573lill7rk1r9m0s"; + } + )]; prePatch = optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ From d88d675051db1ac390b4064a00cb2cdfaa78a6af Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 21 May 2019 11:34:11 +0900 Subject: [PATCH 411/637] Change non-open-source to unfree in description. --- nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 9b0a24a3b8f..540a1cd235b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -95,7 +95,7 @@ in { type = types.bool; description = '' Make MemTest86 available from the systemd-boot menu. MemTest86 is a - program for testing memory. MemTest86 is a non-open-source program, so + program for testing memory. MemTest86 is an unfree program, so this requires allowUnfree to be set to true. ''; From f27e38eac4e2945477a49584ae7ac4d637d2c188 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 May 2019 19:53:33 -0700 Subject: [PATCH 412/637] alembic: 1.7.10 -> 1.7.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alembic/versions --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 48ca86aaa4b..5c25da92055 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.10"; + version = "1.7.11"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "186wwlbz90gmzr4vsykk4z8bgkd45yhbyfpn8bqwidf9fcimcr2a"; + sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz"; }; outputs = [ "bin" "dev" "out" "lib" ]; From 0b644ad6b52ebdd1912e4410e931d5f2aaccdc8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 May 2019 20:00:45 -0700 Subject: [PATCH 413/637] ammonite: 1.6.6 -> 1.6.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ammonite/versions --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 05c3edc66d6..a7c94601dd8 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.6"; + version = "1.6.7"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "1w4vk8zq57b6flp2cpjlkicz4h8bca215669w065zqhfxlpxma2g"; + sha256 = "0d7iqgyvsyl8m02bwcsvp11q73xcsvzwwipjzlbqrgi0jivf34pw"; }; propagatedBuildInputs = [ jre ] ; From 1b95ef168b2008995ed208022bd7e121a0af1d1c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Apr 2019 08:47:19 -0500 Subject: [PATCH 414/637] terra: fix darwin build --- pkgs/development/compilers/terra/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 312facde948..b1f9ee799e5 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -37,26 +37,20 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -pv $out/lib - cp -v release/lib/terra.so $out/lib - - mkdir -pv $bin/bin - cp -v release/bin/terra $bin/bin - - mkdir -pv $static/lib - cp -v release/lib/libterra.a $static/lib + install -Dm755 -t $bin/bin release/bin/terra + install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} + install -Dm644 -t $static/lib release/lib/libterra.a mkdir -pv $dev/include cp -rv release/include/terra $dev/include - '' - ; + ''; buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; description = "A low-level counterpart to Lua"; - platforms = [ "x86_64-linux" ]; + homepage = http://terralang.org/; + platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; }; From 075d79aab05dc5901693b8efc7341bb107c684aa Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 21 May 2019 11:43:36 +0800 Subject: [PATCH 415/637] youtube-dl: 2019.05.11 -> 2019.05.20 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 98dc79fbe11..97c1f5100ab 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.05.11"; + version = "2019.05.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1y272jgdqwhf2njzqfln80zb2pmw83rvp6lxza6wghb7cld249j1"; + sha256 = "18xwdfvpkqrnj0kb8xj8hgwhgiqpv7x7x7zzr4x3vynb9grcv9m8"; }; nativeBuildInputs = [ makeWrapper ]; From 4cb11aa90171b530ea74cad62aa5ee44516db443 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 May 2019 20:59:19 -0700 Subject: [PATCH 416/637] atlassian-confluence: 6.15.2 -> 6.15.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/atlassian-confluence/versions --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index ca241192156..6a64b0bc399 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.15.2"; + version = "6.15.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "01b7k4i38xjjkfjcphylyxhsff6ckgi4nsz6nlw2ax8a3avrmnfd"; + sha256 = "0br51h8i99v6xc15280ra447c7fkiwf8nqgyzni0llhy1g1qcnmv"; }; buildPhase = '' From 0153edf9a43e3ea24482e71095910338b83d4b1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 May 2019 21:18:13 -0700 Subject: [PATCH 417/637] avro-c: 1.8.2 -> 1.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/avro-c/versions --- pkgs/development/libraries/avro-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 580cd1bd73f..cbd29a095d4 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,13 +1,13 @@ { stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }: let - version = "1.8.2"; + version = "1.9.0"; in stdenv.mkDerivation rec { name = "avro-c-${version}"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "03pixl345kkpn1jds03rpdcwjabi41rgdzi8f7y93gcg5cmrhfa6"; + sha256 = "1ch8z9jpkjxjx2zh28z0946gz3vwj1jnkrzg4vwvfa287128cml0"; }; postPatch = '' From 3071160766822372463681643e99d2b1f9724a8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 May 2019 21:57:05 -0700 Subject: [PATCH 418/637] bear: 2.3.13 -> 2.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bear/versions --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 51e8d12d314..e4bf35a09e1 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.3.13"; + version = "2.4.0"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z"; + sha256 = "0r5mhacn8v4b2kjni91nxh3b6g86cbkrnlk4f6sj4mdrvx25dp39"; }; nativeBuildInputs = [ cmake ]; From 140096b91fa4dc4da2a68d5d3436553a31f3c2b7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 21 May 2019 07:51:28 +0200 Subject: [PATCH 419/637] firefox-bin: 66.0.5 -> 67.0 --- .../browsers/firefox-bin/release_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3f0a39a2b44..3f5d08e2288 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0.5"; + version = "67.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ach/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ach/firefox-67.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "81dd4f3df0953e6234484bf0f55973123336e374ee38e0ca7c1aae3dc12e66aefb18c985be7e98578c857c6d2cd86d5319ac9aa2170b4df7eb47fe8fc7373b08"; + sha512 = "bd13f2eaa912fc16087c6faedcf8aed20ca1bee842eab9c88b2787d92b8f639c6420a99c7192d5fa9d9b4f5d52f83e2005f115f990e503b9e24af407bd31733f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/af/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/af/firefox-67.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "87cc2d6c5aa0c5a8eeb910af6780144111f81fcfbdf4aecffcc046b5317669d29329347920117256f2442e8b08b11fb9886c7f9558647db9847637b07aac272f"; + sha512 = "883552af262b8caddf0406d544acad5a6379ac685842ea2f637b489998993a3b717cf9ed4aeea79f5fbeb66f980222a702fd4e4dd8153259be5ff15422193db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/an/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/an/firefox-67.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b15896cb8c138b444b779362a38bac2defaf012818696d303025dc1e1dda7efd57032ebab254d393d8fef31356a525dff87aa65d60dd65198cd0e47bd87c27f2"; + sha512 = "997eae193da0d2b025b687db2df0ea8a773a96399c75b9efbdd82affc6fb4150761d70ac5b934f217177b54fc5abbcc0a8f2375e90a021bca7b168c485721af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ar/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ar/firefox-67.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d7f6e90064ce4fe123922f786c9395706c12ef1093b34ce60564255325fa14da9c46c24344a45f27a2e6e1b606f1e8bf6c5891c278763e3f4f70566c3b128970"; + sha512 = "de3d693d2f3fd5de93c6e732b5780e1ebb775ed0cc818af75f22ac7c505c9a6852872ac59db3cf3844e26a3ac3643c9facb3a4afeb0050ba485a5577e7ec6649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/as/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/as/firefox-67.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "ef2eb62a16e865a6f0ec796dc17a91da99b5643326a102019a55d3c477d68b62a566d0c73feb5aa1c23347bc7f358e1b6d116608945e03e4136baa6ade97d763"; + sha512 = "681c02e6b1a4f26937751f01d3b272cc242afa7be5f5bde45b8bc90e8c4ac7856331cce86b850d33a5440f8f0c4b08a6c54875bcad463e83c686c093068a1100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ast/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ast/firefox-67.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "fd5a01a343911f5d0cf4afafb0994cd236ce5f477a020272e56222eb216efb27b610a6aea26273c76b3947f62538d613d4af0a0d5ee16f6c985aa7b637dc4832"; + sha512 = "b60e5ac3ab934bbe43aa361132624621e963e4f272fb4e43c091259644e2104591e82a51a7b3abe99a3e79b31d2de37ce0b405fd66700333e292948a36691bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/az/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/az/firefox-67.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2674b4404da94eceb54bb91208d622adbd0c433691e6bf09b93b784c112f77c5b6a7f655000a8a1ae6b2957c96637ba2b61fcb18d4a028a70c8ea6b4c82f7c72"; + sha512 = "728ab5cb663166f91d0320caba207aaa9cfec9974ee605f4d0aa977af9392aea632d5b494906f3db8848cff8bcafb9e44247b7afb56316344df7ed9de709311e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/be/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/be/firefox-67.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b79bdfc175ac65bbf13a50eccbcd47587d05e1a7e937eaa91598f546c2ef33b99c5b9b5ff14cb155add7602132dce98ee298764c40c27e72c221f3d64a3ed7d7"; + sha512 = "0d8a8fd5efa732a5ce128203354eaffaf36915ececdedb6246c50fd98a0200ba79b99f1e9ef4b8586f4a6672206e3da5f509dc27bf473aabb455ebd9c05631c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bg/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bg/firefox-67.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "206aa03f0299af698149d93eba7b232835d5471e60ccc6bbedfc1566e0375a88e8bcd8da882f80b500fad9e850c1ff6657eddce499abf6ac976b1fb0eed77e4d"; + sha512 = "d7ed4da9b362082ba6cd26121993f762b32de8ac0a9c509e2124305850522224a94c06150a06ae2d776d05824555c1c7ce2c6b0dea384fe310ee3afd63791a7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-BD/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-BD/firefox-67.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "54f8f199008519e57d474f49ad8b28163fea3ea158a94fec2c437ce81336059ba8fdc70cc080c79667dd8172aa89152e0bea08a67a2f140628682d66c0da07c7"; + sha512 = "f72228b5db342270b00c994657649c1c907eccff938fb0104d33b73b91883a2a8214310442d0e7757c48c317c973a5c2f010630e93c036a8b2918158d6453541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bn-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-IN/firefox-67.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "e78887887b3793bcc659f9dff24661aa5175f4c614797c47fd7063e36b668c865cc61e65ad0b040cccd499ae99d41aae215c86f43f837149fc612ce7c02ea908"; + sha512 = "994f69057e6b01f357fe550ff096d8e261a7a51522bf8f882457d64dd65baa0320af212427949f2d4eaa115506e0f935217d6fcd0f903600b329fd4993fe9e6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/br/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/br/firefox-67.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "da4e0af68be8aa38db212beb0a6d9f4de14571fa32ddd28d47a439626111ac0fedcfc7976250e03a40aff626522840731a1febc3718fba5cde08f02cbc045e1b"; + sha512 = "d525a701c3a69d9bcfd405f19fbf4a5bea08af25c8aa4c42561d7133c8b40102a172c7cb2b7bee6e8ed084795c05623a174b2b9c5fbae3017678d983029d469f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/bs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bs/firefox-67.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "68d1a09118c0a81dca3edcd3eb0e36384fcb370c708956c84681b6f41a084256df2c463a8539fde497a34015cdb4523c340bd34080e433b7eb71e66db35c89ac"; + sha512 = "f63abc3c422462442e8f6d1a07fe17e70c1f48bf569587baafa25ea7f401eb459f9c2de42577eb6ad5f42184bc82514e0b55da7338970d7b1ad0665cb4f07637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ca/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ca/firefox-67.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f76264197f35bb8feba8905600fd4cffa9561e17bfcc811a880a81c25a9a9c12bed29db9e4c53c99ddcc8796f45fb83003301df2cafac93eda582ca6ad92334f"; + sha512 = "af74fca15fc8e7977ad820e68bb0745a1a640b9206203eb6d7891fd2b861387d859bc19fe520b830b41ce54695447b1904951c663d5e39b89a90672a4fe4d537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cak/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cak/firefox-67.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "779e3e776877aa1116bfb9c21276f6e1b2b9813c854b38894a2c4beec39a52d15ba3ace536a58011216defb729c4a26a6d80becbae967b0ddd2126d9ef8056a7"; + sha512 = "e0e03b594ef9c1bdd481c37a184d46d74b17ed7f0ef9efb7e2f22a94a05dad66516986e6b907825b1793e9bc2c4154e06430199f3d636660071f010d5b0f99b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cs/firefox-67.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bf4d60effd3628602be7ebae080bc429e6d0795ab2c4bc4e703e0a1d92b1cd4885dd3af10f22e939dbfd8d83cb1b79c90cad424fd2bafa976f9bb9dc3ec78c94"; + sha512 = "372487ef14fbc6300f8a349ecadde66eb4ce76aa43efd7aeda76b0387d86c7ce48e14e8db96a6939ce1919869852f59de307e74bb181cde71748bc0a3af5ffa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/cy/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cy/firefox-67.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f485f1e307db31a6382542a2ed4c103483342bee05790661db1f12d11585d029793096f6e0d881388f317d54878ba10dd7f6703b488e80417d1af4b3f83771a5"; + sha512 = "38274afab73b5feac2f91a20ec8308ed195ffcd5eb700a038ce0c3cc969f926290b0ae4439d29161d206a4e19f6fbae89cd61954afd1b72efb3cc87e5887ad0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/da/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/da/firefox-67.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6870622105879e703072153b0fd8b5e00b1e5621270fa187d0795675e69e39943e3232404d8702defe6844f75335292615d7c5f128fb3881eb027a90d3fb9710"; + sha512 = "694113fa37c868a14fedfe6b5b13ef12310cef49cadb363632864a1bb94128752dde20f3fc6afe8b1bafd16ad7b077a9ad6c71109b82e2b805d2d08be28e8cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/de/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/de/firefox-67.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "58a9ca0b2faa54193854f5467d9efd989be71560afcd32f013bcfdc01a8f51a24d54850bb02527c58a1c39f698b66144af899f6820ad867edc725a7c0399442f"; + sha512 = "205cc9c7cbd9178c43b797d427c6d8b0ba1cf4402bdf8b2b2a8d08baaf1bb60bb1b3ed406fb3d3983b64c0b353e54230d992288d4ff09e44aeb708dbb88cbf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/dsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/dsb/firefox-67.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8ebe982a0f7d0520654093af62ba62e2d9415ea1bc3ea1f12f14d64c15d4db70f64abee3ea9141a875cf487f72287fffaa2085e66b610a01bc40b0ad2c944efb"; + sha512 = "9afed55b0ea1849b9939f6f6620a5e5b9d312b453f0dec7091fb8223e5a02cd56c7e7c010f274a30e97668b7f029643487bdc2d5266e87e0ace2f87013bb6e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/el/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/el/firefox-67.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cafe8a9933947fbd7acea7234ced4ff7061a3e2136e5fa5789fea64aba96b1731e3a1e7120f4dec1dd0353763435089354998e2d151b1a884ef927a799edd1d4"; + sha512 = "9252dae6819ffc391c597d28fa7cac4dbe30658fbe88c06075cf5cde78130dda3d42222147a98ebe12e55db2dce4a629b4825d64b4fb8c829f8919c7daec9e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-CA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-CA/firefox-67.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ffdda6e16d9b43c23aebd5e876296f9dcfdf3cfc54577e4031ca25d004aad53ba63057e2875840fb054f8fe080532361c1fc613382ca23a521aeb844e1626dbb"; + sha512 = "118036bec1ec81a1353d5e43fcba49cab5f759f01c05cee3757346e7368e190eaca08e4b5a50922d0a7b2fc8667467e2f62114c60d3a03dc866d4a19fb6f0938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-GB/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-GB/firefox-67.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "69351e93fffcf3279abc7b23a81c262b1e804cbec7da3b55b3a62a3062a59dfc6894fe41975bb9f70bba01364f0d5bd86f0659b82f9bd9b9ce8a14b66cb24506"; + sha512 = "3d2e2f8e9de36281b5679201bd632d546269fd05bbb802a45484d0e5c75678b2aa1560afe8e711878eb36f6d1b1e10e784e7fc9ba600ca8407bcf6cb2c2bfed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-US/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-US/firefox-67.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbb43a8c1ffe1884c551421bc32f8e48239200af62800e8ff5b18d461b1ddd7b5d0c9afe0e262f98112bbde2949fedc740209e957bcee0b2c30a19e17bd5428"; + sha512 = "fa6572a1dddc8b0563250e0ceffe4df3394aafe2995a82b9055900695c28c3069bd9afd8e55fa710f7f8f046524c0fa92cbc61478154cffc6e23aae8b3ee4e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/en-ZA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-ZA/firefox-67.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8bf0583385c31dc6cf3d4df7790d06790a9387f59c54f18f30d3df05cc110bda2fefa6764d732c90e7f6eab4e42e594230da966acf1ebae078710f99793919d2"; + sha512 = "d843df8bb67d13f402c134a341db1ebaf1f6c989a797d50de2232ba7082823cad40d04ca818c00db9e24919df02eef5c240a3575a78285333a2ac2c56a0d53f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eo/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eo/firefox-67.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2a72aed4c755f463dcb97549d7f9fd644ce1bc0e259eff7bfe5b43148a5cca32315779121fc1d02c189961d7aa6953d62bd7f56c6925a321d1081765f11b2b11"; + sha512 = "00de95ec91364c1a45dafa5f2a90c7e27fba1689510d4c390822b15c23dccf7921d312533079e4c3f9748377141801d762004f2e72adc79c6b3dd56eea220aca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-AR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-AR/firefox-67.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f5b297e47bc51811e2096f9cf60686b0732a6f7eabde581ecc585b192341724e5656d251b7da545d99dce840b2aca2692c5e6b4eef4796b58e791dd59709c12b"; + sha512 = "7aac4213376dc8e797ebf2ea9301377fb1a9503dc2b43d9fe8092186c871234b1b628a9d0cba5dc8b331205b91ae96a49629a195ec9ebca68507c01fbe6ef220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-CL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-CL/firefox-67.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "94ba91ab326ccd20ac60da18429e9a787de3e97057eabc24ef38e6ba44066108eb18e8d58f2148a8b7a28b47aee65b12673b51b1a3eb8f733af199ef0b865c4d"; + sha512 = "5a9ef07bb61870a4460fa7279f1cfca3d48c71fc8cd7b708cc717e1f310d5b70196219ab855d6d272c9ed30f8a65aff9d56d15d160da45cd95ef2b45d9326c3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-ES/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-ES/firefox-67.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f40a14cc05855ca16efeed2c78a4342c1f6439f6f380e42ceb47433e1cc9088e17a91b656ce098d02d6b92b927bf33c0288f2bf2941d99e10b9e536ee71108aa"; + sha512 = "03649671ae73569c3378b12f9de04bea366670c6005f73fbf247d8fceebde4572b3f408905515bacc721672de720f051cbb997ca8f1627fbc6e245014b262f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/es-MX/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-MX/firefox-67.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dd3ca519b32a1951844a0bc54690be59a9843000873091a830df54fb8cc92b866fe448a5216d253a3118d533baac672e3c56464cceb5d3b920b5b6c51a3b5163"; + sha512 = "03e04d2e636806f10dce66afe2602bb93ad5ef911189f272eaa1414d07287f5ab83e4fc95c65fef5c5cc9e050b384a3fe83bf8a1a1f3027a8d0d9171ba747759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/et/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/et/firefox-67.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5dffa53a49117d2f0c6442ce343c08c5f5764535273ab85f7e603736fac25795fa672113384de47b649d7214c84af3d249ef1e9ffb43db7d81e51e59184f8322"; + sha512 = "b7a5b1ac669615f9d54c8f05693a529286b0028d64a20d490d89192894397f204beb7dfa36015715c493012c5d98985507e40ffda8a512229524f6fb51d73fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/eu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eu/firefox-67.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f401b7084044c346343c52dee074ecc3478dde92cf9ee9f624749e88ab2ae5c9f70b7a979129e84172d785a81228edddb9023351b61d6c74c2ab1137843f67f1"; + sha512 = "e29bf62382356861e5f27193af8888041791a18e3400bd3f363335b6d7feacad170c324da04d6a719de45e146e6d0bfae8b8510e9bc5bc1bf337b3fcf3594980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fa/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fa/firefox-67.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "af65c1415f5fd26cf0b14dce1855266a2e295817405abac6402f20f7a409466e7d7dc06a9233b5cb9064f9ba5e954246db20ceea0f0bbed4d42e93cda77e22a4"; + sha512 = "715c176902bc4554ca01381aec9286c8ab22955e7397cd0fb85b3600c059dcf1da33999c13103344231b6740574c0c96405f452d642762ba0f10924d9bfeb1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ff/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ff/firefox-67.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "6440b9db16a365f44064da652ea4b36b9976794896e062d627e200d6781d35fbbc98ac6d148c45de38788b204005ecdb0857fe2e02cb7240536c00e5ca3fd8a2"; + sha512 = "551abf97052c1fbe079454b6a30c5f920e7a3f7e733b14949bbdd19ef9b025037fb0a0cdb9571186e451e4f46d2a5f56ab54dc101805c1717995c3d0ae1cc470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fi/firefox-67.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "756a89e20d96e548b27570a907595b9aac701df8ad9262f5c82ddbd25d508e07b603f8d24769d756e83e6e4e9076144bdf39f66ba4f1983dc447646d0eb88b9b"; + sha512 = "571a54c29163b9cfa7cdebbc4f54a7f4e8d00db350a78ba091c2b1b8dd497f17ecd06224d70bbc5a000389946b98415b6364f1025b012f098890a6357f36585b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fr/firefox-67.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2c26924902510167d88e660fb5236e6738defa5cf5600daf1cf9267e7ea05541109d5e736b7f78e311b2e31e53216ac22d9236f91a51498c40e376fa1a4d9387"; + sha512 = "c6eca020c0bc956b3091a32d1fffc8525a17d37aca125b6cc52e8c5bbc0a1732f2b39d2c9d40ad9f8da39d27f92349052c8b11d70eed14ee077ef2d85411c44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/fy-NL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fy-NL/firefox-67.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e45b45c0b84504c978906dab3057c9213301767efc4e63c760ebd4d8b44b59ad72fe486877216f6062a592ca173a13fa5341ffaa1106763a43c215201b390079"; + sha512 = "5290df5a5744e5923373d779dc44bda0eb43dd188ac8f625b2650fdc5f473f609b390e3a35cb2f2f58af7272cc03d8810c6196b5849ecd048b779c3376ade26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ga-IE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ga-IE/firefox-67.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3e2ec6aa813351add3292f8d646761a5ba0c371f0017a965b0b815c9d6324bcdba42f3b585cd9df4a187f1f0b40d3a78dbd6357b4d46406550ce6dc52111be34"; + sha512 = "9967754d5dab1eb69a3d253d968ee25742f5620ee224ba025abd1f1ae563c9f85ff9749836664782c588e3bcbcae9bd08fd10ec614d435b315fea684f2e58098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gd/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gd/firefox-67.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1aa9d0bb86c56182c28efa5f92dbf58dcbc83bbc187bb942f5e418e75d586fd1742568ce5ac5871133cb0703f83ec2b49f1337dffd327aaade3359e740b50fa3"; + sha512 = "44327023cf1e4ca72c8f0018c5d9a9d7f372cbc58a26998ef76fc1564a8deaff9ec2029bb39e715ae3c38291b400761382c26ab26ec5e16fa12c041361c9d8ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gl/firefox-67.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "121f5f6c384283cf9002cf4f1bceed611e28d1afa837e2d19cbc18a0d6a7ca291c5d7b75d110005369cc491023bf84632f0919ff359ccd12ffdc449e4d1a0cd5"; + sha512 = "221dddb179376531facc1f81cee84f395af32e38c243c15dd570fc049b51cd9ce6daef9d5c6272a7ede8a6455422785ee59d081a61bb0814ff29a11648df88f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gn/firefox-67.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "66ec624b0b903a215659ef34828fe83cf64e7d43cf264624deae0a37aed9a0980be850ddeacddd8ac71b27ec6d1e635f43ff1f75e5c7ff13848220a27a23df4a"; + sha512 = "0aecfafdfb0d0a68db10de7300af94546cbdf3a404ab6825e050273b0fc4fddb8fd4e5a64c11d17a6ca02452f1f2e66fa346e2c31e9f67135a2386e76673f0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/gu-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gu-IN/firefox-67.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7438de7c95068a4c84b57b49b86652641ef176f88c715789067f2e33edf35defc4776f2b891f1cce2813889fb4c03fe1c26110564f02c82326cf48cfde728af7"; + sha512 = "2210350d9201b82d4580ae737be85627fa0a9081ad1a546344a758bf06df806933dbd85fd71d914d3b2f374d6aeb1b5e2622c441af20076c00ae9fc49c55c36f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/he/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/he/firefox-67.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4d6675d21ebcafd60fc27971676d9f1d87823fd0f6f384746b7e5ed9ee1c4a3080cd1b93a7481846f2955f12c3648ddb18424749a1a2d11eb56e74232f9bf7dd"; + sha512 = "696c3425ee41206e7571398f6f985d4aeaca819b4bd606b014a66f1ab0c4c9439f3f3c0c14f5575e0b76ad66f3419c64709a5e9610e6128bcc94a9e9c6bc1a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hi-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hi-IN/firefox-67.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "fca993dafb56b59235a7935dd19e2241f3a4c81bf1d395beb971cdd4c4d3f2550c90a76920e55d5ace09c900599b48fd7f9a318fdf4e70f0ef26c7f937f0b3ae"; + sha512 = "a256bec2ec2c8f290cd5c7f49ab55bc113933e90a362c06cb57d67b8217b756cf1943f027771820ff880f9b2855b27faad1767ace50f3275fd7e2160bb34ba3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hr/firefox-67.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ea3fafeabb46eb2c674c4dbd53bc1f98badc09ee7cc99f2deee75e2f377c02d79c2c881361500424db5baf10afc016c074b8a0b91420e1769dd5e71dc39cab85"; + sha512 = "b08954b84e29e667286bb3169e6679fd635d38f4cba8afb8be08a4695ef24fd7d80a921ba769b4330fc33d649889be6aa5c661ba5b1aa5546dc4906babe489ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hsb/firefox-67.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "493379fdc37e29079c3561f26c5c211ebd4a68a5d7055e5089d0c25347d1f38252b5145f76a910868f5edb820d02d46c682a6226c97fe674ba2b37dc4ee4e39b"; + sha512 = "456fd6f04369731b5de70bc92fa7a00b32ed9d16cfa80d7a678cbfad7ab81a06f9d63c6650851d7b66fbc51eb74eeec9bf685be06c12e873e90b46855dedb10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hu/firefox-67.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "983dd20160987e94cc311fface93c64b8e8aa99373b0ddd09154e909504376173027f7eb05a96fc205c3e1668743e05001081bb0708c3a5ece02f95009f6ba35"; + sha512 = "f7670ea1b7e2a137de1f4788ca3f97b49ad19604987bea9910b7e46241244c67ca2bf6be12179aed93b37e54317a762d08d5d5f1714a923cfff27db5ca44f995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/hy-AM/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hy-AM/firefox-67.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fb8759786a313692a7de408bf377614264b5af657ea9ce95bc7195e4075196c69801267913d1a2f980420785b9e04899d81231b8f00729c73037f9d22b9a6914"; + sha512 = "3a276983ab7aba959cad42a9c5c2769d2ecf4a9e781fb132bd6705cf787b0f1f0c3277223ae71ad57d68aa864a91e723c1a48a3312fbd30e5e8839dc6f5fb5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ia/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ia/firefox-67.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "1c7b9e314276e9e0e94de008ac928c2a8dba0fbe4255176643f9f7aaf0e4f7a2edf597656a0b656b94741b55300b850943cfca51d1e2437f84dcd6ed2884c11d"; + sha512 = "2fa1f3296562569721a3dfea681ad2773ab7c4ab41890d395aae13358f081b0dd7539fa49a98db1c1c111eacd451ed3908b3f382c57968e32c00445e8d0b8e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/id/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/id/firefox-67.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "52f31c787ced6ee5fb68f910f565d6890c24cb06f396a7cf60f9dd4832959468dda4ab1f65b874b46331a251679cffa507fefdb55803f531b41cdcdf848d4eda"; + sha512 = "10088c590e7abd7a55a1fc8b0604446581d41f492cd376bfbcda1bce04d5b0f55865a4271ceab44db0988e28652ba2da03570caf06ee1c6241f5e959f7e84411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/is/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/is/firefox-67.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5571678c28173936303163ebd780663a9902fb2c82df684fbc935b45dbd81b82654981de5ca8ddf2c803190c3df173d9edf7a5fff6faa23932bae0d084a1543a"; + sha512 = "013b1f3179269cb1f0e98f3467071fc6b4ac4ed6dbb57812f68df54457eabf07240101c1d00509464e3cd7db1696397901469d706780ccbe21c6ddb593d83512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/it/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/it/firefox-67.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ecd3509595c0f9229202b3cf45d50bc5902c1e63a8064cca77f0eb559ca6270fc49497448c2dd24ad775c0e229963c6aa76c6bb07736751a318f4c365839e276"; + sha512 = "a54971b746c619de3969be284dfc9215fe9d52941c4d1ec7e0d87cb994bdd4aa2ad8b015a464aa4055ef6fc00d9e97693aa37fecbefe6caee59762232bea6a2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ja/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ja/firefox-67.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a56268e5cd7f4d9eb598dfaeef7f9fe56e98aa0a0552f17fbf2c4e4eda4f64298f400d03d89bec27cb001db65aa4b91abf9aac0952f43c22e95f0c320ccb0f74"; + sha512 = "2ca7b68636506828120254d664701a65a381c67daec28c6f3cdec67af9d24d80fe1ed3f6b276f4de560543c9b5fb4029222a88207916c4132c99748499867d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ka/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ka/firefox-67.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c57e5c9034989a5ef6fe6fde7f179dce7a8b78fff442a0d3db93138d6678f9b4a74a8d5d51db16953a729b48b0b7530d29cec41f6cb1dad27677a759fa78036f"; + sha512 = "38af86bd57f5171b8596549d6cfc5b9580dad62e00ebdeac2e8c7f628b68b142221245483285f19c064eb949c972d72d36c160bf62960add24494cd31bf3835a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kab/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kab/firefox-67.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6b1241dd610794867f58289a7149038cc2a8f5bdd17f20bea99ef7dcf3da2a683079bceb37abca6d21a6d2c90e3406ea406f50670b189135cc656180c13a627e"; + sha512 = "5ddf9ac4621d1ae1e8b2c79c77428b4a4ed59a5fcf64043edfc527a69f01a7697931fc9713fcbabdfe93e4387a6a59c1bd11e34dc8de47678c0483a737c5342f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kk/firefox-67.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c0f4cf4cfc0894ba9bf48c29a8b27266c637d7d7a293465a048eab1cba6ab9668b8f274521dd670425a02282e073c148cccf7e265910f4f034b8edc1b704bc9"; + sha512 = "cf5920e7f747fb00ea907570fa842e0c64a02ea0ed9b31748bafbbce7de7a853020e675b422efe0b0a8286035856fd140211c769c2dd71fd7bc0af7805c1b41c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/km/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/km/firefox-67.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c5aa21d97b88099065b571f007ddb6b50f86b16d82d2ae699387b3618e47fd847bcfeb34e18d2c7d1a7dc402a5cc99885610169abc41fb5941b3fb0e959e8a7f"; + sha512 = "38469fe38bdaa42c5761eaa1173a118923cea15b51bd9adff1310dd393377164243bb46aeb390677506934cde142626b068326746d93a1bb176fb8185cb20cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/kn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kn/firefox-67.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ed574cdf851b071437bd21f68293db4c3dcbc6f259651c25617a64719e36dc34f22d43a3aaafd08439d8ca2f52ccc5f78a109f52de0c26a061e5fbc197990172"; + sha512 = "dbb5922c5797e4987f88c2eb6a66e3da9fb3a5c0178ad5a213bf7a4be1881dadba9e763fc3d60bcf594c3ed8078e28068931d063736ad8a02d66af0a45d4e96f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ko/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ko/firefox-67.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2602dfe1c534f688247ee3b14d80ccc75d43060203e965fb6a28e659031ebf9c10621aaccc25cec62663f3b52198579a8d9db1be406d2cc99d54d1125177ee04"; + sha512 = "3f2541f7f7c9cc790057151143a7cb44749c40c63eefc246c77464250a8e1d08afb8899b66488427454d6756d1d834b05924a0c5ae3404b3c581ab1932e14aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lij/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lij/firefox-67.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1e3a78df80e259d0aa52d13ad3a47b65bf37ab4cc456b3704991726230bfcdb5429bd727f8631127f878975535154acf3b8f4b32b97ff815f3fd8efbd2d24761"; + sha512 = "66d1263a4782a9016dc88ca53072bc0c25378e483c2fb228320f0b0c5d40ca4c7e70c55cc219ad45b053a51bfbea0cf95b175226b9b11933a5dafe6ace2fb060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lt/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lt/firefox-67.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3ab5e09f5af356428b835fcb9e9e7c7a1fd710460fe42072bb67b3007efb3bc2d24d8013c96474763245d7bf806f762679e8053d73d20b6fd2b01f5b3f529f86"; + sha512 = "cf9d6090e722ca2b9f997ae7b4053d5931b57eeec0e58670b8661228261f68b68f30a0f4d0ea47804111477c76a9646547e241a0bb63df8ae00a4d689f65ab59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/lv/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lv/firefox-67.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4f87af9f69d52f13424f481d8ef4109f74ab361c7056daf9b81581076b55b8ffd1b2f96fe8c6cbadf16418292e8c49d3149199401a4da519d1c1c29d6c6edff9"; + sha512 = "2f4dbe187f370868d52402c0b90e00d93d04e45f8181a532a2d3cbf318e241cb6702b707ba73c90e04c310d12c5ff3af928139113493bbe5f60e7e4946bbfce6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mai/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mai/firefox-67.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "06e3072e5b94767a3c42da911a322ca1a0c403b69cbec216b3fc82d1182403ee074f3b595b45aee834d0e0267567cf0adb97e99246e0aea233f6512f39b50bbe"; + sha512 = "ea694207a5546ef818725fb85b0605bed3e02b7a87c246669e5e4e378abfc29c2547a8f01c20bf2ae1506a46d3d8068e8109c2a3d75822eaa93a65911b82352c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mk/firefox-67.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b42ddc552556bf32f3f11897174f452a23f812877219bf0624cd0ced1f2adba1fd8d6ec8e7dc0c5127a22ee25728c7f73ed6cf7c876373f2e26735e1871bbc78"; + sha512 = "0f9aefaa8a15f51f7473753e8483ff1818f3d8cf914303709d0f7edc18f19d014c929d54053f0230029580b3042528378f41d738d6f53cb7a721554456ec092c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ml/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ml/firefox-67.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1842099651174a2adcd42cec08e9250fa00fe8e2c80044ee170f9ed411757a44224876ea270f4b491e81ba99dded91d07747a7043d3d43141d4d31bffb4dfc29"; + sha512 = "dbc650bb5c23fc8cbb7d944dca5f5811622b0d6c56db8623aff70e143d21b6f490f5df02f78c2973e2cf9f4f45fe5d7d826e6cedac7ea2d4da983067823fced6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/mr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mr/firefox-67.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "74b439a4742da28e1c5d34b3b4d7c8896c6910cf6a6088bd06b79fc881b98bfb2fe9a6f4d6f9a41acb7950dbe5e334f40a9e978c964edea7a34b510bcb971502"; + sha512 = "86bf49cc160c2edffb4a1f3c49c6ab575a19e9eb3a38d2c61a8d4458ec25264a5d1600fa9ca5fd53dca81767561345568e4c215b1b1511d381cff1c24d512d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ms/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ms/firefox-67.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "798d306eaa895e6d673851865df7dd2ec3a4f2cecb3d88d432de9ca710b8c67b00a75a070e5c736c0d86f2bd785fee515cc8f33a22a23ebdf593586fba7825d4"; + sha512 = "ebac0d06344fb32e97ea14301f1e40fa2392b7dee10fca1200d715f9bcce3ab6632d6945025475c982c9500303d5f1a0006648463405ad9f133b7187b0f92521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/my/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/my/firefox-67.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2ea262c2c96bc20ff8814880d25783ec6dd5ad8cf0abdadf0e4892ec49caaa1eaed05680404ccb74b3a0b482ab0593992c25a77037b39f8f081a6ce90eac57bb"; + sha512 = "bd50b6ac3d8a806b09e0c905e99c51f9f93948f5956cc98a8b7b897c36e88aff66aa7c4f5c54ecf2b5e69b9ba9394c18a9e31bd66874bcf0ecbb308f60a45d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nb-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nb-NO/firefox-67.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f49e4d833f29352aaa61c41f400edbb121675ca7bad615a3a65c8676283ee91f89cb505384722ae5326f3e8311dc3ca6330e86652ad09b3df11aa6f31b109f22"; + sha512 = "16227a6bcce8136152f9d533b7c700427dd3ae1c1649f35d30578275d752ea6b24c9c9f224279a68826300971ca2900e8d7dc75f74a2b9727f81a68a58ff3b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ne-NP/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ne-NP/firefox-67.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fa2da86e5751731b4d76b20d2c4e7e4313ef029184580c8298a66fd5f7b203508a3174db7733bfb4859eb146b9ed6b0699490210114b995ba0eb62ab85af29d1"; + sha512 = "ea3fd9a876b297f2247600741add6970162bbae88655973ca316fecda9051aba06544c2780274a53badacbee701d067b7252fdd656c15c0f5d100df97967bf85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nl/firefox-67.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8aefd6428b710df898cb9e637367a2d3ade3370821630230afca1241367eb30a3cbbb23d4dd6c816c19e6804766e8e84c00c7e3002dd91d80cae9c6b5c003523"; + sha512 = "cb7001a2f345352f3e8ad0fad0f01622bd31a94042e59910fcfff653b46b6edc13ff2a4922f2356f0eca49d1260319b615c549fb383469798ab79b837d5c6c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/nn-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nn-NO/firefox-67.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e1ee61f29b915ecfc514981d79be115bb55981cd28a10f7c268f4e3a8cfb80524c409950a3b38c16988ccdbe5eeb333ccf3833cbfc5b3243f08809ac79dbc0c3"; + sha512 = "b31447c4218a9282bb56a28a5f7a30d04bd4e08a2184d3fc275af2d42b0272fc2e035f4b8e433237661124675a854f87c2c63a5ce86567b1a5fb439a43e607df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/oc/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/oc/firefox-67.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "802d59c2d9a037140d22e62cc06a122c41bdc0120c54be6654de0237344ca6865d1741fd852e3391fbd508015c9fb4c98d4bab46b028d1867b61dc9eb900b60d"; + sha512 = "d03c239d7fcf3bc2c30376d24c9f12ce7ad90c6f34f9582d24587bef9dd4dda9ed7fa1865cf88198cb564d5d629933e74f74dc27e5c6b3ff0c2e43331660a9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/or/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/or/firefox-67.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "c97a7812ae5992f5832c3c3e456e30f166134f09b086257e78414a1e790d19a2a5a8871eaa2fd66b0efa30881397bc29e207f5840dff891a27a1e86bb26d8ff9"; + sha512 = "ad7378d6de429e5f23cf77a86216f4cc87f5b94226aabfe218ffbac19046517a1b38da7c41f09a5dff11706d1a9c5810adc296d6988b15fa3dcb9115c6152dfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pa-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pa-IN/firefox-67.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6044da60b8aafda769622d9069ce10916818f1a266e9457d5373043a8d58210a822e0091450a613967d2278f2817ce24daccbc1414c963113265f36602e34e64"; + sha512 = "fc6b3a79dae9dad8d588463bb989456e9f660b4f88e0af7c3bc7104667f9008993995c6fa8cb9cf85cab270751a389eb7d51eab74208a39497a1d31ef1dae353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pl/firefox-67.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "59cd02ad97118540b52aa981167604e82c5ea74af22665be63e7dc3e01a8a13856810c293d04125d015306445dc5693b5fabebd62bdb04db4dda09b05db81078"; + sha512 = "a8a31bb6a35bd28e7523a79b8032cba69eb90757840679c6053138d2a5dd0bbf05baaf47c7610c989527df4b85a354b6c9951019d7d194071d1a0c2eb36bb370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-BR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-BR/firefox-67.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "987f650e38aab5d59f4c84da3830524ff0e141102649476fda04349b3960ac4142e9731a46da6457ecbcba00e402eaa5c0c6ae78189c9b223bd0133b823c887f"; + sha512 = "0313e7a037b3c0f0f5fb9a6e7f6cff432be6561be11d97dd404fca613c31d623fb40b6d32e9d2ce470ba8957501113f4b1b72cafa496376909a737536139b587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/pt-PT/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-PT/firefox-67.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "06ce2ff205d1e14174d9dbd07f39122b093380c22fe74661321a734882e9232138bdbaddefad598c9344dea8bd61e81ed2c0bcbd2d09df616a05486635e99ffe"; + sha512 = "d560c41760a411fbcdbf93037ef630c4ecfa9aef4e63ff1ed0441808d927c995755e22db22a341b3f05dd00cd96644307b15214815d45c23ca409da62968bd88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/rm/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/rm/firefox-67.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "75f5b24fa0ab6b069a25ca568e2ad70373762e03353c7340e4fd849803360229f5dd8cdf79bb71a04c047bcaa63cbbddfef71b35d9bcad3f8d8492fbe6b88847"; + sha512 = "49a56b51a2d047aaccebfd6d173ebbbdfadd8d109236525b591ea8869e268dfd6e4ec297b08b9a8fe7249b150a948093fe6f148a99f9a45fed5aea1fee988454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ro/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ro/firefox-67.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "acc557c9634f09e206478e4cdff36e7af4a70c6ae25dc9c92f15143b4239bf20291a0e977c13f98137457e97601e164a0e1ee8ebef387acedb1f2e1cbc2429b9"; + sha512 = "857f59561bdb90ac7391996857fac28e52bd20410223331fc34f176c8fa5aa9660b4de53be6f0dc7ed4b980d7f25e7a15ea0c2512c2e3f10c28de987c30079d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ru/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ru/firefox-67.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d5c0e11d622eb0f5681b78cff605437bbf12570f8c282ef8cd8fee405c06f7a42a402d27f784b4574828a0ba320cba4849b56c0f639c2879682e0cdeb6a05d76"; + sha512 = "9316846515c061c4c5a7db307d30be924b44f272f8dcaaaf937961d8a9e0175f23b02ea65502a9707c45a2552a7fd2346c1642131652d2ae1d7401a7d676640f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/si/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/si/firefox-67.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "75ff287200ff05afb435604987ab56a6177f86954c1233e2d91a24c9529205af9b891b771aee02c21ff09adccb90d49bbf33c1452d5921d4664ac3575d69578f"; + sha512 = "73a3c7a9caa64b5c3817ba41d9d8fbabc5d6b61bb77cd5e256767614949074b562f560a9940ee2a64990305c48e3da7b02017170a6357d49c176388c2544e38a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sk/firefox-67.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "485d0ec3d88c3f4afbfc8e1a7171b463d8596efd85e24a17e1da71df747b48680087532d8cd0d86bd653d6e0a3ecf2ad0566527c1448a6cd13d4958c2ad8e582"; + sha512 = "5933911938247063e788e5337ff5cda9798b96a52d69fc98335750544e692f5b49fd6ce2a3eb5b9c9602177b698f1c7b8ca16f568b0fbcc8631ad13008487d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sl/firefox-67.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3453d03f4b43889409230ac85918c41b2c4b28b17a88ebc6e3028e943ac840ec13529759f01b55beb69b47870eeaef54130b4407300bb7bac5ecebb9d9267459"; + sha512 = "60b2665da81fc9129236f6dc2a43a0f6c0f515629f825c55bd1cd93a851dd1fefd286957fd7c87fa81dc0238d192374016c78a737b3b74c85449777253752c99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/son/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/son/firefox-67.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2585dc5818fe8fd188876319aaada09cc570e2731b70a8948d733f49e878f081a999a27e8a069c2fefd89ecc78d994b8e16b00758d606bd8a6a326e70f09de32"; + sha512 = "82a03a13055a54c3136688d1af7aa6ed2742de18f15b718757dcaddcdbd201d2da8260728bf207355041598091384b5d74908dd2e801cbc3a153ad5984cfac36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sq/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sq/firefox-67.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "bb1ac7b25f80a7ebb58e989710751c168014ab4c40681078b64df26ed224908acf6d0248d1fed9bc95d8719faa78624c45636da30a79916083a60ed2a118d75f"; + sha512 = "6a37ffbd865585b370149193675a4b00a69840928bdf1cf4f49fc5242094e3b786f45c8ad1fdddb2d8ada62e2dff79e7d93b890deb76dea042111cdb57cacc0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sr/firefox-67.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6dd2728d54df09705d6ea4c3e8191a125f0ebc547450fae8fa24fc3430afb654d72992b91267f1bfda5f11ae89b5f653c0536ecffdc019a228111cfa530199f8"; + sha512 = "e35607297ccae09ba650fb0f3c1bf68d276e29db8214e79f096baa1f91be0a11bad66bca7018664ae1d17f66977f7bc7c12f9d7b045a1305c32a9ed8225ebea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/sv-SE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sv-SE/firefox-67.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "086cf49b5cd6e60661e1b89eb0a1ccc33365bdba7e52e04432256be4975f27d58fd4d3996a27c0f63200d4d925328c5de898df7a5071200162545e7fdae6b962"; + sha512 = "364d9f71313cdcf42446d376c5e9a62a7e9941f0cbc39f7c6cca1c345411269f05bc04dd742473c12123a21274ae165e107c57be24a979e685f4462de8763b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ta/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ta/firefox-67.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f00490d45844a44dca5fe498771fe9490c56ab7861a93128eb6d55f09a4e9d77266023e0c6fadf1d121aae0916966c21bae30d9126e46a8d4f8d33c23f16671a"; + sha512 = "e0138b51e033afa84990105bf02efe7eb73ca535cee813498daa08c8c775016dcdcbe508603abe520537525b09a914044396d150f25ecbf59fff43857d27901c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/te/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/te/firefox-67.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ad10c5e4086d50e793639ab3c0cb7a066c5bf2627530e54a1954d15efe1ede3df900b968a545c3796b16b3a78176a668b2067bec09c230fb48da3d3b9c0144e1"; + sha512 = "d549fecddfc85e614e8d3459c7b6562040075c2d4cacddd07f6c78fbace5410ca3ddd97cabf1770779033f03cf26ba97bb9ffa32c1622d312e66f0d2a397bcbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/th/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/th/firefox-67.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "423f4aac98e178b832b99724d34e48ef4d552c8fa8e0a3e7df60732ce13ae4245a510305309507cbf86d0ce74ca06d81001b3b033912ccfdcb138960848cf038"; + sha512 = "88f691d2f7d7c609f420a9e88077bbe69b70fc776f56789827db58c9d2042c280e21de469616eed2223e47250d65276cc9b820b7ffe07eb352ee72960a00d626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/tr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/tr/firefox-67.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "8f0a5ebd69b011ab3c8507ac7e7211d41a449c0b49c63a484b7b79159e46696407cd8f96387b043aa4c223a4021d5f282a6b19e95fced18ce1cbbb494fc47118"; + sha512 = "766732c13e92f8e7480f8b866d6c744d3f8eccbfc3afaf7e64d54553c2a720e082a062ed4e2e852fb692aefc0cd20b67f9c74c5dbd9703e22399be6bd5044558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uk/firefox-67.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2b9e0678eae4dd1e920b3faeb3484441afe0327dd7a1dd42ab0f89ce6b105e2f2856a62789a02f90b6e81ccec1d295116b73b469dd6eb734dd929b5409915043"; + sha512 = "e9b335a6b6e37c5d2b89f9db8cec648834ba999921f7124878a324711c71b3c0320845d66285e6e6ceaed0afec2417f2c60b43040ef9f1e3101f8a25e23b4010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/ur/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ur/firefox-67.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "68676c3387141a73060702899e7eb2c1ae6bde43124f844a5909140e9b5b180d4ef226bb1785265f406aeefffc7ad3b56c89fab12d2e92e41f0cf0e08b7ae691"; + sha512 = "612c52dcafcbf0fd6a5093eb622f272907087581468f8fc0b8267df22338d6381ab3fce1a7529d782a6e8d65b69f44fb4d004a6d05df18c8ec2d335958b0149a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/uz/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uz/firefox-67.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4f146ecb3c9428e6da96c8731df491693bdfa3aafbd3d898aa349e025baccca43514e831d97a54d195c610fec5e12d3cb3ab8763fc5a1e6c2cb210e5de86ab1f"; + sha512 = "f5fbf80cdd8ee76ad0143447072ac3001ca3e319a23df7b064794088a80b0f3ab5ab2420442db75adde0cb8e1ea926ce302cee04dd99be053f3a1960abd2f159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/vi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/vi/firefox-67.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3cb5572bce606f8ba96e3fb40abe943dd1a5b809619ed4c72d9f645deb3af9e2da198cf1c6f8625447c5c63d4d3cfdf7a093a6a8d6ab58edc179c9763ccf942f"; + sha512 = "25eb2a25aa2d402be01e28bc9586234c1bcce6481420c3905e96af7eb89eb4f4417f899ee78ad67f5c8d089107f4a9b653748edb496a9cc1c2c6d4ba19e4d59c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/xh/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/xh/firefox-67.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "13d182190781c091de4055a3758dca2c35ca070a570fb48714585caf1e9306f81b98d95fd321675b9c946eac09f5256bcce396dfd9dcbd3c0749a528ce08b300"; + sha512 = "c4d2b71e81eec63993ffd5bc554b7b6b94c9835ee2b75df176c1ad441b57c5a214540c5907fbdf4b7f2f1a59383cdc3a1ce80e34a4669172e2932f7098f777d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-CN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-CN/firefox-67.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28e1149f5cbfbd81871a4bc817f6ff1fa01d91ca63625431568abad1851373f402fb93cac8458cadf66bba7fd616c7488cc2703b524fec0e803a474c3c70fc5c"; + sha512 = "25b313f892ded3dde838c42fafa3fee85fc655858b9703755c90c5be6e625e5ff8aef61fa9ccdca1f09a2682452125297dc39ef44757fe1e6c8763dfbfacf237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-x86_64/zh-TW/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-TW/firefox-67.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0c6a7a431c2d1ba3d3b437f56c68914aeaa405e90c05530f996a1448266d0dab1193921c11291b8eecc32f194e24bbd2744ccd8502f36ba8de074ab6ddb7b605"; + sha512 = "a6d2038f739835f9dd0fcafda6dd0f13c8a32c4ef473f142f542f2c3aee8c05b6a3465f3d923ca23c540326eca60ff0eff1367080ceca5b4505cbf07c9204a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ach/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ach/firefox-67.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "143bde45ba31f2ffe4784f05d9b78a58644f6e8dcf85c12261cb542346352130bcd7c7cc3fb8fbb537af096902f8594ff90731fb680673bcf3902ea7e8fca165"; + sha512 = "86c96395c9c4a80e2afe326e861a5e040ab366cbe99ebf6ea1953feb28a8a28e100560f9091fb653a57c5a03ac5f64ba0611b30f3368340360e740ab1189da02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/af/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/af/firefox-67.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "93b15d2721533f3b3b2a1338119adc663785b82e3a48549c5700be522c03a00fb46e8413b31c2ea39180cf8b2b7b4a3a7c766daf1687dc389a9bb314b744aa0b"; + sha512 = "c20d31426850f273ce37c2a9e358c65ddbdc49918128c3e6d15708f71efa6d013cf03a1908baf5f11d6807e7e6a4cf81a6105c707f1a605d0f41004c2421d3c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/an/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/an/firefox-67.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "61c2b6e8a028a6af70d047d35fbd14b25d87b41d3651456f4e4ce151560e1d8618654d31ace7a99eeaae6c7e6fa438782a2ba3826476bdf07664a6fe11ab8040"; + sha512 = "e73bf9f56f9c8be190152c25f1e4c9dd774a83cd8a2a8a00133529f9f1babbb6cedc78155b17681fc5653653189d74fd8dcd79c8755397a1879241b1d602d82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ar/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ar/firefox-67.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5d41aacd05ef2c548e12f8f8ac9c9e514b55be400a1de82709b27edf3a0a31778a40ac01e63d170b423c56f4a9a177d7f4ccf511311c1f140aaaa259eb6b3273"; + sha512 = "3d31cccf9abb583557789f0c6a3b0541072fe79bea42eecc27915f4b67a589efcec0ad6cc7652520d1b8f4fb1f16031df4b8d005d361e7e773088d163f550914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/as/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/as/firefox-67.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "8e92abcaa8bc2b891446551db5377066a4ff25dfa76e5f940e5f0141388a3d1ae5ec57c350a45d655ad573da28d99f465721621291a049d93bdcc20f8799b434"; + sha512 = "08107142b1702e0d596e501d8bd754e3f76c1fbf1db3af26eab17990f224e7bc19415cd37753cdf8080413dedf68da32b500e37b01f70147d1322d86bef42459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ast/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ast/firefox-67.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "661508f7d31d3795eeb0859289b45eb9efae70afe714153beef4dd9af8a981aec74cd2a31207cff95420b2ff2485b8ccf6bd104e9269efc08710cda1ad9e0f43"; + sha512 = "5b0ea06830da459ed9ca585df130fe116de7916010051a45edf7add136ccf1e058711bbb94e376a4c32bf42a7bacc0ea2fbcbfe28e8718de2660e31c5d9418af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/az/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/az/firefox-67.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "518cda92119d08b6853e55a2897444cb180ba21f6a1d5800667612dc56dea3f025ae6dbdd3f950d07c9fc7efd5ef3a4a0c5ad1de40734bf4d4e7b70c0bae0889"; + sha512 = "55c8e4c71880441de9c86a8fea4f6401b7753c25ef4fd4af968e3b29c6334fed635e232d7cea728087015b7bc268358284b183818e38f388d8e6648803d4c49c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/be/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/be/firefox-67.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "36d328eaf96c904b04265c9f66eb009e9a7842a1d4848bf6135b46442b91aaeffeddf5595fe6cbaf53c6c9fa9ade1beb01726da08cdccd0444e8182bc61b74b8"; + sha512 = "904257df324a2ab21703e314a4df6d354f2a462f87139c861a7d4836fb34016e6e6319c06f6a58d76d20fcac9320266e5857b46d90c67145f44fd42442ac94b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bg/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bg/firefox-67.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "387e8771aaa032eb51f6db15be9feb897db813674f7f8444e13fee82cfa2ad108470d684056b4c858c22e35b91e08cff7f514aa36157dc3879df3c93bbfaaa48"; + sha512 = "bd5ab542b9180f9ccc998a7b47193db902e30147e863f298e57c633c3a3da44a44c6ed40bf8c7493ddf02f1c195381c1b632b1ddbf7d6050a032fabba5944d9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-BD/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-BD/firefox-67.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "70549261581856bb220473da33f605401a329cafc63ffae697cd2dca149e4a55d2440539e97e5f9dd1c781c9c39daeacfe8027219dbcb6d8dce81aca5a50c737"; + sha512 = "be04077c99b3b3af610ed04e04cd4454b4011458e50dedfa5858808d76d1764c5fad4c1d4b70a32621d21449dbb78cbf266ea2bef05c5bdf8e84cabd8ae62490"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bn-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-IN/firefox-67.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a9129a26e2c923c8484a3b1b1a20b5330cad29f127222482b771a216a93bca88d3fa33e42fb8c39edad61c61939be04f362888b09d483fda60b5c97923abd828"; + sha512 = "fdff31833055416147bf4776246313868632a4dffb6ed729418333c8c44d1963ce204e0b266c8a15f9785ac5f8cac4c1d19fd6c3626d334e86678d60d8d1f1d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/br/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/br/firefox-67.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f809eea506327ccfdd9d816d7c0133e90154ce5b4c7209748fd9439bae2b28a265087804fea7a1ad7c5ee810b41b922e196150e4fb7b5b8ef6138420313262e4"; + sha512 = "b3a36358b2e759ab9fabb8580adf53689bdd26ba5aa432fb916cb91c27fbb362fa000ddb37639b7a7355911ff398395c4d8da2a67d66bf91fe5b34b48f9689eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/bs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bs/firefox-67.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "12973bb2dea8bb8c2c046e45e63b4b34d0a49d067703274cc32fbb9ecb44a8919361743269ffbbc7bc7716bb20f3696721c4aca41b45fca68160e308e3934a10"; + sha512 = "a2a16f68edafd37797248a33a2553c08958e279ca7f6e120b436e577c238ba9333fa0833a5c926c2c8baa77e4cd7b8893031c6a45648c1de6fdb81813cf83c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ca/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ca/firefox-67.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "25dc6fb35330d637912656f9f1f813c6fe742c6f603b879e236340e073c056207ef59c395f2aa6d6a3aaad2ea1b1f8aba97602597b272af0695143ca3181e64f"; + sha512 = "74766cf52c08ef32a4c2b4ce9fec440a2cdf28dd231478d5c48c40ed126d8ab76d1cdb5e69169a9c104c365961eba99fff599589be7814097c476943a9514924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cak/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cak/firefox-67.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "0f9888724bbc7157a9838db6f58ff57c93c527042806c3697d8ce996c4d059cf47daceee6a39e79f1a4e01d8ea4c0a1101808e5eb2d99c5fd1092833e4df55dd"; + sha512 = "61445602835570c4b93928c8a2cac4f1e06d911c16a7d8c4679b23bf4c54a7fcbd387ad7e70adc1fe837b28cd750404f2a47cb442cca766a8012136c98642b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cs/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cs/firefox-67.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3c9284275d4fac7697ffe0790ba8b7cde71f3297f78ac5467261f47d588ab620ca370cc349ddb8683febade9a4b761acc79236b7b1bacd18e819324ffdf61964"; + sha512 = "218607fab37e58f05dc0544dd1fc680da18ba8836ede030c8e551f99d574b7f5ca651a1c4e25cb9879bdf201bc1f3814d29d18b6014aff0d7aa1d7b846a992bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/cy/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cy/firefox-67.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e3047c59c710ca0f189c61089caa86fc844514ed8653cec9e64f5ec1ce81466890c5e565fe6790dd6d7388d8e5c48847eec54d42431045fd1a1de056544e50f3"; + sha512 = "1f74149ab335f37643545b6b46bf7c65d2b833993ee2fbf207c96a372989b724f81cbb6042fc11bf2eda36893ccadbd6f464c7766bbbf5dd715cbbabaea64b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/da/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/da/firefox-67.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "689e8bc5b0b93658da2e5b873d799b2f3f1548ef67f4c082a07d79918f6c7900b0aa00c84a115279de9a5e2d8f2fe083bd14476b111d589a610c539612d3beb5"; + sha512 = "3d0c84d3509ab18235a6858361dcd53151e23eb7431e32ce15ed241105e552374d843310eda7cd4bfc32ec459c367b2a21637dcd57b61f57c6a61723fd1fbe10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/de/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/de/firefox-67.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c4a17564458794710f52eac0e3e7e5fa3416fb278bd1113270b70f877dfe105f802a5de611d0e0ab5d0d8888dcf6d5856211a34a8315a039cad7516effaf8eba"; + sha512 = "15c16a024f1a5f1d633dc3c945316e6df13335199c835f5da6c55061525c84c9907afd66c77012720fa75ee98be0417cc04a40d3045f373e70a31c604507bf28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/dsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/dsb/firefox-67.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6e52744b4d65ebe711dde2c7f5e92243858d1218f18eba1e47b6bfd5600668fbd36ab3edd0a0780b6682354c7df5a2d3d0202263a0768dfb7be1f3469e1a21bb"; + sha512 = "ff1fb6fdb3273e8e9c67b0e35bd2f75ee70621f805efd4e6a47eaca3ad59596e4fd033693c5988180c1195fc0fa61aaa676de50ba9c1e7227feb722d61a08543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/el/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/el/firefox-67.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b0fabda2a20c3a9b0e957987ef4c859049988cd959331f83510b13c52752867722fb6fe99c6e4fb18a54f9ca965d34947bdb3aed6ad007ed41ce98c68297735f"; + sha512 = "504a164ab2d2cd3d114455771879ffbd6d6608dabdf8e09b579240b1e566c6763f457c950c080889586df03ab0f56329ac461bc93e161ac26918730563c641d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-CA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-CA/firefox-67.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "3a3952783b22490762054b0fc6bb73d15f5c4faf1d208abaa8f74ef6ca9b829594fe9b2e1c57a02df840eaf640dea09c399e62a93a2481e6f35c3271443ea1eb"; + sha512 = "0f6c00e0cf12a7342609a8d4bf13801abdbb3588c9c331a44f155f4668c6ac167db8de6baded6f097c7d30c03bfbaa60d645429459f6f3b9dbffed14152e9b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-GB/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-GB/firefox-67.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "64dceee7bab4580299ab32aafa835ab0cc0ebc8f9326e3b933b1d74b2ee35ed4a95ed0d896c38cc0ca880f5ac48f52019b910e9e1ca50d9eefc17e5043f808a0"; + sha512 = "c0195763b147462e8b4cc70617668475c1f6eeb04f03bd1feb76b1c7f10ca390877757d6067dcdba6c487ccea8e343eb1f5d4e9d7b8d5e24b5cde4cfa8c5ae8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-US/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-US/firefox-67.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0c0579498ec84c12e2c90ca98c79021e888de449d031ca4e27c7b969934fb5d63b997153947b4121eed7046fd42f264865d6a3cf40b4543fe3a2f7880fb0ef4d"; + sha512 = "ae8ea89613f36febe3d0fdae8267cb38a60a2c08927633e96d5e8f7d223043caa5e96bcf2f832c03c0c183b94043f7025659cee158e424aa0f0d9614638afbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/en-ZA/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-ZA/firefox-67.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "fe1331634800d62ec69cb1e1db48377280590a0629f6099af2e5671102fa277409a8e682139494ca57618c2cdc2d8f1a4721b6b495d10b1d775ac22c22756b4a"; + sha512 = "da8a2606a48587a681b7b70ebc8951bd66680183fceffaf1a37dd677954b8514f68eae8ecc0f193c310dce9318d33cfc86a3728f3c49413ec47a1dab57a8a1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eo/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eo/firefox-67.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bd5fba6465a78e821ad1bc15e63cbc4a5cc3c3bd9b9e44e9cabec05d0443d68cfbd4571963b5aa01c9124c1828f493f48d043c18acd6b6db1b5d9d339e696693"; + sha512 = "3a59f30ea0c40e252ed70fec0ec5a6af8b7a9632653dfb3cd8a10f5949a238c0c76de448fa133c0cdc3862daf92146bb5517d1ee808f68f66e84052cbc05cc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-AR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-AR/firefox-67.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d0be25abc28e79ac615852aa04b71800d07bef55f1f279540bfe198546ee6f0483dd4e06a9f23215c816eb4ee15d79730178dd54a2aef8d1ed5077c2d35df470"; + sha512 = "14cdd682c46aa0c4a26e4bd53dcee1bf43f82f8097dfa2cc33d82d43cb15172edab2ea55b604b805eac5868e68637ffb1a0e925ef0cc7c8fc06bfbcbdb4828af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-CL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-CL/firefox-67.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "636fbde6dbf8244652f4ded0423b708567817684aad648ad682371b37d70694444355398eab933626782d5ffe2274cebd7db4c24587580b7d5edd213b9170bd5"; + sha512 = "794f81e4849c307432303218b00e0d8460c3c25ed76ba0f695d878faf76a6085596384635061da79f8fab2de12666a30ae6d8a5488fb21b9a2dabc48960a404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-ES/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-ES/firefox-67.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6c786ca9432d8bc5453b3558c0863953457f1f32f4204cf39250628f6fee50050b1abdc0d0478600f497d3f082e1cd9f5a280db0202240c3f66dff2870afb9c3"; + sha512 = "358c84597f7bb0eb9af602867565e434a5717fce18b3af2e91d0e65f9620bdbfa822be3d09f05e48ae6f416c77f88d05845f11801ed94477cb76e5936d7b5420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/es-MX/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-MX/firefox-67.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "10bd832885031e67caf6495543bfee9d9e1e9f5e75c6dc34aa81d2f9f33fb89a52c2fac78e3c15ec8e2fa09fa1e43cf07035a2e0ea9e9a8d8ec21343b9ace36b"; + sha512 = "3b16575332be2872682ea81f22c72b5a0536ec266e892f0820d387ce3adab5f68168de43af27dbb7a1f062cc1d9822091a7bc6e58907edc39d8e1cac5d250fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/et/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/et/firefox-67.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1d3019bd7ee02ceca29b4c48a9f41c89b9836e6fac0d1025ebab2a8faa4bad5274c13eb81a1a919d490ee92400d2dad480dcf7405a2a3094273179256d9165d1"; + sha512 = "47079c0a4afdfc3545283f755c75bbe4ea48b2e0d25f65d5ffb9b3bc5f71eb6015f9f0cd62456042d1df123c8ad0eddea791eca4a91ab30733a53679d25e6332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/eu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eu/firefox-67.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c6e8c5e9d0b41d51b948a3b3a4a20502392ead14e45ac8c559bbf9313a9d6d55f33f1eb6162918020d7786db334b7193e00a4661c44fc7a3c3b7121c4e708fb1"; + sha512 = "1d95f71b8a83a86743bedaf480b2a916a8b525868c7b9ba0ef03eeaa3ab5147ad75103d70e7398727a79547bf7794bfa54c6e10b6995c5d0aec0f3ec2d703a89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fa/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fa/firefox-67.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6a0b16e81d926f9b52d1f160215e78d4ffac272dff5043433c372f902ac6c031006ad8367baaa815da766f703541804ee088fdc1d4184995f3ce5448860baf6e"; + sha512 = "e87c62186d950a8f89d6013ced127cba0156a38caaf6bb243a7a91f484b424239c6635000d88e77a17a6a6728f6dc2574b55672c1a79cd216a7393a795b67b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ff/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ff/firefox-67.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "65092d8889426a7966af531d0cb6df2cb7588cdd0bf8d79102772b0cb48759d2f611d2d7cefce7de85cb799fc5b65fe6fe80b3b10eb00e53328fb14758a01072"; + sha512 = "8fe3080c8bfc3cf6c13bce19c7fd143ab9d98df4f0203b4455664c69988159c3acc55179c628c2808f536c0e3ba16e8025a1be746ee94c7fc4c87dc409094d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fi/firefox-67.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3e69f8af10b5061ac183a53c674a1964c3840b3532e521c2c31acbb9d665ff6fc25f82c90c1c23aa08bbe152628404a3916a786b7fff0c693e3e9cd0f6baaaaf"; + sha512 = "33bd1973c034677a690598cbfe59fb7c03e7b60c78e28e86fa591af3183743ca2ac039afeb08ea17614426611ad09d2876cda88189f551f3d6ca2dd2ee963ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fr/firefox-67.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "40e919128406b91d86a64c7f1860750b17e3947d8bb58ac0b6b308d3b2f87ee946d58d250c2e735ecc0dabad844e67bab63ff7a41401da2a852f0f56ee28a1ff"; + sha512 = "dc316f3868d908f2313de8ba25613a3b5996dd158afc87e651130ec27e830a249f64bf1bdfef0b99952470cc895fcdd3d41ce336dd7a835da6be9278d8f25dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/fy-NL/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fy-NL/firefox-67.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "24ae60db18847e9bb877d512c6d30b14fa31c855b9ea82dbc86c7febb5f80fd0bdb1badf4ac1cd78f287f1a0571a07b85a207020d3441bd0c9454e9d917ca12b"; + sha512 = "68b4e73d79ea5e55b7a4be884191dd011974fc90fab48e6bf625fb03634c543d04ace2cfb28daa4c05e8bf9fb5666f7bc73f0b1de4c8bf36642279a44ccbaeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ga-IE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ga-IE/firefox-67.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6f44ba5cbb8430533f1e3ff2d1b7dc2c3eb869f54eba387bbc9b57b4f14d0dbd5dd8491190febaf76899c54805274484a993724b556ffa728129eef7a4b7b974"; + sha512 = "cb0b37808e36fc36c060b70e7c54012c49a6ef1e4a051fd8548742f8afde45dad0a2f5b6936cda2cd3df1412e72303a1e96a3131c50fe3926b25babf58220e6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gd/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gd/firefox-67.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e9691ce54fe3a0f9c90a90ce5ec9b6fc9c070bd55b3e852e9e586fe60d7358c9bb0c86ca2f0e0e305fce8df6c1ccd9e190923ecc8d9ff1125a2075c1986ceb81"; + sha512 = "eedac3197db0d0165ee953d9b7d2f85508c66600aa68749040388a3ec84d9315790b8bece2b64891a4afe3e9b333898ea397bb1b31cba87a9f2f4d4fd993f852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gl/firefox-67.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "27954989bb8d11c984a621b17a4468be77f481916974a63e4dd7ab38f43db8352c5d77dc200dd97cf5b6ab7d169e9960c9d202500492914c8b24ecc8bd2d6c4f"; + sha512 = "34e36d460877d0a6f9cf267fcece3d2deeb0be1646d0efc49f55554fcf814fef831f9d16b7814732f360196e7f26b35bbab37e8181d0869ddf4ce6d2ba2f5f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gn/firefox-67.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8d4c7b80cca5cc6d4cf3dbc66e56d62c9055b8b2c6050dfc55a52b1ecc835bf40027d22cca12bfc507491e75c1b29cb7e805f2b340a2943ffc89b0127a608b90"; + sha512 = "e40ff912e46f0765d336cf275d90c18ebdc6636aec3ea445b19c1a4a14384143c10e40130e69c7d37011680f080d46f761edfb473dceddffa3f3008893560222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/gu-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gu-IN/firefox-67.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "39e8905fe88f742d0060901dea2070ac8ead2e4e3916628166a5b64fece1a16db42aba347cb4b346d147c95cd14e9e2259abe80749c0f0a8a837ac49ec66057d"; + sha512 = "17e3a0ff17642f26096b8bb54bdfa74029bd867ba22330114a8c002a4c22f30a3c4550591734e238e3841976e4d601279b9889879ac8d9a88d353926a66f2606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/he/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/he/firefox-67.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "24e04866088fda3f66e43d05f71baf07295409714f1a51a4a2dfa419106e543b42ec5be7ce27339a0d65ea8ca084695e97aa4b3226293827aad6674026817119"; + sha512 = "00f7e08b5e03c01a67c71bbd3adc3f1cc2e0ab783c9a735201bf4ca868d9f4ad2ada60faa19283f566ad6a7708f9483ecdd6758f07951bc05ca50d0f6de0cd77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hi-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hi-IN/firefox-67.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "cb580cd596cf6a6f3e0b9fd83e47362732ea8f2de2c9535800172949320562b862b29dc0b653d17ac44959a78b99f2636a5e28a57a00a167bf32c711f9ba32a5"; + sha512 = "54329781d8a5b165b73ce988a79ce40475b18434870c8d5b46e114023e8b7f8eeb3ccf4bf198ed6ecb5672076a7c90b718534e9007ec320c6d2de7437022da54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hr/firefox-67.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c319352e29cd1ca0627d7a3332ce9a9afc29a8ec447f921a9ed2a89a4722ac43f21bc353509a15257a139de7e56652a2cf96fbecc38cdb860bf59e7ff3e282a8"; + sha512 = "40f4d218ff0d2cee43d20e45c3f1f66198fc5f0e1c752acd8f8b497e2add4817122ca90bb3fd59c38d6ab5279b2b2bcfed08a7125a979999e003f16d9e835019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hsb/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hsb/firefox-67.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e04c62c9a7fb273f43efc066491fe32a214c5e8bfecc527508b5d1a6ef1db7f09ab045a913593ad98bce8fc2af1f63f1fe695156018181b3b834b7545cd17621"; + sha512 = "9cb156d9528cdc125f8b532e484a4bb8d6b3d243951c3eae35519257844d65435b8a6a0187a6570ca343e815f79ccb78cc6ae97d3ba2bc2fc3a042f204f5c5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hu/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hu/firefox-67.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "af69a29e22f8d6566c68fde1e661352835ddb3de87ab80e4921ad44a1575af815163744f4814bd761b52075474d8570152b0bcaed753ac9bd9909baa297d6f00"; + sha512 = "6469af6883cc05a9f2f97a1cf0ae3346959c3d3addf20c572a34b8ec082f3a1f460d6a84d39947a1663a98296652726d6818a195bff53d7100995782fe1ab1aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/hy-AM/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hy-AM/firefox-67.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9531b16c6f7a369bf435f9449fb898ff8eea1d9d1a6855f56f01fff6fd47176f367b21c26c2757af0874e3a88b948e4d3d14217c92a49a5d4831313a338b1c15"; + sha512 = "d9d1492a7a3070e9d5466bac8044be4c5a755dc9a1e3f619ed4c1a5c553d3486b8aa195102d9bc722c1fc62d173a49c6e1f21b26d2bdd50ca547d3200b8b4739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ia/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ia/firefox-67.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "387466e7e270bd907402a9c323b2766c82fa0f04d252a21513f71acf3f0d159c479b895fcf95e9287ea0a9366fad9e04f5fc67aa65f1ccddb16eae07e3143105"; + sha512 = "c387e44183caacb7c6bd8e6a525d605f5c1058feae237906505b46a0cb1a82df916d2ee1b7aec1de13ff8e390835cf84d5fce1b6808f215dd3e164983501db19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/id/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/id/firefox-67.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c5ba2f9707212fe41180cc1a8fb987b03d7547790639e34457be6b9a921ed9c2502476990f0417122cdacf9a5f8badecee23957856f379dc3284b3fd26847058"; + sha512 = "49540e1aa588ec87c5be79cccca78801f947098f6a31ec92a1c429ea46e3dfb265fb23e90e74270350426ae563123874638924672729e74cc3a618564b41928b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/is/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/is/firefox-67.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b0c2561628b136736b17f7c52bfff315657310fce0b4445334657ebfc4e6c98e73f21da7df56e4ce4dd0a6b91ad5980eff63684a7c8109b4a00b9a24669ef625"; + sha512 = "395cb16c94e87747c947028e946b5095d008c3faca730ef9b2a8cf17d6f220caf8bd40e59e8863d49287943048c68b8246999b7838b532216b42539e36942d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/it/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/it/firefox-67.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "cdb0bf8b76a0ee92272a3b22061ff79f634bef1b2804ab40c4cdba54458b0458a77ee7dbcd17dab45015b26e8d8704f01ecd8041d8a0c1a0f2f9cd413c89d8df"; + sha512 = "0728480ebec48e6880b7eac2fc69d2401d82b8de44d6516aef8fd882fff1bf53f844986f8effae08cf8c3aa63fa469e96c733258c7b43fea530b2f34ffa71c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ja/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ja/firefox-67.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "93be68a0b11c4fc36af01d0399bc177562e5cb41fc7b7aae332bdc57c1606aea6a210c4db8154f47c6aef414be2b6ffdab4c86f0188254dfcf89ae9354f9a9fb"; + sha512 = "2931c0382e8d4398a7528c6c4f3158bf01d0f9799de8e17b1485af7435d9108a2fc0ca8a2aaa06d1be7455fc9381053293531f076ffe4318c6990f87e1659d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ka/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ka/firefox-67.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dd30a818619c26b069b3b9da38191df64ac190a5663e49d0826fda79e2ce4123f48274f66bdad64538f6d03350e462cf34961e00a0d80c67e27bdbb152e57e57"; + sha512 = "7c72e0411b8bca2f189b60ce4573281131870d0de7f7b2aa30840d6751616b947cfb697641cc447b6ac1e1c0f8d80690b589d10dfe676581a8ee873366e4710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kab/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kab/firefox-67.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "266725f1fa6050a9c2a6c7220c42e96a2605319ef7b7a93861f7a1ff05d8f28e5399a12d3091b3aacb653c13162f52cdf327b315da11226901c480cdf4836569"; + sha512 = "76a2a1a626c15fd13d9e509bcffe92f71cf9290e060e8e8d991643f4c5fcecfd3f7c28b7798000387cbfb4d21fd0cadb12672560e3d108ac18691da7f475bd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kk/firefox-67.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1dc7a5f8cb76c0fb9c537e197556de5a0996eb11701b759c2c8c0ecd89e58f60f32e75261eb70861ef6a19616bd56e29a33023c31e4b17d2ec9f91acd346f9cb"; + sha512 = "938f7744143e2fb8ed90e1ac13f3e0019a4baf399e9b7e986e95449a3f7b4be19f12345a84bb8f61fd96d09ed294f36d2d8fe5f30d3f59b9bce4a63bb191c1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/km/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/km/firefox-67.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b227eb8dfa16dd2a7686e28e7d62cef1e627b19da6879f43b435d70ff8bc9b60964b9c1427418b71c71cef6e2fd6d26a7ea67e4f9174a4dcba59d50885a6f6fa"; + sha512 = "2896499b5ee57a5e0dcedef1194f58830817515e50fe11b99c91a76b5979b93ae0a8385a8b379a4e335aa8da1ba7ffe93954d96b0ef1960b98e49f926fbbc6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/kn/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kn/firefox-67.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c89b651540671c085c9b7549946004f0d0377e7fd75d6cd5156e5d4bbf2d1176a717bd062da4eb392928179ff73a87cc1f80c0f703a7f4b8424b78bbb2f29056"; + sha512 = "90e0f7a0aff8ca0132a5da8331348e87227c94c687b80a4424b47c51b3aa0afe37569189e2c4ca41d081fe3988e2bdee16ca37810c9daad429e36de1e8ede339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ko/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ko/firefox-67.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4962394b60da987c7b9945d840a98f3c4b3dc389dbfaeaf71c3194efad94f3e8646948c14383f0c6ab652f926971f1e95bf75d54e521bd13c865e61ec812f395"; + sha512 = "4b1ce01f47193cd3290af0a690a133b9a1f1661622784645d8de59553fb534bf34aee9640a909297fb5a595f4b00474d0f6e4ba73a83f12c6dfa0adb66f25f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lij/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lij/firefox-67.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "dc08d5d4e973da32b84bde101152b595270cbe610f3f970c844fc278e163ab7caaf3a4edbdfd5b7cab937ca8999eca084b0f5eda40e1a12a1334aaeb1545bc58"; + sha512 = "fea961f081745da6cd6c13caa5dfa1695f8b0627c4c33f171240c53cf4a9052f8c5c41d34525da0414d5522b07f8777d46b4aabf52c8a9021ec0bd301cb51cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lt/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lt/firefox-67.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ecb5e9977295b74c63fb64638da06322603999620bfd396405b5c272f584066b5c17e2f872c4c7c8f53fc62362b56ddf09c6f39ac496c5868339a7d270891d72"; + sha512 = "f4e73c533c8a256f1c313de5fc2117113c6702cccda64d8337c767279f5ad82c8f202935633fb790907d6b1cd6a57eb9009e7e8de64b9cb7c6604985cd0a4eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/lv/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lv/firefox-67.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f668a35dd04604a07d3b93f83a7731f87d2bb726dda74a6a94bb23e2824117a0c6335a28d7bf05efe154a601472f0662aba5a2d6c38717e0ebbfa649599a7edc"; + sha512 = "6999706696ae4ee7835c4a7eedce5671a471702081236e9c1f56679a8f27c38d64847c7690e596534db738e4c666f3a2998bb1ce75f2c97b26aaf83bb45a4fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mai/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mai/firefox-67.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ac30950eb86b9583eb1dbf0ef74cbad0942ca227a7a79284cfe9beb7f1d4decad95ce8435c65c3a8120b85259cf98a1ef89ad184b1cb0afbcb69937f2aed781d"; + sha512 = "1b997a63b51677b7c31c7f1b3b5fd7e37efe132cb1cb03b394f7b9e7b3f7f44eb2184184171dd93f2d1aceef85f37da645d82bfc539fd6e2a6f763837b8eb095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mk/firefox-67.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e346090975a9c14782161142f370bc22c6c73abdb80588c9584a2efd8518fe016a764327fbae25e08ced2bb8107a50e256cdc627eceee8abb8eca3cba6993ba8"; + sha512 = "aefafd3d7f7f1cabb858a851e883ce40f3dac62ae980ad91b4d0b0323323cea1a70cb0ad845da7e56e1345ba6f3d58bd4b7ba5e10e8a45168f0fd1ffe3a1ae5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ml/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ml/firefox-67.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2d26c4af2cd67fde5e7e4132f4ab9fde8bc87340adbecd00c006b3064f67f19f7148b557faac6252b78d1446f16899b7336c87ddf9dd739c7cccb0318493a1f9"; + sha512 = "88b7907e815ea8a66ad790e83973ef20852a33d93871b0853e1f18bcd4846f49f74bd94a788edde0209b49f4988392170723c0fe14603feb1867d5845467caa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/mr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mr/firefox-67.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "536180dfa72d2e2c4043dc35e529f7243b13bee79bc3f1727752cb75165258481b16f834043843b7b3480e4a8c4a275b8242a0d4455f85b5d33a67a8e206b098"; + sha512 = "cb6286e569c2fc492a4e7faa96fa67fba89306f920cbdad85ee0f63ad5c378f9dd1d59cec06a6c09ffff4287578269c91a8d338ce9377ec41adfdbd057f7c4b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ms/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ms/firefox-67.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b2a619df14d1110910bbf96876c22c2f4d70bcc522a886d801d3ccef5b6a802ff6528e67be7a10e05d5602c397543b59e42f88cec694d721abf0d5270b4da1c3"; + sha512 = "52594f3d98d83b008e579357ae7e1653a51cdba81561371cf2168be98a4351c3c97aa8e2673e0c845680e33128d8ed22fa69ff71f5481aa1beb8000ea0f3a34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/my/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/my/firefox-67.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e45c96e33c4dd2c1707676bd2240b8c79a51bd3f5b0bb436f1d1639f62288858f6947ecd1c210b17c6000309b514ec1fcdf708824ea0c2783613eebdd9364939"; + sha512 = "3d526f91a7ae8db889cd7d9353cb63868b59d315a48324772bee6805b03fa2ec5d86bae27a8f9e30cfc2a2132abd8134ffcaaaad6354733f15dc4af2d1198c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nb-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nb-NO/firefox-67.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3f86e960b3d7eb9309b45b7c7d8110a2421f210b6890af3f5dcc8b4bd9853643d97a03c8f2d3fbb187644ea29ac39219ab17547924d98e20c4e0949e6f9acfb3"; + sha512 = "6871066e47a534bedeec7492942829fa0eab7c18c8ef920037c7fb5b862ac3519d8615205b036d93b473506143ec8f1359f92714c98b1ab1280d4b883a3fb768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ne-NP/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ne-NP/firefox-67.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "b37cbee88debed4a9fa4dd618efee71052a708cff29b398b8461f35824e6e877fc9b1df1dc856081f8e9ec820c6388a6c875965707955626b2b185a9c44f4e69"; + sha512 = "f2a1d642e3d19bb2986d0bb9f34e20e0ff6325670693c080340deddc682fefb7e78e75c3b6d311cd6cd8ca3444078e55f7186d5652fc13c2fe7bf66acfab96f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nl/firefox-67.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0e5531ee0ca2765542e84aa88b0756e0ff765e25f2f9f3db9273658f619e13c6eb1e028f2ab573d6b0b4fe3233561445136ef329c75d318aebaf9b581afc41c1"; + sha512 = "d858d833ea88aaaefe0bf08b4fa79c1a76e914add91302221d19cbfac8367409c6395df134c6c7687a425fd4f18c1b89ff041184dabff93ede8704884a0a3d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/nn-NO/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nn-NO/firefox-67.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e9aca83b6acee05063e602f5cca0dc82d04a326591f4d414ac5a3aa16ec6871dabfcf27fbb1e6bafd95fbda96e1c64251ed3eb6aa698830846b8c01e8b0f055f"; + sha512 = "723e279c90b1f122720e4b2db948e90a0fae0cc8ee2c388798fa0636a32adb08c97840e3a896a5908bf40745c3bb3fa39c56c3757d16478ed38c9afbdffa0a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/oc/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/oc/firefox-67.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "45085d11c85f6889056c144eab500a24bef9547be394e5c1834b2d7096b6c1251ec2a502e10b4b51422a6e6033a1fafb21b94330b5e370c5d8acac3aa7f609f0"; + sha512 = "5ffe99c04a170a4fa907737beecf718bf3e6519fb6edcc487af6d2af8716391a83763c16036628d02b0c0f2ebc25ae85cefc2b1b54091a43c52198b0134f19e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/or/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/or/firefox-67.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "bcb365e42dcd4d2f426117b39b39a015d3cd0b1667db653a7798fdc261ebbc52499d265b913e76330963b271d7f2fc567e2d58c5afbf6eefde87c890c6685f10"; + sha512 = "2702edfe4d419072347ef9e80b814c68837339f6bc06ae61d8c6dc283d94c77e35d57b7357544761b80903f09c73387108ffd755063e3df6035e9a8d001090a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pa-IN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pa-IN/firefox-67.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8f9477a044885977707288c8e2bf98858b92a61b6c4e9e98d416521913426bebf2e7d1baa0925187c0e459ec41e94d8ae7b1b26f8953b48189864f408cc573c8"; + sha512 = "27c4d23c85994691f40df9856dcf71b86a25f1364f598daa07d6cf05575ad92502d5222bfdef6501dc5676dd5e5b9d4dd9dce8f7da79cbe64b8cd1a9a949a3c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pl/firefox-67.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "86fae15a9e8ff7b7a3b7c7ad5ea7b308ed7bf5001547b0ea3a7f251f2bba4e966aeaee28d7cc489c3d9f85a4a7f3660946207d6899915834adb5a178b099a537"; + sha512 = "3bf031564ddddbac6070a141ae2a1ee1ef14376b3de73c54643c40eb71694bf03cf5b2f38c6e8bb1a0474756682d03768764b5ea92854451131725643ca4daec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-BR/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-BR/firefox-67.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c54dd7d19079d41545fb305b680489e7613154c9800913405f6383e25376c96db6b80a2cf7ad0f356f78f4fd01f1f2d1d183419e78eff1e9a1ea0b0fd9955177"; + sha512 = "480c70b62a4332536c2eed8a87b3f9ac007ddebf1c88b4bd45b389869e1869a545aed29e5e17fd2ae491266b2e3cd646a3430136c12e41d13e1cdea4c40e3642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/pt-PT/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-PT/firefox-67.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8c7ee4e79b89a523c0e0378f09f006d883a05bf0b094c3756a366cf1037e59662d9588cdfb064a00cdf22cca8e9d0b51f150b4218764ecb2c101a797a127de9c"; + sha512 = "7206ed76f715f51e2e861f57739bddf36f83508111f5b75a758237ccd4d6558997a31d0c525909c957d4878ad9168fe161308f190fd497abd29a45b8040a7be0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/rm/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/rm/firefox-67.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "73ea3ce657b4ca26eaab1239dece228643fe5bd72257f04c7273b88c2b2cf136beb76f692cbda2f799cac82688316a8fff652455d10f0dae27eace99306b7b1c"; + sha512 = "71c07e448bdb1f2b43847c51a671d652ed6442bb6d79669e662c2c01632cc949294aff63a4702284cec6665680d9b38cad23b85a6751916703d93a73b433168c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ro/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ro/firefox-67.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "12ab234921a0b7fb07737248de895a5ca32430715967a9f786d7015384d58ce68bdb555a1074cf99ed76babc61dbb73c6ab45eb0dd6d4124813d84d5db43fc4e"; + sha512 = "30ae0636594e3d03c4372f245bc5ebdbe2e0d072603bbc385dd3b725c0f8feaeff06333b38d9931c4aaaa2fb7337dbcea8368c2662fb904308caff7fd4989718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ru/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ru/firefox-67.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f5a7110b1929aae678a832de494477dbe9d89dfe8fb2a29e2d18b5a7b8c4b4fece2f8863b04e03946c318e1a3a7218ae68afc5b30f0caf39b36f8a648d4ae003"; + sha512 = "a73530f9fa02abdf7ec6e8554554bf0f4fdbbcd458a56cfadd63ab0c46af543bbfada923a9b37754c9cdf9dd0cf2b95da2e0d692a1605b18579f0ed3167a8384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/si/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/si/firefox-67.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "076c13952baa9335a26e04ddb083f76289bb541f23f4d8ee80b0c442b0b23c3fc8bfa50946c9220cc8b6d9dd6afaed1e5cbf1a9995fed26e79b7666796c7dbd9"; + sha512 = "df6dc7d452a3f5a60ffa65c73001e55218762fa40ea6f0c55f4efaeb00be3803a84d80771db60f836bd128d5aca8cef5533340cf1a731610f1f1b66d0eb8624d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sk/firefox-67.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9378267650ec97395fc9b08cc187ae5bfc16da28093202d33c64e230ffa9c7dc939474e3785df1c4f89adc3f8de2d252c3bacd754b8b904b76b5b868e5929ab1"; + sha512 = "a88cfda496b1092d9589b38849dafd11a9f96c96794130e8e9107866ff395a2e30b214bdc4ac72fb815d919cb77ccd8954bc60b6c13b2d3e1c682ade616cf357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sl/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sl/firefox-67.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5451e7f5345f5bcbf9d5d9550703f66efb316c3e4e98b5dcbd8baf68846e7ac3b2f99c53364d583dee92dcab63a2d6fdfaf0e85f39a093dc3b1dd6fec8375fd5"; + sha512 = "2807f4bdb8d714caa05c72982f773fed0ab25646e99fea44360f60c07149582fb9933a9668ae4012e6b1ec230e2cd4bae57f81f925b77d728f8d6a248746608b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/son/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/son/firefox-67.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e552d6884ad981eff2badd8584d79a7b7f561e88cd1bb65f86dc08f162d174b2a05d800255c3e1a3d65c11bd5c54a54177f3c990b954b2d439a70b6f8a15e81e"; + sha512 = "ca5465d62e66146440d56bd2d65b7e770bc4fb089fa593860a3950371e581ed15c35557d2f0a7dfdac323f35b8550f11b80656637176db66a3dd310d881f7169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sq/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sq/firefox-67.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7c5d678e248102949298dc8aae4c3d174b01814e176dc923bcb23e71a49b96f16c167cc736e222a83a7c11de34708308b7d5f6057df71599a51fb353984c5223"; + sha512 = "ece96854ddd377c2e070f499210990aa07b2bee5f9c36dfa5e4c66ee1536a3462b921643ec7adc5fc72dd3d2f5eee9996b37120c19ef736e92f303cd816f0d59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sr/firefox-67.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "07718754558e1023f437fba61dd55b9610dd2f0f3ec15d7c36b56433d162e2699f93b094e50794d15fba74b2c02eada99fdb283de70c73394041180b8e7d7345"; + sha512 = "fa8ddee8dbadaeedcd725fe031deea24cd835002fe93a9961598a00f09f7fb14355d6a26d049819c00c4a95f2bf149a598e31f7b86ec5b3b26b7c3aa47cadda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/sv-SE/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sv-SE/firefox-67.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2d8bff74fb6537eae2c8e34df58a9233c4df3572cb3d7bb8b68660e4fd6848e23e58709ec4e7ec049c8e43aa40394b6f4b2f89363d91e6879c25ff0c523c27e"; + sha512 = "eef44d9f7812718273eeb0b111fd19c97872854a1a257060ed2f7b9fa6a152a17c123e6f86edc6d0474836a3e78ba5d939c486b7d0f851d3a344d217d5aa7e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ta/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ta/firefox-67.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0fd4b8c94340d341ef2fe70c10b4880a1073972b1b3df3391f92b6084e2cb84ccf9dbf764e26b04007b286106289b94806f6387c353a68ae64bacd4b2ca8eb50"; + sha512 = "54c7c7675945ea2915c5854da6a3f693dc52ba302c25b093d66f95121eb126c1650d2cb040c6b47b3b9562a17906f1e78d38b70b6b045b6f9c2a439a97577a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/te/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/te/firefox-67.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3d1f9f8abe7b0491c0ce6084f6e4bd047fd606de376afe9d811f2ba91593f3e98e3d2f26d27c550c008455e76237a98c4f0847e88c3ed338ce1d495a3380ebbb"; + sha512 = "0cd84eba0aec8be3a4b553a22642a93f5eb662668a11bbe7e5ebba4fb5561149cedd05c110a2da79e0ca040b12c7f96c6a839c7afdaf0ccfc8ee42082e3217d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/th/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/th/firefox-67.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9f1343de6e161ec1803d56e7a87e1d3fa8b05c16fdb101f19daa8f514456e70645ff0935cbd7ce4a3d3d760b4b1107d28bf0f463509aaf197d7a91adb31c88a2"; + sha512 = "ff19b5487a4757c1c45057a3362abe92e4c9843e44ce497176de018d2e62cf9dd86bf049e94db940683ab0237d8425de2dae7d035de14ab469b74c325c5e2422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/tr/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/tr/firefox-67.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "21058f2b49cca57e6146a02e211a0d80a92e3e2bd46445b06a8b5399ec1c2965d7e17d58f7c256ade21ff9399bc7dae1c8eb09555dee84d0e92a37f05e7b3353"; + sha512 = "684bbfeef4c1f1798ae65969d61feda683eff650744df4ab67d20c733f48be4a3593c5dab31a47373f42d205dfa5ddc99ec76bfb983a54c3888fbf48a334d0a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uk/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uk/firefox-67.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9d85bfa038ea5ebdda4061fa99e85ac93585f6d781e6a7b9297c189b6bc1e593bf429c2d1cc9344ccc253aef2367aeb840caa20ebf65af067636555fe8c66f57"; + sha512 = "452cd4466c8be5bd38918582b3a979dd97c7268ca475d77954138adbf4538a731c60001cfea93b20292ec144639fedd52d5d12949d6a7a9c392334792d659ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/ur/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ur/firefox-67.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "06a3f2d441756c1506e8307ef8f42257eb37f63eca1378427c59880e9db3de44d85bc39241f1e43970c04dac00c4c4f6b82d7203c48b5b0c113fd1589e8e8639"; + sha512 = "b4f05f87a341477ae8e54a7fda46175f9dcf52f92daf6f278aa3cdc81697e4fdb1ea5dc850c547dfca082360362e8a38a8b0c0b4505c55a5added2df500c7f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/uz/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uz/firefox-67.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0c6ded8776bcac49035f7fbc73c4a8c5470a081d79b883040ae7b9f60e31ece2c4a2f0baf867b6fdd722b0cbc3f359d1f9aaf75a364edb03b8f01e9946f109ee"; + sha512 = "9eb28b63a6172c6d3edd70f61821dc7af91f3696969e45891dfac7c83f0293d5969f99dec3b49a8b00f628b4d17bc907f38c4f7750af860a6d81629823ae47d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/vi/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/vi/firefox-67.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6091c0e48a097408cc2251f0bebce6e77ced9771486c67fc89074490455ca11048b2653d0b934b23c8266730af3fd58fef96a3319af8cbd8c6c83b740fd87bb4"; + sha512 = "c809f7350da95034ee3e94140c5e987dba1ebc8693f60d9c7454e43ac320d44c991ac6ea4f431d695b0e5f382101f5d34b435cb2021dc926378a22fd4407c0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/xh/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xh/firefox-67.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "18bf62d055408eefccf145cf42d95234d88646b82c2f9d6f8f5107409be23879dac63b1ba0346d8295b114145c95921848de73aa98aee6343deb3bd103f73e46"; + sha512 = "6fdcd3aec5a051505c907b5f5cf35a9407bf7239d23d26fdc9e28b754c93cf7e3bcc25077e6c8033497638ca1dfc0141e4fe9d034dbd4540b479e06e5fa3e5ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-CN/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-CN/firefox-67.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e999b37838b09da9f5315ec692543c59a1a801c99560f8830ce1998cbcc6fce92a873a8b628682b176dac580a6f66e89588e2a2cbe7214cea542bf0c7162171b"; + sha512 = "c1bbb8a94b342f10f0b238a507e0f79172907fc92c5e7674b40158e302329e1f69317bfedf135e90a077bec49ad1328b93cc832de09231152154536e534031c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.5/linux-i686/zh-TW/firefox-66.0.5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-TW/firefox-67.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a66bdf11578fddc740a9dcd4d1bb43c29d27c6c4cd26e896a88050c6bec4a0d5cd9ffc6ab3e48b2ae202b7de9bf11b402436a37001b1d166b7a6a1296e57a998"; + sha512 = "10c1b7062a0f3d3ab929f73b1302edfe525470e6b2cc6fcf81e6da00a96ad561c90a61ea24bba006b1ea15310c8dc85422b4af48736f5402dc4531976647fd7d"; } ]; } From e57d93af0ce6d06b00690beb800ab6a629944c90 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 21 May 2019 07:57:14 +0200 Subject: [PATCH 420/637] firefox-esr-60: 60.6.3esr -> 60.7.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ceacf0d41c6..60d677f9606 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -72,10 +72,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.6.3esr"; + ffversion = "60.7.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3zg75djd7mbr9alhkp7zqrky7g41apyf6ka0acv500dmpnhvn5v5i0wy9ks8v6vh7kcgw7bngf6msb7vbbps6whwdcqv3v4dqbg6yr2"; + sha512 = "1armp7nmzn864l42nasw0zqsp8y1zj4vhgbm99c49a435m44c8p66qrjxy6rn2haqsy76i9x5zf8ph2d014ap6g5yhidj7iymbjh5f2"; }; patches = [ From d16a78b51219ec382709c67901a5ce0b1f74802c Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Mon, 20 May 2019 11:38:26 +0200 Subject: [PATCH 421/637] several fixes in coq and coqPackages.mathcomp (and extras) --- .../science/logic/coq/default.nix | 5 +---- .../coq-modules/mathcomp/default.nix | 5 +++-- .../coq-modules/mathcomp/extra.nix | 19 +++++++++---------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 774fbadd4fd..7427875895f 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -29,10 +29,7 @@ let "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; }."${version}"; - coq-version = - let inherit (builtins) concatStringsSep head map; in - let inherit (stdenv.lib) take splitString; in - concatStringsSep "." (take 2 (map head (map (splitString "pl") (splitString "." version)))); + coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index aa6da1a1e28..a9933692db3 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -16,9 +16,10 @@ let "1.6.1" = flip elem ["8.5"]; }; # computes the default version of mathcomp given a version of Coq - min-mathcomp-version = head (naturalSort (attrNames mathcomp-coq-versions)); - default-mathcomp-version = last (naturalSort ([min-mathcomp-version] + max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions)); + default-mathcomp-version = let v = last (naturalSort (["0.0.0"] ++ (attrNames (filterAttrs (_: vs: vs coq.coq-version) mathcomp-coq-versions)))); + in if v == "0.0.0" then max-mathcomp-version else v; # list of core mathcomp packages sorted by dependency order mathcomp-packages = diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index ef387985e06..3666d54a786 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -75,11 +75,9 @@ packageGen = { mathcomp ? current-mathcomp, license ? mathcomp.meta.license, # mandatory - package, version, version-sha256, description + package, version ? "broken", version-sha256, description }: - if version == "" then {} - else { "${package}" = - let from = src; in + { "${package}" = let from = src; in stdenv.mkDerivation rec { inherit version; @@ -102,19 +100,20 @@ packageGen = { inherit (src.meta) homepage; inherit (mathcomp.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; + broken = (version == "broken"); }; passthru = { inherit version-sha256; - compatibleCoqVersions = v: builtins.elem v coq-versions; + compatibleCoqVersions = if meta.broken then _: false else + v: builtins.elem v coq-versions; }; - };}; + }; + }; -current-versions = versions."${current-mathcomp.version}" - or (throw "no mathcomp extra packages found for mathcomp ${current-mathcomp.version}"); +current-versions = versions."${current-mathcomp.version}" or {}; -select = x: mapAttrs (n: pkg: {package = n;} // pkg) - (recursiveUpdate (overrideExisting x param) x); +select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); all = (mapAttrs' (n: pkg: {name = "mathcomp_1_7-${n}"; From 40679c6b563d3a645f51b8cb6ec12c3bfca95cf5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 May 2019 20:00:00 -0500 Subject: [PATCH 422/637] endlessh: init at 1.0 --- pkgs/servers/endlessh/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/endlessh/default.nix diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix new file mode 100644 index 00000000000..0e424d1d122 --- /dev/null +++ b/pkgs/servers/endlessh/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "endlessh"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = pname; + rev = version; + sha256 = "186d7hf5p8yc46lmbrh0kxyfi1nrrx9n3w0jd9kh46vfwifjazra"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "SSH tarpit that slowly sends an endless banner"; + homepage = "https://github.com/skeeto/endlessh"; + license = licenses.unlicense; + maintainers = [ maintainers.marsam ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4070cb60683..c4c01750c0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2727,6 +2727,8 @@ in enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + endlessh = callPackage ../servers/endlessh { }; + cryfs = callPackage ../tools/filesystems/cryfs { spdlog = spdlog_0; }; From 4bc40350ae0fad05db646ceb97d9b09ee3f1251c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 May 2019 15:28:51 +0200 Subject: [PATCH 423/637] nextcloud: 15.0.7 -> 15.0.8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3e3bd8a4653..b62ddbf7b29 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.7"; + version = "15.0.8"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0jcxza0p1vc9dhf2mimvyy1j25nzv02srghdsp6108573yamhq9y"; + sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp"; }; installPhase = '' From f4b8412198b33365d39f476b6516453845800557 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 00:16:26 -0700 Subject: [PATCH 424/637] borgbackup: 1.1.9 -> 1.1.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/borgbackup/versions --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 42e88f8d07a..e1a80f6bf91 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -16,11 +16,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.9"; + version = "1.1.10"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; + sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; }; nativeBuildInputs = with python.pkgs; [ From cfda315f10291a9c1adee5b68bd972855b1c2aaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 00:54:18 -0700 Subject: [PATCH 425/637] btrfs-progs: 4.20.2 -> 5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/btrfs-progs/versions --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ebb9db8670e..aaa6772b98e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.20.2"; + version = "5.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0z0fm3j4ajzsf445381ra8r3zzciyyvfh8vvbjmbyarg2rz8n3w9"; + sha256 = "0dgh56pamav8wb9nmabjwdlpcazvqc9pgzwablxn77mqh0qrhkaq"; }; nativeBuildInputs = [ From 0e61cff58d4623f3bed6f4d340b475a8f326cf15 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 29 Apr 2019 18:10:05 +0300 Subject: [PATCH 426/637] criu: 3.9 -> 3.11 --- pkgs/os-specific/linux/criu/default.nix | 27 +++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 832167b6f26..aa08160871e 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, protobuf, protobufc, asciidoc +{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig -, python }: +, which, python, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "3.9"; + version = "3.11"; src = fetchurl { url = "https://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx"; + sha256 = "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; + nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ]; postPatch = '' substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" @@ -23,17 +23,22 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - buildPhase = "make PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; - makeFlags = "PREFIX=$(out)"; + outputs = [ "out" "dev" "man" ]; + + preBuild = '' + # No idea why but configure scripts break otherwise. + export SHELL="" + ''; hardeningDisable = [ "stackprotector" "fortify" ]; # dropping fortify here as well as package uses it by default: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] - installPhase = '' - mkdir -p $out/etc/logrotate.d - make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto + postFixup = '' + wrapProgram $out/bin/criu \ + --prefix PATH : ${lib.makeBinPath [ iptables ]} ''; meta = with stdenv.lib; { From 4066babc96bc6086f1ee8eddaab9170d2a9ddb2e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 01:49:20 -0700 Subject: [PATCH 427/637] chrony: 3.4 -> 3.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chrony/versions --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 9cca93040dd..33f004190e4 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.4"; + version = "3.5"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "17vb1sy79lsjif23v66mgn39lbgmxy59mf7mi9ffb9qh4ryf8xxg"; + sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; }; postPatch = '' From d0f75abb39ed62945939fc524f259b20cb997d5d Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 21 May 2019 11:09:31 +0200 Subject: [PATCH 428/637] 389-ds-base: 1.3.5.19 -> 1.3.9.1 (#61675) http://www.port389.org/docs/389ds/releases/release-notes.html + fix build failure with + enable parallel building (faster) --- pkgs/servers/ldap/389/default.nix | 45 ++++++++++++++------------- pkgs/servers/ldap/389/perl-path.patch | 34 -------------------- 2 files changed, 24 insertions(+), 55 deletions(-) delete mode 100644 pkgs/servers/ldap/389/perl-path.patch diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 3afbfbbd224..e7bff373c3a 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap +, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: -let - version = "1.3.5.19"; -in + stdenv.mkDerivation rec { - name = "389-ds-base-${version}"; + pname = "389-ds-base"; + version = "1.3.9.1"; src = fetchurl { - url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2"; - sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp kerberos pcre + net_snmp kerberos pcre libevent openssl python ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); - # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump - - patches = [ ./perl-path.patch + patches = [ + (fetchpatch { + name = "389-ds-nss.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9"; + sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk"; + }) ]; + postPatch = '' + substituteInPlace Makefile.am \ + --replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g' + ''; preConfigure = '' # Create perl paths for library imports in perl scripts @@ -43,22 +49,19 @@ stdenv.mkDerivation rec { "--with-netsnmp=${net_snmp}" ]; - preInstall = '' - # The makefile doesn't create this directory for whatever reason - mkdir -p $out/lib/dirsrv - ''; + enableParallelBuilding = true; installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=${placeholder "TMPDIR"}" ]; passthru.version = version; meta = with stdenv.lib; { - homepage = http://www.port389.org/; + homepage = "https://www.port389.org/"; description = "Enterprise-class Open Source LDAP server for Linux"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/servers/ldap/389/perl-path.patch b/pkgs/servers/ldap/389/perl-path.patch deleted file mode 100644 index 73af83a9d6a..00000000000 --- a/pkgs/servers/ldap/389/perl-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" -Date: Fri, 9 Jan 2015 14:52:11 -0800 -Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files - ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index c97d1e1..763bf3b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS - @BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \ - @BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \ - @BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \ --@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \ -+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \ - @BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \ - @BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \ - @BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \ -@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS - @BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \ - @BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \ - @BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \ --@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \ -+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \ - @BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \ - @BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \ - @BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \ --- -2.1.4 - From c8571f6a2c3cf3dabb4c3945d22e5b13b1adfbdc Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 21 May 2019 11:31:38 +0200 Subject: [PATCH 429/637] aliza: ? -> 1.48.10 --- pkgs/applications/science/medicine/aliza/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index ff25bc97490..2633f4c8db1 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -2,11 +2,12 @@ with stdenv.lib; stdenv.mkDerivation { - name = "aliza"; + pname = "aliza"; + version = "1.48.10"; src = fetchurl { - # Hosted on muoniurn's google drive - url = "https://drive.google.com/uc?export=download&id=1zMYfSUqMaYuvuF41zAFUC5ndR55wD7Ip"; - sha256 = "0prlmzz8qbqqkr0plk781afq25dvy4pv89vlgccpim79psqlchl3"; + # See https://www.aliza-dicom-viewer.com/download + url = "https://drive.google.com/uc?export=download&id=16WEScARaSrzJpJkyGuOUxDF95eUwGyET"; + sha256 = "1ls16cwd0fmb5axxmy9lgf8cqrf7g7swm26f0gr2vqp4z9bw6qn3"; name = "aliza.rpm"; }; @@ -48,5 +49,6 @@ stdenv.mkDerivation { homepage = http://www.aliza-dicom-viewer.com; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; + platforms = platforms.linux; }; } From b6e40f1c340e2da2373c60c610b616d46942817c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 03:24:33 -0700 Subject: [PATCH 430/637] cups-filters: 1.22.5 -> 1.23.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/cups-filters/versions --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 40e6f907bf0..8b05975c167 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.22.5"; + version = "1.23.0"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "19h7yy92wjfs401jzwyr03f3lp2xwg7sw83728r302rg2ni57m1h"; + sha256 = "1lyzxf03kdfvkbb6p7hxlarbb35lq5bh094g49v3bz9z4z9065p2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 2a3bb2f8ac3a3550c197e8c52db7155bf0aa2cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 May 2019 12:48:42 +0200 Subject: [PATCH 431/637] bear.meta.maintainers: remove myself I don't really use it anymore, thanks to meson+ninja. --- pkgs/development/tools/build-managers/bear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e4bf35a09e1..5999525def0 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat maintainers.babariviere ]; + maintainers = [ maintainers.babariviere ]; }; } From 49f05a17604322c42b8fc4150b25186dcbf9121f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 19 May 2019 19:58:19 +0200 Subject: [PATCH 432/637] nixos/nextcloud: Add options services.nextcloud.autoUpdateApps nixos/nextcloud: Add documentation for nextcloud app installation and updates nixos/nextcloud: Enable autoUpdateApps in nextcloud test nixos/nextcloud: Fix typo in nixos/modules/services/web-apps/nextcloud.xml Co-Authored-By: Florian Klink nixos/nextcloud: Escape html in option description nixos/nextcloud: Fix autoUpdateApps URL in documentation. Co-Authored-By: Florian Klink --- nixos/modules/services/web-apps/nextcloud.nix | 22 +++++++++++++++++++ nixos/modules/services/web-apps/nextcloud.xml | 6 +++++ nixos/tests/nextcloud/basic.nix | 4 ++++ 3 files changed, 32 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d0e45e1c12a..887478d0788 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -257,6 +257,23 @@ in { ''; }; }; + autoUpdateApps = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Run a auto update of all installed apps from the nextcloud repository. + ''; + }; + startAt = mkOption { + type = with types; either str (listOf str); + default = "05:00:00"; + example = "Sun 14:00:00"; + description = '' + When to run the update. See `systemd.services.<name>.startAt`. + ''; + }; + }; }; config = mkIf cfg.enable (mkMerge [ @@ -362,6 +379,11 @@ in { serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; }; + "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable { + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; + startAt = cfg.autoUpdateApps.startAt; + }; }; services.phpfpm = { diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index dfefa55c5d5..d78d866086a 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -111,5 +111,11 @@ #49783, for now it's unfortunately necessary to manually work around these issues. + + + Right now app installation and configuration is done imperatively in the nextcloud web ui or via the nextcloud-occ command line utility. + You can activate auto updates for your apps via + services.nextcloud.autoUpdateApps. +
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index c3b710f0f90..bfb97ec3f23 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -22,6 +22,10 @@ in { # Don't inherit adminuser since "root" is supposed to be the default inherit adminpass; }; + autoUpdateApps = { + enable = true; + startAt = "20:00"; + }; }; }; }; From 54d14bb4cf024989d9cb2a3d1a88596872f81884 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 21 May 2019 14:14:09 +0200 Subject: [PATCH 433/637] pwsafe: 1.07 -> 1.08.1 (#61766) now ships 'pwsafe-cli' in addition to wx GUI --- pkgs/applications/misc/pwsafe/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 82b8f2cf847..1ed54b05ec8 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.07"; + version = "1.08.1"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; + owner = pname; + repo = pname; rev = "${version}BETA"; - sha256 = "0syxmliybgvm9j6d426l7j12ryrl42azy80m66jc56fv9nkqwaya"; + sha256 = "0x89pn056h8b4yvxbd6l3qwrghslxc7vlxnblmcmsx7xx4i041ng"; }; nativeBuildInputs = [ - cmake gettext perl pkgconfig zip + cmake gettext perl pkgconfig zip ]; buildInputs = [ libXext libXi libXt libXtst wxGTK31 @@ -49,11 +49,10 @@ stdenv.mkDerivation rec { done ''; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A password database utility"; - longDescription = '' Password Safe is a password database utility. Like many other such products, commercial and otherwise, it stores your @@ -61,8 +60,7 @@ stdenv.mkDerivation rec { one password (the "safe combination"), instead of all the username/password combinations that you use. ''; - - homepage = https://pwsafe.org/; + homepage = "https://pwsafe.org/"; maintainers = with maintainers; [ c0bw3b pjones ]; platforms = platforms.linux; license = licenses.artistic2; From 7daf63bcfb5c6d68a250f41b249900fbb381b996 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Apr 2019 12:27:58 +0200 Subject: [PATCH 434/637] openscad: 2018.04-git -> 2019.05 --- .../graphics/openscad/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 5922206a8b9..ca3dac34dca 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,30 +1,27 @@ { stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig +, double-conversion, lib3mf, libzip }: stdenv.mkDerivation rec { - version = "2018.04-git"; - name = "openscad-${version}"; + pname = "openscad"; + version = "2019.05"; -# src = fetchurl { -# url = "http://files.openscad.org/${name}.src.tar.gz"; -# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; -# }; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; - sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; + rev = "${pname}-${version}"; + sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib - harfbuzz gettext freetype fontconfig + harfbuzz lib3mf libzip double-conversion freetype fontconfig ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined - ++ (with qt5; [qtbase qmake] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) + ++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) ++ (with libsForQt5; [qscintilla]) ; @@ -33,8 +30,6 @@ stdenv.mkDerivation rec { # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory enableParallelBuilding = false; # true by default due to qmake - doCheck = false; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications @@ -63,6 +58,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; - [ bjornfor raskin the-kenny ]; + [ bjornfor raskin the-kenny gebner ]; }; } From 25f9f8985f6489d1b668df4b9b9ad6d4d95b7431 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 05:27:04 -0700 Subject: [PATCH 435/637] elixir_1_8: 1.8.1 -> 1.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/elixir/versions --- pkgs/development/interpreters/elixir/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix index 40136fd22de..e240e1907e0 100644 --- a/pkgs/development/interpreters/elixir/1.8.nix +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.8.1"; - sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9"; + version = "1.8.2"; + sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; } From 5d4b383e20b9cba057d5e0c37f3b09f8028e30b2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 21 May 2019 14:32:06 +0200 Subject: [PATCH 436/637] borgbackup: remove custom msgpack-python override, use bundled version https://github.com/borgbackup/borg/blob/1.1.10/docs/changes.rst#version-1110-2019-05-16 mentions borgbackup now shipping a supported msgpack-python release, and strongly encourages using that one. So don't pass any msgpack-python into the build, and use the provided one. --- pkgs/tools/backup/borg/default.nix | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index e1a80f6bf91..1c0e08a2dbb 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,37 +1,23 @@ { stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810 - msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec { - version = "0.5.6"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; - }; - }); - }; - }; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; version = "1.1.10"; - src = python.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python.pkgs.setuptools_scm + libb2 lz4 zstd openssl python3.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python.pkgs; [ - cython msgpack-python + propagatedBuildInputs = with python3.pkgs; [ + cython ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' @@ -64,7 +50,7 @@ in python.pkgs.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; - checkInputs = with python.pkgs; [ + checkInputs = with python3.pkgs; [ pytest ]; From 772bdb8fd9ddfe2a8e8ae60f6a1d8403117e8330 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 06:31:29 -0700 Subject: [PATCH 437/637] featherpad: 0.9.4 -> 0.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/featherpad/versions --- pkgs/applications/editors/featherpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 89e10ea25fa..76e00edaa04 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ with qt5; stdenv.mkDerivation rec { - version = "0.9.4"; + version = "0.10.0"; name = "featherpad-${version}"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "18zna6rx2qyiplr44wrkvr4avk9yy2l1s23fy3d7ql9f1fq12z3w"; + sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; From 4f02d8c6c4661587900fe7d09e81cabed872c363 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:38:18 +0900 Subject: [PATCH 438/637] vimPlugins.LanguageClient-neovim: 0.1.140->0.1.146 Also factorized version so that it needs to be changed in only one location. --- pkgs/misc/vim-plugins/overrides.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 68ec903e613..74bd7d8eeb0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -43,15 +43,16 @@ self: super: { }; LanguageClient-neovim = let + version = "0.1.146"; LanguageClient-neovim-src = fetchurl { - url = "https://github.com/autozimu/LanguageClient-neovim/archive/0.1.140.tar.gz"; - sha256 = "0cixwm9wnn6vlam6mp57j436n92c4bvj5rs6j2qcv7qip8d2ggyw"; + url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; + sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0f591zv4f7spks2hx22nkq78sj42259gi7flnnpr1nfs40d7n13n"; + cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -62,7 +63,7 @@ self: super: { }; in buildVimPluginFrom2Nix { pname = "LanguageClient-neovim"; - version = "0.1.140"; + inherit version; src = LanguageClient-neovim-src; propagatedBuildInputs = [ LanguageClient-neovim-bin ]; From 7ec21fa1625a4522473329c2fc281ea45c66b004 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:40:01 +0900 Subject: [PATCH 439/637] vimPlugins.coc-nvim: init at v0.0.67 you still need to enable the node js provider in your nvim config yarn is optional. Run :checkhealth within neovim if you have any doubt. --- pkgs/misc/vim-plugins/overrides.nix | 18 +++++++++++++++++- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 74bd7d8eeb0..e48d427d410 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,6 +1,6 @@ { lib, stdenv , python, cmake, meson, vim, ruby -, which, fetchgit, fetchurl +, which, fetchgit, fetchurl, fetchzip , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses @@ -109,6 +109,22 @@ self: super: { ''; }); + + coc-nvim = let + version = "0.0.67"; + index_js = fetchzip { + url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; + sha256 = "0cqgrfyaq9nck1y6mb63gmwgdrxqzgdgns5gjshpp1xzfq6asrqj"; + }; + in super.coc-nvim.overrideAttrs(old: { + # you still need to enable the node js provider in your nvim config + postInstall = '' + mkdir -p $out/share/vim-plugins/coc-nvim/build + cp ${index_js}/index.js $out/share/vim-plugins/coc-nvim/build/ + ''; + + }); + command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6324064c18f..33946b2fc12 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -215,6 +215,7 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +neoclide/coc.nvim neoclide/vim-easygit neovimhaskell/haskell-vim neovim/nvimdev.nvim From 36411f391b98dcef94907ba7d6407ce9df6b4d37 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:43:00 +0900 Subject: [PATCH 440/637] vimPlugins.vim-lion: init at 2018-02-05 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 33946b2fc12..80bc7d29dda 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -306,6 +306,7 @@ thinca/vim-themis thinca/vim-visualstar tomasr/molokai tomlion/vim-solidity +tommcdo/vim-lion tomtom/tlib_vim tpope/vim-abolish tpope/vim-commentary From 31c7852720302eef0c648c4cdd459640004b8506 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:43:59 +0900 Subject: [PATCH 441/637] vimPlugins.nvim-hs-vim: init at 2019-04-14 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 80bc7d29dda..bb74107cbd1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -217,6 +217,7 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit +neovimhaskell/nvim-hs.vim neovimhaskell/haskell-vim neovim/nvimdev.nvim neutaaaaan/iosvkem From c67a35d64565152149798e0ee6277d898b732960 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:45:37 +0900 Subject: [PATCH 442/637] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 105 ++++++++++++++++++---------- 1 file changed, 69 insertions(+), 36 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7e9e49f82de..51abecf6aa1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-16"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "e5ea809094fd1d521ac88516f5b4b6870e656f3a"; - sha256 = "1wq12ycfkkcj70gprzwrp88v0i7jjzf1340mmkhs46wyd5ds82vz"; + rev = "89db85121c001fc60787647f012978a2328816a5"; + sha256 = "0dyb2rmp5mc6rc1a0454jpb322ynr29lj98dddbx9h8jqbkwcz16"; }; }; @@ -235,6 +235,17 @@ let }; }; + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2019-05-20"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "727982667e568264b512b5dda080f0ce414ed1d3"; + sha256 = "1rh7q0d81mxg7si3ljid5zlskbkifn0fkg4dapj60s33zda8yb0g"; + }; + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; @@ -505,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-05-15"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "310371d7e0cf123a725dd3f1d1fe02e4919d2d8a"; - sha256 = "15j6hq3ckjmgwr3a2wc43r7kv9bi8ns4x9sg9gn8lwp4c325khfw"; + rev = "0ad6844e7d161e6c989c78197f66eed0924897d8"; + sha256 = "1nfmkg3bccw6f9xlwqz42czmxa8zfk33vkzabj60sbm5s3r7fxrh"; }; }; @@ -549,12 +560,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2018-11-15"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3"; - sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza"; + rev = "37bedf88cabb61d4580295b6e347058df7e7f1b4"; + sha256 = "120fi53qp915qnhaqil15b4n22mp4gp5jvi9yirfmsk88hgz2lab"; fetchSubmodules = true; }; }; @@ -572,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-04-15"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "ae7d31f29080ad18073dda3530582dacb18475e6"; - sha256 = "0ip4qrbbamdw9rmzh3w29bw9gx8gqlnxgyrdj4z9a1cpxp0cd5k3"; + rev = "758421535f58ab3a4a3dbbbb5e84f1aa7350f8ab"; + sha256 = "01hcmc7jk6dh7yzra5bm7x04rd3909d5p5bd7lwsn3glb21n5007"; fetchSubmodules = true; }; }; @@ -1147,12 +1158,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-10"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "787b1bff2a48a85b823abb9d50f8c8553273776a"; - sha256 = "1vdnbplv5spy18azcsn2plcfgnxxbbmr1dca2pfalzgs7bww0la1"; + rev = "9fea982b33627eefbfdf2836458b224bd1c724e4"; + sha256 = "1j9q2h41dpkn9g0j88s0daq0iy7c27xxz0cm5lw5ngpd2y6hnl40"; }; }; @@ -1169,12 +1180,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-13"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "786e76cfc1124355f68ff7820439268a0cf9779d"; - sha256 = "02l5rh9n31c8k2vjnm8wx323x21ssg1pxnlhm2svhkpm1qax5q45"; + rev = "45b5d4a8b59f4921ab3fb41db5f0350e64591d69"; + sha256 = "093j0y4zxmh411271i0w5spiwqipw3d0j0f6whkqjn75p65azqj9"; }; }; @@ -1332,14 +1343,25 @@ let }; }; + nvim-hs-vim = buildVimPluginFrom2Nix { + pname = "nvim-hs-vim"; + version = "2019-04-14"; + src = fetchFromGitHub { + owner = "neovimhaskell"; + repo = "nvim-hs.vim"; + rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; + sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + }; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-05-15"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "9eac5b198ad87210a498d4f93344b7450537ab00"; - sha256 = "17y1lcq92dkynjv5hbk3mjnc8g1yg8f19rw1imak7smwx4xjiqv8"; + rev = "8fcb1af27772174df5446d49de29052cac47e46f"; + sha256 = "0ya3xgbnpps6s67rxfwpcfv39micl1d2wblzb7xvs1pmsymwbj0r"; }; }; @@ -1587,12 +1609,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-04-09"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "9984b9753606fe2c8d7f3d4f9d67c1777a967cd6"; - sha256 = "03vn9rxcsrxnr6y0a6nh5ajl804ha98klk1sms61hlkspxib9il9"; + rev = "53f40ec6c628099e353f25cabd54e5047c28d81d"; + sha256 = "162aa8l4wkssxdw5k3nvbzmqacjkdiy882hhi6mr5596a8wg58js"; }; }; @@ -1939,12 +1961,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-04-30"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b68c4fdbd32b7ccf3b4e52e69106021f9bc54878"; - sha256 = "0xikbqljpn3br0pbf8iigp3lc0qwxl4gcj6zg4y5gr8aywll7819"; + rev = "9ab9d12521191e548be2caa6b606d0866ffdf5c5"; + sha256 = "1yjw36lpgr17hwwdhxx20cjrgcpxqymizw45sppjrc1qkm0w4wnm"; }; }; @@ -2698,12 +2720,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-16"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d2f1bbe458d8c7c3154ed113c3768bd84451f872"; - sha256 = "0dcj36vcrbai049bjv8gw6kfd594lny17vvi7c817av6yclmxjqf"; + rev = "3dba44e24526f05ed487d3267a7996bd6b511893"; + sha256 = "1g4bp7bh650kscn94s9yfh7kgy4b9q4bxnf4rzr4zd5ml1458pmx"; }; }; @@ -3049,6 +3071,17 @@ let }; }; + vim-lion = buildVimPluginFrom2Nix { + pname = "vim-lion"; + version = "2018-02-05"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-lion"; + rev = "75306ac1922952ca1a401aee43ddbb304029926d"; + sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; + }; + }; + vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; version = "2016-02-11"; @@ -3755,12 +3788,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-05-14"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "d98d657d29691118b2ac830ca876f297d8567800"; - sha256 = "1hhr3d8z9mfhylwx6vj49hs3b54hrhkipy67si5mds38g92rqfhg"; + rev = "ebe0344bb7a446f7ae654caa057a07b90dfbd03f"; + sha256 = "0d5a57l7yl1l272adajnqy3frqrnbhlw810klay7dwkqk4s7psvl"; }; }; @@ -4019,12 +4052,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-14"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "26de8b92c9e9f2428f27d241cab1e7e15af56d3a"; - sha256 = "0zvj6f02x3gf3qpv877n01yxyi7hqk5gczw0z3m7x3yz81xpv1m1"; + rev = "596a0fdbf44b6262867492b2f3f76c5e0cadc2e0"; + sha256 = "0ndrc1svm7z3zhkrndjsv17pimms2arb8pagsgavf7cjixn9n6ji"; }; }; From d41747e38f1ae4eafa34288bc18fe0a1cf6a9828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 21 May 2019 10:49:07 -0300 Subject: [PATCH 443/637] mojave-gtk-theme: 2019-01-02 -> 2019-05-21 --- pkgs/data/themes/mojave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 7c3c852e6af..1fc82e8aca2 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2019-01-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg"; + rev = "f6167740b308715b38567ec660aa5241d964af1b"; + sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c"; }; buildInputs = [ gtk_engines ]; From 52146c5484e2e113b81eec1c2ae5fd63d2b430aa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 May 2019 09:54:41 -0500 Subject: [PATCH 444/637] certigo: init at 1.11.0 (#61782) --- pkgs/tools/admin/certigo/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/certigo/default.nix diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix new file mode 100644 index 00000000000..f53ef4a16fa --- /dev/null +++ b/pkgs/tools/admin/certigo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "certigo"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "square"; + repo = pname; + rev = "v${version}"; + sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b"; + }; + + modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj"; + + meta = with stdenv.lib; { + description = "A utility to examine and validate certificates in a variety of formats"; + homepage = "https://github.com/square/certigo"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496110b1b47..647e3217591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -699,6 +699,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + certigo = callPackage ../tools/admin/certigo { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { From 06b043013e190f5aff9214421bc1640c6385a9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 May 2019 16:19:19 +0200 Subject: [PATCH 445/637] lua*Packages.luaossl: 20170903 -> 20181207 I'm in particular interested in :setCertificateChain() --- pkgs/top-level/lua-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c26f031a089..84c300205d8 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -324,15 +324,16 @@ with self; { luaossl = buildLuaPackage rec { name = "luaossl-${version}"; - version = "20170903"; + version = "20181207"; src = fetchurl { - url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz"; - sha256 = "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3"; + url = "https://github.com/wahern/luaossl/releases/download/rel-${version}/luaossl-rel-${version}.zip"; + sha256 = "194r6db80ksh4zh8d2k35q6vci9zbrfvkanjl280y6ij2xyhkvj7"; }; preConfigure = ''export prefix=$out''; + nativeBuildInputs = [ unzip ]; buildInputs = [ openssl ]; meta = with stdenv.lib; { From 7043d23093d71a6199a05ee2f0eae75948ae5752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 May 2019 17:15:11 +0200 Subject: [PATCH 446/637] lua*Packages.luasec: 0.6 -> 0.8 https://github.com/brunoos/luasec/blob/luasec-0.8/CHANGELOG --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 84c300205d8..57cd6de1b5a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -380,13 +380,13 @@ with self; { }; luasec = buildLuaPackage rec { - name = "sec-0.6"; + name = "sec-0.8"; src = fetchFromGitHub { owner = "brunoos"; repo = "luasec"; rev = "lua${name}"; - sha256 = "0wv8l7f7na7kw5xn8mjik2wpxbizl7zvvp5s7fcwvz9kl5jdpk5b"; + sha256 = "1cgb7ihnrrfr59a2da4d3chr7lqpid98xpglmzhv3hrpg4x5sksz"; }; propagatedBuildInputs = [ luasocket ]; From 9c77c92d5479cd938bd2fd9ad3980c1e043c7ad7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 08:30:16 -0700 Subject: [PATCH 447/637] google-authenticator: 1.05 -> 1.06 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/google-authenticator-libpam/versions --- pkgs/os-specific/linux/google-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 8ae5785eea8..fc308285dd6 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "google-authenticator-libpam-${version}"; - version = "1.05"; + version = "1.06"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946"; + sha256 = "01kb1ppsc2fz1i3crdwi6ic8gyphjv89f5li6ypv3pp88v3kxw2j"; }; nativeBuildInputs = [ autoreconfHook ]; From 4fe57ed90b993a4b3666dabaa7dc3c5c2ebff7b2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 10:35:27 -0500 Subject: [PATCH 448/637] liburing: 1.0.0pre92 -> 1.0.0pre116 Notably, this includes non-x86 platform support, eventfd registration for completion events, "drained" events that must have all outstanding prior events/further events drained (e.g. for fsync), and linked CQEs that can express completion ordering dependencies. Most of these require 5.2-rc1, and linked CQEs require custom patches from Jens' linux-block tree (that didn't hit the 5.2 merge window, apparently.) Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c90e0ee009e..a1a171e9ecb 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre116_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "7b989f34191302011b5b49bf5b26b36862d54056"; - sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; + rev = "ffe3e090cd41d0977ca74fafcb452838f76ceea1"; + sha256 = "1nmg89jgz1kbv7lv1drkkb4x0pank51sijagflxmnmvqgrk53gxd"; }; enableParallelBuilding = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin + cp ./examples/link-cp $out/bin/io_uring-link-cp ''; meta = with stdenv.lib; { @@ -34,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; - badPlatforms = [ "aarch64-linux" ]; }; } From 361c26316479e7c130af9fbaf37f9dddf97b738b Mon Sep 17 00:00:00 2001 From: samrose Date: Fri, 3 May 2019 14:46:53 -0400 Subject: [PATCH 449/637] fluent-bit: init at 1.0.6 --- pkgs/tools/misc/fluent-bit/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/fluent-bit/default.nix diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix new file mode 100644 index 00000000000..6d24f3a4473 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "fluent-bit"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "fluent"; + repo = "fluent-bit"; + rev = "8cc3a1887c3fcd6dd95a4a475fb213a0e399c222"; + sha256 = "0rmdbrhhrim80d0hwbz56d5f8rypm6h62ks3xnr0b4w987w10653"; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace /lib/systemd $out/lib/systemd + ''; + + meta = with stdenv.lib; { + description = "Log forwarder and processor, part of Fluentd ecosystem"; + homepage = "https://fluentbit.io"; + maintainers = with maintainers; [ + samrose + ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 647e3217591..267930a10af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2885,6 +2885,10 @@ in fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fluent-bit = callPackage ../tools/misc/fluent-bit { + stdenv = gccStdenv; + }; + fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; From e42889bbfe44c58d97dc3ca2e09abdc05e44805b Mon Sep 17 00:00:00 2001 From: samrose Date: Tue, 21 May 2019 11:02:16 -0400 Subject: [PATCH 450/637] maintainers: add samrose --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f8fb9bad2f..c5bf37c7e5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4382,6 +4382,11 @@ github = "samdroid-apps"; name = "Sam Parkinson"; }; + samrose = { + email = "samuel.rose@gmail.com"; + github = "samrose"; + name = "Sam Rose"; + }; samueldr = { email = "samuel@dionne-riel.com"; github = "samueldr"; From b38b0f610f319326e04ee0b6e0b473d00ab1b851 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 10:33:10 -0500 Subject: [PATCH 451/637] foundationdb61: 6.1.6pre4898 -> 6.1.7pre4928 Also includes some minor, miscellaneous cleanups to the CMake build expression. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/cmake.nix | 13 +++++++------ pkgs/servers/foundationdb/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index ae693a49027..a578b7e0e53 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -41,9 +41,10 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBRESSL_USE_STATIC_LIBS=FALSE" + (lib.optionalString officialRelease "FDB_RELEASE=1") - # CMake can't find these easily for some reason? + # FIXME: why can't libressl be found automatically? + "-DLIBRESSL_USE_STATIC_LIBS=FALSE" "-DLIBRESSL_INCLUDE_DIR=${libressl.dev}" "-DLIBRESSL_CRYPTO_LIBRARY=${libressl.out}/lib/libcrypto.so" "-DLIBRESSL_SSL_LIBRARY=${libressl.out}/lib/libssl.so" @@ -51,8 +52,6 @@ let # LTO brings up overall build time, but results in much smaller # binaries for all users and the cache. - # - # TODO FIXME: bugs :( (lib.optionalString (!useClang) "-DUSE_LTO=ON") # Gold helps alleviate the link time, especially when LTO is @@ -60,10 +59,12 @@ let # Same with LLD when Clang is available. (lib.optionalString useClang "-DUSE_LD=LLD") (lib.optionalString (!useClang) "-DUSE_LD=GOLD") - ] - ++ lib.optional officialRelease [ "FDB_RELEASE=1" ]; + ]; inherit patches; + + # fix up the use of the very weird and custom 'fdb_install' command by just + # replacing it with cmake's ordinary version. postPatch = '' for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do substituteInPlace $x --replace 'fdb_install' 'install' diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 790959f0a0d..713cc135d29 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,10 +69,10 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.6pre4898_${substring 0 7 rev}"; + version = "6.1.7pre4928_${substring 0 7 rev}"; branch = "release-6.1"; - rev = "26fbbbf798971b2b9ecb882a8af766fa36734f53"; - sha256 = "1q1a1j8h0qlh67khcds0dg416myvjbp6gfm6s4sk8d60zfzny7wb"; + rev = "a990458e81612632159bbf75167a36f64ef228d1"; + sha256 = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0"; officialRelease = false; patches = [ From 74d31d8b1fac3c1795754cf9546f10e235a8c9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 May 2019 17:54:58 +0200 Subject: [PATCH 452/637] tikzit: disable parallel make https://hydra.nixos.org/build/93736421 --- pkgs/tools/typesetting/tikzit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index c040677118e..906d9be0f1e 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake qttools flex bison ]; buildInputs = [ qtbase libsForQt5.poppler ]; - enableParallelBuilding = true; + # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory + enableParallelBuilding = false; meta = with stdenv.lib; { description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ"; From 5c7ce21c5a592e3704af5d56fb0f5dffba928a78 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 21 May 2019 15:26:11 +0000 Subject: [PATCH 453/637] indent: 2.2.10 -> 2.2.12 --- pkgs/development/tools/misc/indent/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 996043c16d8..d7bc90e3c26 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "indent-2.2.10"; + name = "indent-2.2.12"; src = fetchurl { url = "mirror://gnu/indent/${name}.tar.gz"; - sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"; + sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; }; + buildInputs = [ texinfo ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|#include |#include |' ./man/texinfo2man.c ''; @@ -15,9 +17,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://www.gnu.org/software/indent/; + homepage = "https://www.gnu.org/software/indent/"; description = "A source code reformatter"; license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.mmahut ]; platforms = stdenv.lib.platforms.unix; }; } From cca0aeeb68e9af722729eb6661ff6d8e68304e03 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 17:51:14 +0200 Subject: [PATCH 454/637] spyder: convert to python modules --- .../python-modules/spyder-kernels/default.nix | 27 ++++++++++++ .../python-modules}/spyder/default.nix | 41 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 3 ++ 4 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/spyder-kernels/default.nix rename pkgs/{applications/science => development/python-modules}/spyder/default.nix (60%) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix new file mode 100644 index 00000000000..27da324a29b --- /dev/null +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer }: + +buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Jupyter kernels for Spyder's console"; + homepage = "https://github.com/spyder-ide/spyder-kernels"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix similarity index 60% rename from pkgs/applications/science/spyder/default.nix rename to pkgs/development/python-modules/spyder/default.nix index 417d5544d6c..a368d7704c9 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,42 +1,18 @@ -{ stdenv, python3, makeDesktopItem }: +{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, + psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, + spyder-kernels }: -let - - spyder-kernels = with python3.pkgs; buildPythonPackage rec { - pname = "spyder-kernels"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; - }; - - propagatedBuildInputs = [ - cloudpickle - ipykernel - wurlitzer - ]; - - # No tests - doCheck = false; - - meta = { - description = "Jupyter kernels for Spyder's console"; - homepage = https://github.com/spyder-ide/spyder-kernels; - license = stdenv.lib.licenses.mit; - }; - }; - -in python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "spyder"; version = "3.3.3"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels ]; @@ -68,8 +44,9 @@ in python3.pkgs.buildPythonApplication rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = https://github.com/spyder-ide/spyder/; + homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 647e3217591..d1b0fded24e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22869,7 +22869,7 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = callPackage ../applications/science/spyder { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe2fc7eff36..b106260dbd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -932,6 +932,9 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; + spyder = callPackage ../development/python-modules/spyder {}; + tenacity = callPackage ../development/python-modules/tenacity { }; tokenserver = callPackage ../development/python-modules/tokenserver {}; From 7f68caa38f3db0ddff499ca7b0bad431a089fe5a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 17:57:25 +0200 Subject: [PATCH 455/637] pythonPackages.spyder-kernels: 0.4.2 -> 0.4.4 --- .../python-modules/spyder-kernels/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 27da324a29b..a3aaa942a9b 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,18 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer }: +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, + jupyter_client, pyzmq }: buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.4.2"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r"; }; propagatedBuildInputs = [ cloudpickle ipykernel wurlitzer + jupyter_client + pyzmq ]; # No tests From 8f4ae93be3f6ebe91a9b8eadc3f80bcca22cbde8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 18:06:59 +0200 Subject: [PATCH 456/637] spyder: 3.3.3 -> 3.3.4 --- .../development/python-modules/spyder/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index a368d7704c9..406cd6e8627 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,20 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, - qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, - spyder-kernels }: + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, + spyder-kernels, qtpy, pyzmq, chardet }: buildPythonPackage rec { pname = "spyder"; - version = "3.3.3"; + version = "3.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; + sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra"; }; propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels + pygments qtpy pyzmq chardet ]; # There is no test for spyder @@ -30,6 +31,12 @@ buildPythonPackage rec { categories = "Application;Development;Editor;IDE;"; }; + postPatch = '' + # remove dependency on pyqtwebengine + # this is still part of the pyqt 5.11 version we have in nixpkgs + sed -i /pyqtwebengine/d setup.py + ''; + # Create desktop item postInstall = '' mkdir -p $out/share/icons From c117aa3ec349bf6aa32292717d7f9778a314ee80 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 11:39:27 -0500 Subject: [PATCH 457/637] linux_testing (5.2.0-rc1): fix build, include 'cpio' in nativeBuildInputs 81d4e65891f92e8e72c244da663c83c1e40dc919 automatically bumped linux_testing to 5.2.0-rc1, but the 5.2 merge window included a new feature adding compressed headers for compiled kernels into /proc/kheaders.tar.xz See https://github.com/torvalds/linux/commit/43d8ce9d65a54846d378545770991e65838981e0 This feature requires 'cpio' to now be included in nativeBuildInputs since it's used to construct that archive. This wasn't caught by Hydra since we turn off build of linuxPackages, but ideally we should at least build the kernel in the future (linux_testing itself.) Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/manual-config.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6210523d62a..7a663fca694 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf +, libelf, cpio , utillinux , writeTextFile }: @@ -284,10 +284,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] - ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools + ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] + ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; From 4e5319070b00951ba42c3f80367e453e106ff129 Mon Sep 17 00:00:00 2001 From: Venkateswara Rao Mandela Date: Tue, 21 May 2019 09:29:22 +0530 Subject: [PATCH 458/637] ruby-zoom: 5.0.1 -> 5.3.0 --- pkgs/tools/text/ruby-zoom/Gemfile.lock | 26 +++++++-------- pkgs/tools/text/ruby-zoom/gemset.nix | 46 ++++++++++++++++---------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/pkgs/tools/text/ruby-zoom/Gemfile.lock index 107e896dd6d..820a972d106 100644 --- a/pkgs/tools/text/ruby-zoom/Gemfile.lock +++ b/pkgs/tools/text/ruby-zoom/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - djinni (2.1.1) - fagin (~> 1.0, >= 1.0.0) - fagin (1.0.0) - hilighter (1.1.0) - json_config (0.1.2) - ruby-zoom (5.0.1) - djinni (~> 2.1, >= 2.1.1) - fagin (~> 1.0, >= 1.0.0) - hilighter (~> 1.1, >= 1.1.0) - json_config (~> 0.1, >= 0.1.2) - scoobydoo (~> 0.1, >= 0.1.4) - scoobydoo (0.1.4) + djinni (2.2.4) + fagin (~> 1.2, >= 1.2.1) + fagin (1.2.1) + hilighter (1.2.3) + json_config (1.1.0) + ruby-zoom (5.3.0) + djinni (~> 2.2, >= 2.2.4) + fagin (~> 1.2, >= 1.2.1) + hilighter (~> 1.2, >= 1.2.3) + json_config (~> 1.0, >= 1.0.0) + scoobydoo (~> 1.0, >= 1.0.0) + scoobydoo (1.0.0) PLATFORMS ruby @@ -21,4 +21,4 @@ DEPENDENCIES ruby-zoom BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/tools/text/ruby-zoom/gemset.nix index 36374e54e16..f4c637aadf8 100644 --- a/pkgs/tools/text/ruby-zoom/gemset.nix +++ b/pkgs/tools/text/ruby-zoom/gemset.nix @@ -1,52 +1,64 @@ { djinni = { dependencies = ["fagin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00zfgd7zx2p9xjc64xm4iwdxq2bb6n1z09nw815c2f4lvlaq269f"; + sha256 = "18zk80jk70xq1bnsvzcgxb13x9fqdb5g4m02b2f6mvqm4cyw26pl"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.4"; }; fagin = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jryqrgb5jvz0m7p91c2bhn6gdwxn9jfdaq3cfkirc3y7yfzv131"; + sha256 = "0psyydh4hf2s1kz0r50aiyjf5v2pqhkbmy0gicxzaj5n17q2ga24"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.1"; }; hilighter = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sy59nfcfk4p1fnrdkipi0mvsj9db17chrx7lb2jg3majbr1wz59"; + sha256 = "03zm49g96dfpan5fhblcjxrzv7ldwan57sn0jcllkcmrqfd0zlyz"; + type = "gem"; + }; + version = "1.2.3"; + }; + json_config = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0slb618n1ipn47j6dsxbfv2j9pl06dxn2i651llix09d529m7zwa"; type = "gem"; }; version = "1.1.0"; }; - json_config = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16q3q0j9s8w93lzxa7rrvh5wqk11np7s2nmgmdlrh8gl3w76xcz6"; - type = "gem"; - }; - version = "0.1.2"; - }; ruby-zoom = { dependencies = ["djinni" "fagin" "hilighter" "json_config" "scoobydoo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0115kbz6l8srzizs77k9l0585lg93x90kg49jjpan7ssm786q05j"; + sha256 = "0iqxc0rzypsxy4wbxnvgvk98dbcsrcczq3xi9xd4wz4ggwq564l3"; type = "gem"; }; - version = "5.0.1"; + version = "5.3.0"; }; scoobydoo = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w83zgip3qvh20pgqgcp9yp0k35ypn7ny0d61xcv1ik0r3ab8ga0"; + sha256 = "162p75nc9x078kqcpdsrsd7kngs6jc5n4injz3kzpwf0jgbbm8n7"; type = "gem"; }; - version = "0.1.4"; + version = "1.0.0"; }; } \ No newline at end of file From 464e7cd88518a6cb2899c9fb51141f486f40ba53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 10:08:57 -0700 Subject: [PATCH 459/637] homebank: 5.2.4 -> 5.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/homebank/versions --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 95f8ebea078..96140d14803 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.4"; + name = "homebank-5.2.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1lhj4pnszw4a1r8ls8lwqyakg5bmldziaxgydbx76nbah6w9ma3r"; + sha256 = "1716igj18792sp4rx0vwxvx95mahgb7wiyahd2018yq8z88vc36w"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From dd405d21a370bc4657ed5c43462ac12d5a389221 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 10:35:57 -0700 Subject: [PATCH 460/637] ibus-engines.anthy: 1.5.10 -> 1.5.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ibus-anthy/versions --- pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index f9d3c53854b..77ec251ec88 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.10"; + version = "1.5.11"; meta = with stdenv.lib; { isIbusEngine = true; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc"; + sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; }; } From dee55b0e6618661b0e9be07f51b90141fb8750e2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 13:06:36 -0500 Subject: [PATCH 461/637] libbpf: init at 0.0.3pre114_672ae75 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/libbpf/default.nix | 43 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/os-specific/linux/libbpf/default.nix diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix new file mode 100644 index 00000000000..a23c0cb0926 --- /dev/null +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, libelf +}: + +with builtins; + +stdenv.mkDerivation rec { + name = "libbpf-${version}"; + version = "0.0.3pre114_${substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "libbpf"; + repo = "libbpf"; + rev = "672ae75b66fd8780a4214fe7b116c427e0809a52"; + sha256 = "1bdw1hc4m95irmybqlwax85b6m856g07p2slcw8b7jw3k4j9x075"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf ]; + + sourceRoot = "source/src"; + enableParallelBuilding = true; + makeFlags = [ "PREFIX=$(out)" ]; + + patchPhase = '' + substituteInPlace ../scripts/check-reallocarray.sh \ + --replace '/bin/rm' 'rm' + ''; + + # FIXME: Multi-output requires some fixes to the way the pkgconfig file is + # constructed (it gets put in $out instead of $dev for some reason, with + # improper paths embedded). Don't enable it for now. + + # outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "Upstream mirror of libbpf"; + homepage = "https://github.com/libbpf/libbpf"; + license = with licenses; [ lgpl21 /* or */ bsd2 ]; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59b31d9405e..f612609084f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8858,6 +8858,8 @@ in buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; + bpftool = callPackage ../os-specific/linux/bpftool { }; byacc = callPackage ../development/tools/parsing/byacc { }; From ed2c6a0e21ca69577c63c352c8ffbfb1fe1836e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 11:13:50 -0700 Subject: [PATCH 462/637] imagemagick7: 7.0.8-34 -> 7.0.8-46 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imagemagick/versions --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 746bddd5416..d0d7ce4f258 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-34"; - sha256 = "0szkzwy0jzmwx4kqli21jq8pk3s53v37q0nsaqzascs3mpkbza2s"; + version = "7.0.8-46"; + sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk"; patches = []; }; in From e4b146b125a05642d1a984b22b012e0bf9fd0cfc Mon Sep 17 00:00:00 2001 From: Stanislas Date: Tue, 21 May 2019 20:17:01 +0200 Subject: [PATCH 463/637] vscodium: init at 1.33.1 (#60423) --- .../vscode/{default.nix => generic.nix} | 51 +++-------------- pkgs/applications/editors/vscode/vscode.nix | 55 +++++++++++++++++++ pkgs/applications/editors/vscode/vscodium.nix | 54 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 119 insertions(+), 45 deletions(-) rename pkgs/applications/editors/vscode/{default.nix => generic.nix} (65%) create mode 100644 pkgs/applications/editors/vscode/vscode.nix create mode 100644 pkgs/applications/editors/vscode/vscodium.nix diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/generic.nix similarity index 65% rename from pkgs/applications/editors/vscode/default.nix rename to pkgs/applications/editors/vscode/generic.nix index 04e084dfc3b..10a981f59bf 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,38 +2,18 @@ , unzip, libsecret, libXScrnSaver, wrapGAppsHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig -, isInsiders ? false }: + +# Attributes inherit from specific versions +, version, src, meta, sourceRoot +, executableName, longName, shortName, pname +}: let - executableName = "code" + lib.optionalString isInsiders "-insiders"; - longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; - shortName = "Code" + lib.optionalString isInsiders " - Insiders"; - inherit (stdenv.hostPlatform) system; - - plat = { - "i686-linux" = "linux-ia32"; - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; - }.${system}; - - sha256 = { - "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; - "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; - "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; - }.${system}; - - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { - name = "vscode-${version}"; - version = "1.33.1"; - src = fetchurl { - name = "VSCode_${version}_${plat}.${archive_fmt}"; - url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; - inherit sha256; - }; + inherit pname version src sourceRoot; passthru = { inherit executableName; @@ -118,22 +98,5 @@ in gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]}) ''; - meta = with stdenv.lib; { - description = '' - Open source source code editor developed by Microsoft for Windows, - Linux and macOS - ''; - longDescription = '' - Open source source code editor developed by Microsoft for Windows, - Linux and macOS. It includes support for debugging, embedded Git - control, syntax highlighting, intelligent code completion, snippets, - and code refactoring. It is also customizable, so users can change the - editor's theme, keyboard shortcuts, and preferences - ''; - homepage = https://code.visualstudio.com/; - downloadPage = https://code.visualstudio.com/Updates; - license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; + inherit meta; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix new file mode 100644 index 00000000000..4300abf626c --- /dev/null +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch, isInsiders ? false }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; + "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; + "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.33.1"; + pname = "vscode"; + + executableName = "code" + lib.optionalString isInsiders "-insiders"; + longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; + shortName = "Code" + lib.optionalString isInsiders " - Insiders"; + + src = fetchurl { + name = "VSCode_${version}_${plat}.${archive_fmt}"; + url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; + inherit sha256; + }; + + sourceRoot = ""; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS. It includes support for debugging, embedded Git + control, syntax highlighting, intelligent code completion, snippets, + and code refactoring. It is also customizable, so users can change the + editor's theme, keyboard shortcuts, and preferences + ''; + homepage = https://code.visualstudio.com/; + downloadPage = https://code.visualstudio.com/Updates; + license = licenses.unfree; + maintainers = with maintainers; [ eadwu synthetica ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix new file mode 100644 index 00000000000..2b85cf8294e --- /dev/null +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "c45be9ff32a5acef91befc85d545402daac5cef627fe8f17fea40ae387b35b22"; + "x86_64-linux" = "7a87f19bc48cbe017321c72da244d879a7da364b92b3a89b742d437ffcd585d3"; + "x86_64-darwin" = "e393be5dd82ea1900e3a0597b6cb2e4c924b6acda4297d9d3eff5abcc857f32c"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.33.1"; + pname = "vscodium"; + + executableName = "vscodium"; + longName = "VSCodium"; + shortName = "Codium"; + + src = fetchurl { + url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; + inherit sha256; + }; + + sourceRoot = "."; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS (VS Code without MS branding/telemetry/licensing) + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS. It includes support for debugging, embedded Git + control, syntax highlighting, intelligent code completion, snippets, + and code refactoring. It is also customizable, so users can change the + editor's theme, keyboard shortcuts, and preferences + ''; + homepage = https://github.com/VSCodium/vscodium; + downloadPage = https://github.com/VSCodium/vscodium/releases; + license = licenses.mit; + maintainers = with maintainers; []; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2153fa916e0..2c873fd7fdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20610,7 +20610,7 @@ in vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode { }; + vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; @@ -20618,6 +20618,8 @@ in vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {}); + vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { }; From 5af438b9836052064c35c926620f82a7597bb7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 21 May 2019 15:44:04 -0300 Subject: [PATCH 464/637] zuki-themes: 3.32-3 -> 3.32-4 --- pkgs/data/themes/zuki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 69399bdb0eb..f55ed31c1ce 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.32-3"; + version = "3.32-4"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1al1fb7pqrcdi4g6llz8ka4sc9hsprv2ba0kkc21r6vajs0qp83n"; + sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h"; }; nativeBuildInputs = [ meson ninja sassc ]; From 45ca123f02050570b4b85380b9fb6a3589c1e832 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 20 May 2019 17:20:05 -0700 Subject: [PATCH 465/637] pythonPackages.mypy: 0.700 -> 0.701 --- pkgs/development/python-modules/mypy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 093d0d39ddd..c5ca8e1f4b5 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k +{ stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k ,mypy_extensions }: buildPythonPackage rec { pname = "mypy"; - version = "0.700"; + version = "0.701"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1zxfi5s9hxrz0hbaj4n513az17l44pxl80r62ipjc0bsmbcic2xi"; + sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p"; }; disabled = !isPy3k; - propagatedBuildInputs = [ lxml typed-ast psutil mypy_extensions ]; + propagatedBuildInputs = [ typed-ast psutil mypy_extensions ]; meta = with stdenv.lib; { description = "Optional static typing for Python"; From d3e5fc1bfc6fc6e6d4c5d22a468df2b211658300 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 21 May 2019 16:43:46 -0400 Subject: [PATCH 466/637] vscodium: 1.33.1 -> 1.34.0 --- pkgs/applications/editors/vscode/vscodium.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 2b85cf8294e..7058c00602c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -12,14 +12,14 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "c45be9ff32a5acef91befc85d545402daac5cef627fe8f17fea40ae387b35b22"; - "x86_64-linux" = "7a87f19bc48cbe017321c72da244d879a7da364b92b3a89b742d437ffcd585d3"; - "x86_64-darwin" = "e393be5dd82ea1900e3a0597b6cb2e4c924b6acda4297d9d3eff5abcc857f32c"; + "i686-linux" = "1vr3mblg5223k56yqi9fqwa7yg8qi4r3nkw6ssf87gs8jwfxa47l"; + "x86_64-linux" = "1vqq365zw44ll22i06bxxviyywv1v2f71c2mricrz3faz25c3lvm"; + "x86_64-darwin" = "0pa5cz8kq45q375b74kaa8qn1h0r1mp9amh5gsprg3hx89xzvhxi"; }.${system}; in callPackage ./generic.nix rec { - version = "1.33.1"; + version = "1.34.0"; pname = "vscodium"; executableName = "vscodium"; From d0e2c8ae27b646115b8019fc52854e54a6e15070 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 21 May 2019 16:43:55 -0400 Subject: [PATCH 467/637] vscode: 1.33.1 -> 1.34.0 --- pkgs/applications/editors/vscode/vscode.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 4300abf626c..bb0f90ed4fe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -12,14 +12,14 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; - "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; - "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; + "i686-linux" = "1xl8bk1m7d930dp7nw4770vk14cppci0ag079y8d39xqnvs24mr0"; + "x86_64-linux" = "0mq6gzz7338h4ragiar55xxby0x7whcd9nvnfk46bri162bacjbg"; + "x86_64-darwin" = "0pgj515k2bkpz953shmnalfw6yz8sg07jsxqk1rni9s3khrrd25h"; }.${system}; in callPackage ./generic.nix rec { - version = "1.33.1"; + version = "1.34.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 6ed0f80c420278326c936fa6127cce4c8a9a0e1e Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 21 May 2019 16:44:31 -0400 Subject: [PATCH 468/637] epubcheck: 4.2.0 -> 4.2.1 --- pkgs/tools/text/epubcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index d9acf106e2e..3ad6f0d3ecc 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.0"; + version = "4.2.1"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "1bf5jbzqvgpvhbkprynxj75ilk3r6zld157vjf6k7l5g21cwyn9d"; + sha256 = "10d68iz7g4wjiw14blcrbhvdckbi0754bc55ladsszg7gs79wip0"; }; nativeBuildInputs = [ makeWrapper ]; From 77908680f27882f7312c5b2c3dd34264e437eb49 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 21 May 2019 23:27:10 +0200 Subject: [PATCH 469/637] indent: fix darwin build --- pkgs/development/tools/misc/indent/darwin.patch | 15 +++++++++++++++ pkgs/development/tools/misc/indent/default.nix | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/indent/darwin.patch diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch new file mode 100644 index 00000000000..5458a0d93bf --- /dev/null +++ b/pkgs/development/tools/misc/indent/darwin.patch @@ -0,0 +1,15 @@ +diff --git a/config.h.in b/config.h.in +index 07e6fce..0c57e2a 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -432,8 +432,8 @@ + # endif + # define _GL_EXTERN_INLINE extern + #else +-# define _GL_INLINE static _GL_UNUSED +-# define _GL_EXTERN_INLINE static _GL_UNUSED ++# define _GL_INLINE static ++# define _GL_EXTERN_INLINE static + #endif + + #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index d7bc90e3c26..c4b5fecca74 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; }; + patches = [ ./darwin.patch ]; + buildInputs = [ texinfo ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|#include |#include |' ./man/texinfo2man.c - ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + "-Wno-implicit-function-declaration"; hardeningDisable = [ "format" ]; From a65dec2ad19d032e7550ac68858fa5becda6d45a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 16:27:45 -0700 Subject: [PATCH 470/637] infiniband-diags: 2.1.0 -> 2.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/infiniband-diags/versions --- pkgs/tools/networking/infiniband-diags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix index 0e41163577e..5723915f699 100644 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "infiniband-diags-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "infiniband-diags"; rev = version; - sha256 = "1qgyyvnig28x1m47df0zx6b2rcb5nm1k8r02zx7wzfb5pn9k2zh1"; + sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; From b48109ca9bac8b703dcd4ae0c22260d8fb82090d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 21 May 2019 20:28:02 -0400 Subject: [PATCH 471/637] solr: 8.0.0 -> 8.1.0 --- pkgs/servers/search/solr/8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 00821e6e40a..f5671c6b465 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "04hxj7nfmbh5wfqkq1p5q2ncxszwm80l218vfdy93aw0p79r4qqf"; + sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a"; }; nativeBuildInputs = [ makeWrapper ]; From 0890f8d743b7d9614d0d868dd9f1c7994f7eb3a1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 21 May 2019 20:29:19 -0400 Subject: [PATCH 472/637] solr: minor cleanup/formatting --- pkgs/servers/search/solr/8.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index f5671c6b465..28808a00a7c 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "8.1.0"; src = fetchurl { - url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; + url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; sha256 = "1w8hc2694c3acs4hqk0rkl3lmv4sbnji9n5mzw1piq90azlmnb1a"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ]; + maintainers = with maintainers; [ rickynils domenkozar aanderse ]; }; } From afaad7f1cd6a7d8c52de2b419bfd163b94900217 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 18:41:43 -0700 Subject: [PATCH 473/637] libdc1394: 2.2.5 -> 2.2.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdc1394/versions --- pkgs/development/libraries/libdc1394/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index be7852e6cdd..ea4a50275a3 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -3,11 +3,11 @@ libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; + sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; buildInputs = [ libusb1 ] From 25067370bb48b33e31887899398d167abdbc7edf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 20:16:09 -0700 Subject: [PATCH 474/637] limesuite: 19.01.0 -> 19.04.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/limesuite/versions --- pkgs/applications/radio/limesuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index ef9b28b36f8..3ff73c4ef2a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "19.01.0"; + version = "19.04.0"; in stdenv.mkDerivation { name = "limesuite-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "1r03kc1pvlhkvp19qbw7f5qzxx48z2v638f0xpawf6d1nwfky1n3"; + sha256 = "1lrjrli0ny25qwg8bw1bvbdb18hf7ffqj4ziibkgzscv3w5v0s45"; }; enableParallelBuilding = true; From 95dd3768f87f9942a2b06d9bb3af74e7c4e426f1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 May 2019 21:31:29 +0300 Subject: [PATCH 475/637] libmodsecurity: 3.0.2 -> 3.0.3 --- pkgs/tools/security/libmodsecurity/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 3bf906fb4c1..b3dc1270fb9 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { name = "libmodsecurity-${version}"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "0jhyqsvcjxq9ybndcinc08awknrg3sbkaby5w3qw03aqbfjkpywc"; + sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; - buildInputs = [ doxygen perl valgrind curl geoip libxml2 lmdb lua pcre yajl]; + buildInputs = [ perl valgrind curl geoip libxml2 lmdb lua pcre yajl ]; configureFlags = [ "--enable-static" @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "--with-yajl=${yajl}" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = '' ModSecurity v3 library component. From 05b2996d961e698869bf56786d0181e324ea8bff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 22:48:59 -0700 Subject: [PATCH 476/637] libndctl: 64.1 -> 65 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libndctl/versions --- pkgs/development/libraries/libndctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 408155fd5a7..d9db09f1e98 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libndctl-${version}"; - version = "64.1"; + version = "65"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"; + sha256 = "0d8hzfvyxs2q8kgkwgdizlml41kin4mhx3vpdsjk34pfi7mqy69y"; }; outputs = [ "out" "lib" "man" "dev" ]; From 98e2c1e04c8491c9f2ddb9a769bce47e4d067559 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 22:52:09 -0700 Subject: [PATCH 477/637] ncdc: 1.21 -> 1.22 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ncdc/versions --- pkgs/applications/networking/p2p/ncdc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index a3d55d7dff7..ed29a34f99c 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdc-${version}"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"; + sha256 = "0n9sn4rh4zhmzjknsvyp4bfh925abz93ln43gl8a1v63rs2yyhgx"; }; nativeBuildInputs = [ pkgconfig ]; From ffbea964ad8eb9899976dbc449893935cd2020b3 Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Wed, 22 May 2019 08:00:56 +0200 Subject: [PATCH 478/637] lbdb: fix build --- pkgs/tools/misc/lbdb/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index a00da33d8c9..e48d6354eb5 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, finger_bsd, makeWrapper +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper , abook ? null , gnupg ? null , goobook ? null @@ -32,7 +32,14 @@ stdenv.mkDerivation { ++ optional (khard != null) "--with-khard" ++ optional (mu != null) "--with-mu"; - patches = [ ./add-methods-to-rc.patch ]; + patches = [ ./add-methods-to-rc.patch + # fix undefined exec_prefix. Remove with the next release + (fetchpatch { + url = "https://github.com/RolandRosenfeld/lbdb/commit/60b7bae255011f59212d96adfbded459d6a27129.patch"; + sha256 = "129zg086glmlalrg395jq8ljcp787dl3rxjf9v7apsd8mqfdkl2v"; + excludes = [ "debian/changelog" ]; + }) + ]; postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + "${AuthenSASL}/${perl.libPrefix}" + ":${ConvertASN1}/${perl.libPrefix}" @@ -43,6 +50,6 @@ stdenv.mkDerivation { license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; - maintainers = [ maintainers.kaiha ]; + maintainers = [ maintainers.kaiha maintainers.bfortz ]; }; } From 0445fb2356122e8ce710deca38b1d77a1b7a53ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 00:03:39 -0700 Subject: [PATCH 479/637] ocamlPackages.logs: 0.6.2 -> 0.6.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocaml-logs/versions --- pkgs/development/ocaml-modules/logs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 84ac1039628..157beaac4bc 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -9,11 +9,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; + sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss"; }; buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; From d537c4ce4621cfe0a6ed588438a6b4a6a6ca196f Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Wed, 22 May 2019 07:36:25 +0000 Subject: [PATCH 480/637] graylog: 3.0.1 -> 3.0.2 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 846fa8e8aca..bdb919006fd 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi"; + sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj"; }; dontBuild = true; From 8b589a1b74c372d7242efea865ed24a61e431069 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 00:56:35 -0700 Subject: [PATCH 481/637] ocamlPackages.ptime: 0.8.4 -> 0.8.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocaml4.06.1-ptime/versions --- pkgs/development/ocaml-modules/ptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index d2f85f823ae..f21f05eeae5 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: stdenv.mkDerivation rec { - version = "0.8.4"; + version = "0.8.5"; name = "ocaml${ocaml.version}-ptime-${version}"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg"; + sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; }; buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; From 388300b6fb9ff79f39c8793092e1f3a81035e834 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 01:05:27 -0700 Subject: [PATCH 482/637] ocsigen-i18n: 3.1.0 -> 3.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ocsigen-i18n/versions --- pkgs/development/tools/ocaml/ocsigen-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 75e898fdb3f..f91ae713200 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; name = "${pname}-${version}"; - version = "3.1.0"; + version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec src = fetchurl { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; }; meta = { From 3d7e4b882e6f66c1535a9ec32e4aafffd24296fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 01:34:38 -0700 Subject: [PATCH 483/637] openapi-generator-cli: 3.3.4 -> 4.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openapi-generator-cli/versions --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 020feb2c43b..4b30c897967 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.3.4"; + version = "4.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "24cb04939110cffcdd7062d2f50c6f61159dc3e0ca3b8aecbae6ade53ad3dc8c"; + sha256 = "0011cks5qizq1rl8iwm683gmb9dlx134p8az32vqm8sbivggv9c1"; }; phases = [ "installPhase" ]; From c1309045471bc898486f898f7f57031f1dacdcfa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 22 May 2019 10:41:53 +0200 Subject: [PATCH 484/637] infiniband-diags: remove glib dependency not needed anymore according to release notes https://github.com/linux-rdma/infiniband-diags/releases/tag/2.2.0 --- pkgs/tools/networking/infiniband-diags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix index 5723915f699..81a43d672fd 100644 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core, - glib, opensm, perl, makeWrapper }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core +, opensm, perl, makeWrapper }: stdenv.mkDerivation rec { name = "infiniband-diags-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - buildInputs = [ rdma-core glib opensm perl ]; + buildInputs = [ rdma-core opensm perl ]; preConfigure = '' export CFLAGS="-I${opensm}/include/infiniband" From de9b1003a36cef088d173391d869e775b0a0bcd3 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Mon, 11 Mar 2019 13:27:40 +0100 Subject: [PATCH 485/637] pythonPackages.weasyprint: init at 45 --- .../python-modules/weasyprint/default.nix | 67 +++++++++++++++++++ .../weasyprint/library-paths.patch | 38 +++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 107 insertions(+) create mode 100644 pkgs/development/python-modules/weasyprint/default.nix create mode 100644 pkgs/development/python-modules/weasyprint/library-paths.patch diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix new file mode 100644 index 00000000000..e5597e7aea8 --- /dev/null +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -0,0 +1,67 @@ +{ buildPythonPackage, + fetchPypi, + cairosvg, + pyphen, + cffi, + cssselect, + lxml, + html5lib, + tinycss, + pygobject2, + glib, + pango, + fontconfig, + stdenv, + pytest, + pytestrunner, + pytest-isort, + pytest-flake8, + pytestcov, + isPy3k, + substituteAll +}: + +buildPythonPackage rec { + pname = "weasyprint"; + version = "45"; + disabled = !isPy3k; + + # ignore failing pytest + checkPhase = "pytest -k 'not test_font_stretch'"; + + # ignore failing flake8-test + prePatch = '' + substituteInPlace setup.cfg \ + --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' + ''; + + checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + + FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; + + propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; + + patches = [ + (substituteAll { + src = ./library-paths.patch; + fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; + pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + src = fetchPypi { + inherit version; + pname = "WeasyPrint"; + sha256 = "04bf2p2x619g4q4scg8v6v57c24vwn7qckvz81rckj8clzifyr82"; + }; + + meta = with stdenv.lib; { + homepage = https://weasyprint.org/; + description = "Converts web documents to PDF"; + license = licenses.bsd3; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch new file mode 100644 index 00000000000..eabbdbdcd6e --- /dev/null +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -0,0 +1,38 @@ +diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py +index 377716c1..2016e01c 100644 +--- a/weasyprint/fonts.py ++++ b/weasyprint/fonts.py +@@ -48,11 +48,8 @@ else: + # with OSError: dlopen() failed to load a library: cairo / cairo-2 + # So let's hope we find the same file as cairo already did ;) + # Same applies to pangocairo requiring pangoft2 +- fontconfig = dlopen(ffi, 'fontconfig', 'libfontconfig', +- 'libfontconfig-1.dll', +- 'libfontconfig.so.1', 'libfontconfig-1.dylib') +- pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', +- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') ++ fontconfig = dlopen(ffi, '@fontconfig@') ++ pangoft2 = dlopen(ffi, '@pangoft2@') + + ffi.cdef(''' + // FontConfig +diff --git a/weasyprint/text.py b/weasyprint/text.py +index 035074e9..08e40395 100644 +--- a/weasyprint/text.py ++++ b/weasyprint/text.py +@@ -243,12 +243,9 @@ def dlopen(ffi, *names): + return ffi.dlopen(names[0]) # pragma: no cover + + +-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', +- 'libgobject-2.0.dylib') +-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', +- 'libpango-1.0.dylib') +-pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', +- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') ++gobject = dlopen(ffi, '@gobject@') ++pango = dlopen(ffi, '@pango@') ++pangocairo = dlopen(ffi, '@pangocairo@') + + gobject.g_type_init() + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a62c0a01269..def44703e4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4502,6 +4502,8 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; + webassets = callPackage ../development/python-modules/webassets { }; webcolors = callPackage ../development/python-modules/webcolors { }; From 03d2c7f8a779dc97104d4ad3c684e4d320db411c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 02:17:37 -0700 Subject: [PATCH 486/637] openresty: 1.13.6.2 -> 1.15.8.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/openresty/versions --- pkgs/servers/http/openresty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1fe48e84fac..6bb4ce46a43 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.13.6.2"; + version = "1.15.8.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; + sha256 = "0hh8aygyzxgb0cyafqin70nbi87jpnjvxbf00dljssbpl66278c9"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; From 5b542f551ad175669e5502db8b33fba2a44475c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 04:53:30 -0700 Subject: [PATCH 487/637] iio-sensor-proxy: 2.5 -> 2.7 (#61841) * iio-sensor-proxy: 2.5 -> 2.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/iio-sensor-proxy/versions * iio-sensor-proxy: 2.6 -> 2.7 This release fixes broken sensor readings on multiple platforms due to a compiler optimisation. --- pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index dcd5b4763ff..76ec9be2798 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -2,14 +2,14 @@ , glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { - name = "iio-sensor-proxy-${version}"; - version = "2.5"; + pname = "iio-sensor-proxy"; + version = "2.7"; src = fetchFromGitHub { owner = "hadess"; - repo = "iio-sensor-proxy"; + repo = pname; rev = version; - sha256 = "06x1vvslsa44bgw8s5rr17q9i2ssbw0x04l75zsy3rql9r3y2jzg"; + sha256 = "05ipljw78d8z90cnkygcrpd0qq4vh14bb9hy06vqxnpdbyq46fxh"; }; configurePhase = '' From aac4013f90398d92e540dc591ca3d47cfc0be716 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 05:19:00 -0700 Subject: [PATCH 488/637] python37Packages.argcomplete: 1.9.5 -> 1.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-argcomplete/versions --- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5e45aeb0979..efc4c824a39 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.9.5"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a"; + sha256 = "1hdysr9z28sgwv47mivf4iyr1sg19hgfz349dghgdlk3rkl6v0s5"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". From 781614b6ffeec068107180b9564ce97e2d25154f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 05:22:14 -0700 Subject: [PATCH 489/637] python37Packages.asciimatics: 1.10.0 -> 1.11.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-asciimatics/versions --- pkgs/development/python-modules/asciimatics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index d83e2fdbf44..d71f0b640f9 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x"; }; nativeBuildInputs = [ From 3871b7610c38afccf58d1b0b8b9a15be34ebe588 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 22 May 2019 14:24:08 +0200 Subject: [PATCH 490/637] grafana: 6.1.6 -> 6.2.0 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3ded244b9fb..bf57d3f4186 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.6"; + version = "6.2.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "12fj3j1w37nm8p2h4af38wbxkvm0pzf1zsjx8wpj0zrxanbigpjg"; + sha256 = "18zig7r3kq1a3src0yb8fbajnm2hqzpzpmpjarslnp4xv90xqi87"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1dg2gjmym06x8wj2xmygsww622k86cq07kbxvp8j8h17br4imj4k"; + sha256 = "1cy3d04jjr5h8pzfzqb710rlynh9n125imkisrg05dwz5gl99bd7"; }; postPatch = '' From 94496d0ac856e15e85f53e278e80044ea29b24d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 05:25:25 -0700 Subject: [PATCH 491/637] python37Packages.asynctest: 0.12.4 -> 0.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-asynctest/versions --- pkgs/development/python-modules/asynctest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index b38ce7c91ce..a9c012ba831 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "asynctest"; - version = "0.12.4"; + version = "0.13.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ade427a711d18016f35fb0c5d412f0ed63fb074a6084b67ff2dad48f50b0d6ca"; + sha256 = "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62"; }; postPatch = '' From 0e0de64d6802de10401b89e78c09e8a3179b9c95 Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Tue, 21 May 2019 22:02:47 +0300 Subject: [PATCH 492/637] maintainers: add cf6b88f --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c5bf37c7e5d..da77f80a1ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -881,6 +881,11 @@ github = "ceedubs"; name = "Cody Allen"; }; + cf6b88f = { + email = "elmo.todurov@eesti.ee"; + github = "cf6b88f"; + name = "Elmo Todurov"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; From 35d0dab748e926a15026babf1bb7b28b05484d38 Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Tue, 21 May 2019 22:03:10 +0300 Subject: [PATCH 493/637] tdm: init at 2.07 --- pkgs/games/tdm/default.nix | 102 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 104 insertions(+) create mode 100644 pkgs/games/tdm/default.nix diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix new file mode 100644 index 00000000000..f8c29bfb88f --- /dev/null +++ b/pkgs/games/tdm/default.nix @@ -0,0 +1,102 @@ +{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa_noglu +, xorg, libGLU_combined, openal +, lib, makeWrapper, makeDesktopItem }: + +let + pname = "tdm"; + version = "2.07"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "The Dark Mod - stealth FPS inspired by the Thief series"; + type = "Application"; + categories = "Game;"; + genericName = pname; + }; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + src = fetchurl { + url = "http://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; + sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; + }; + nativeBuildInputs = [ + p7zip scons gnum4 makeWrapper + ]; + buildInputs = [ + glibc_multi mesa_noglu.dev xorg.libX11.dev openal + xorg.libXext.dev xorg.libXxf86vm.dev + libGLU_combined + ]; + unpackPhase = '' + 7z x $src + ''; + + # I'm pretty sure there's a better way to build 2 targets than a random hook + preBuild = '' + pushd tdm_update + scons BUILD=release TARGET_ARCH=x64 + install -Dm755 tdm_update.linux $out/share/libexec/tdm_update.linux + popd + ''; + + # why oh why can it find ld but not strip? + postPatch = '' + sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop --subst-var out + install -Dm755 thedarkmod.x64 $out/share/libexec/tdm + + # The package doesn't install assets, these get installed by running tdm_update.linux + # Provide a script that runs tdm_update.linux on first launch + install -Dm755 <(cat <<'EOF' +#!/bin/sh +set -e +DIR="$HOME/.local/share/tdm" +mkdir -p "$DIR" +cd "$DIR" +exec "PKGDIR/share/libexec/tdm_update.linux" --noselfupdate +EOF + ) $out/bin/tdm_update + + install -Dm755 <(cat <<'EOF' +#!/bin/sh +set -e +DIR="$HOME/.local/share/tdm" +if [ ! -d "$DIR" ]; then + echo "Please run tdm_update to (re)download game data" +else + cd "$DIR" + exec "PKGDIR/share/libexec/tdm" +fi +EOF + ) $out/bin/tdm + sed -i "s!PKGDIR!$out!g" $out/bin/tdm_update + sed -i "s!PKGDIR!$out!g" $out/bin/tdm + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGLU_combined ]} + ''; + + enableParallelBuilding = true; + sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; + NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"]; + meta = with stdenv.lib; { + description = "The Dark Mod - stealth FPS inspired by the Thief series"; + homepage = "http://www.thedarkmod.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ cf6b88f ]; + platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test. + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ffd155ceb0..f8fcb68aeba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24088,6 +24088,8 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; + tdm = callPackage ../games/tdm { }; + newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; From 3e865ed7119105f9b5f285257f04c3f6a92cf71a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 05:58:06 -0700 Subject: [PATCH 494/637] kore: 2.0.0 -> 3.3.0 (#61846) * kore: 2.0.0 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kore/versions * kore: minor cleanup postPatch sed removed because it is not making any change on v3.3.0 sources --- pkgs/development/web/kore/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index b0dc2ba041a..5ccb42ea417 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "kore-${version}"; - version = "2.0.0"; + pname = "kore"; + version = "3.3.0"; src = fetchFromGitHub { owner = "jorisvink"; - repo = "kore"; + repo = pname; rev = "${version}-release"; - sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; + sha256 = "19jd1jkyrylvqbrxdz7i3xvymwi1dzx97iq6fcp76fw7nm7gxgk4"; }; buildInputs = [ openssl ]; - postPatch = '' - # Do not require kore to be on PATH when it launches itself as a subprocess. - sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c - ''; - - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; # added to fix build w/gcc7 and clang5 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" From 5a00925d82725f58ecd721ff93e48c3831480dcf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:26:24 -0400 Subject: [PATCH 495/637] linux: 4.14.120 -> 4.14.121 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c10b2b8a6d4..ef6c3d1da8b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.120"; + version = "4.14.121"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x"; + sha256 = "1118vcfw2p29h85rzs5cpfax3w79fv6x8v38vnvci609ba1ddv1f"; }; } // (args.argsOverride or {})) From 6ac9131fab59d282fef1443fb22786b6dde91424 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:26:27 -0400 Subject: [PATCH 496/637] linux: 4.19.44 -> 4.19.45 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index bd5f2fe347d..5cf19ed57c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.44"; + version = "4.19.45"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh"; + sha256 = "0awx9d8i73naz5b27vzjpv5l4vblr65dvv1ci7dyxaihpcpyccgb"; }; } // (args.argsOverride or {})) From 6b389fb55c15fca76f60720038c96e5d33ef9c7b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:26:30 -0400 Subject: [PATCH 497/637] linux: 4.9.177 -> 4.9.178 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ca30427a883..ea88cba5b89 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.177"; + version = "4.9.178"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7"; + sha256 = "0ri50wiwqxnrl26b48czqvblkc20ys779x17x7wyk72xfaqdizqk"; }; } // (args.argsOverride or {})) From 8966d899fcdf48c5cdb92caf1d83855aef9c44c6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:26:33 -0400 Subject: [PATCH 498/637] linux: 5.0.17 -> 5.0.18 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 28ea81e8795..c0d407cd8f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.17"; + version = "5.0.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb"; + sha256 = "1n5hdn9wkdx0483lc86h3ys14p1309n00gqy7w0qm8m7j0yhpgbz"; }; } // (args.argsOverride or {})) From c002312f76e1623e318f501d5e0ffd7f74d6151e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:26:37 -0400 Subject: [PATCH 499/637] linux: 5.1.3 -> 5.1.4 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 5db24b34ec9..b8e29ed54af 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.3"; + version = "5.1.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh"; + sha256 = "1yg7s6mcfi4kvlf0ykfj5j54flwdx0xjzjygnhx2nralpbx6avaw"; }; } // (args.argsOverride or {})) From 963a99309701135f4fa97e44cc0d40452e0e3781 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 08:29:53 -0400 Subject: [PATCH 500/637] oh-my-zsh: 2019-05-19 -> 2019-05-21 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4a705d52cd1..c6a893da5eb 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-19"; + version = "2019-05-21"; name = "oh-my-zsh-${version}"; - rev = "f960e2be6f01abe5f185d668be661b57051322ac"; + rev = "60736c9f37ccf886291a5995dfc6f7215b0d8b56"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1amn72cx9ay4kd707y8kxfvgq5mlqhvlvha28aai2gxcravb95vn"; + sha256 = "1bkv6fh2x0mc0bkv8rkfvj1qpwqai5aj9nxvmmhgyig4n2g853m3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From d35692126f384536963df9cc99bd7fff5ae08a10 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 May 2019 09:15:36 -0400 Subject: [PATCH 501/637] docker: 18.09.5 -> 18.09.6 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 719626fe40a..d2e42740d0f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -201,9 +201,9 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.5"; - rev = "e8ff056dbcfadaeca12a5f508b0cec281126c01d"; - sha256 = "16nd9vg2286m6v47fjq2zicmfvi8vwiwn24yylxia8b9mk417kdb"; + version = "18.09.6"; + rev = "481bc7715621adba10752357e0d537c8dc86507d"; + sha256 = "15l77g7f7zhn33b0a5k56nk2722yl0nm1fl6cmlgcv4ih7q7cl6c"; runcRev = "2b18fe1d885ee5083ef9f0838fee39b62d653e30"; runcSha256 = "0g0d9mh5fcvsjgddiyw98ph5zpz5ivlwy89m45jxwbzkxb21gy7w"; containerdRev = "bb71b10fd8f58240ca47fbb579b9d1028eea7c84"; From e4f1e144a0c39317433cbe59bab5d157d2a48741 Mon Sep 17 00:00:00 2001 From: Ingolf Wanger Date: Tue, 21 May 2019 22:24:36 +0200 Subject: [PATCH 502/637] syncthing: made module more NixOps friendly --- nixos/modules/services/networking/syncthing.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 89dae7bb3f8..d495703fc53 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -18,7 +18,10 @@ let fsWatcherEnabled = folder.watch; fsWatcherDelayS = folder.watchDelay; ignorePerms = folder.ignorePerms; - }) cfg.declarative.folders; + }) (filterAttrs ( + _: folder: + folder.enable + ) cfg.declarative.folders); # get the api key by parsing the config.xml getApiKey = pkgs.writers.writeDash "getAPIKey" '' @@ -169,6 +172,16 @@ in { type = types.attrsOf (types.submodule ({ config, ... }: { options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + share this folder. + This option is useful when you want to define all folders + in one place, but not every machine should share all folders. + ''; + }; + path = mkOption { type = types.str; default = config._module.args.name; From 4e750fa92c8a2d7147cd2ff02f9c05fb162ca093 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 22 May 2019 13:55:00 +0000 Subject: [PATCH 503/637] =?UTF-8?q?[RFC]=20manual:=20rename=20to=20users?= =?UTF-8?q?=20and=20contributors=20manual,=20add=20some=20user=20notes=20?= =?UTF-8?q?=E2=80=A6=20(#60682)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * manual: rename to users and contributors manual, add some user notes that should be there but don't fit in any chapter * manual: move the package notes that are completely usage-related to the upper user notes section * manual: link to package-specific development notes from user notes --- doc/manual.xml | 3 +- doc/package-notes.xml | 391 ----------------------- doc/package-specific-user-notes.xml | 469 ++++++++++++++++++++++++++++ 3 files changed, 471 insertions(+), 392 deletions(-) create mode 100644 doc/package-specific-user-notes.xml diff --git a/doc/manual.xml b/doc/manual.xml index f31897aed03..ab845e1a108 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,12 +1,13 @@ - Nixpkgs Contributors Guide + Nixpkgs Users and Contributors Guide Version + diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 54f3079d554..d3cffab3307 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -352,312 +352,6 @@ packageOverrides = pkgs: { -
- Steam - -
- Steam in Nix - - - Steam is distributed as a .deb file, for now only as - an i686 package (the amd64 package only has documentation). When unpacked, - it has a script called steam that in ubuntu (their - target distro) would go to /usr/bin . When run for the - first time, this script copies some files to the user's home, which include - another script that is the ultimate responsible for launching the steam - binary, which is also in $HOME. - - - - Nix problems and constraints: - - - - We don't have /bin/bash and many scripts point - there. Similarly for /usr/bin/python . - - - - - We don't have the dynamic loader in /lib . - - - - - The steam.sh script in $HOME can not be patched, as - it is checked and rewritten by steam. - - - - - The steam binary cannot be patched, it's also checked. - - - - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible - chroot environment, as documented - here. - This allows us to have binaries in the expected paths without disrupting - the system, and to avoid patching them to work in a non FHS environment. - -
- -
- How to play - - - For 64-bit systems it's important to have -hardware.opengl.driSupport32Bit = true; - in your /etc/nixos/configuration.nix. You'll also need -hardware.pulseaudio.support32Bit = true; - if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller or other Steam supported controllers such as - the DualShock 4 or Nintendo Switch Pro, you need to add -hardware.steam-hardware.enable = true; - to your configuration. - -
- -
- Troubleshooting - - - - - - Steam fails to start. What do I do? - - - - Try to run -strace steam - to see what is causing steam to fail. - - - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - - - - - The newStdcpp parameter was removed since NixOS - 17.09 and should not be needed anymore. - - - - - Steam ships statically linked with a version of libcrypto that - conflics with the one dynamically loaded by radeonsi_dri.so. If you - get the error -steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at - this - pull request. - - - - - - - - Java - - - - - - There is no java in steam chrootenv by default. If you get a message - like -/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - - -
- -
- steam-run - - - The FHS-compatible chroot used for steam can also be used to run other - linux games that expect a FHS environment. To do it, add -pkgs.(steam.override { - nativeOnly = true; - newStdcpp = true; - }).run - to your configuration, rebuild, and run the game with -steam-run ./foo - -
-
-
- Emacs - -
- Configuring Emacs - - - The Emacs package comes with some extra helpers to make it easier to - configure. emacsWithPackages allows you to manage - packages from ELPA. This means that you will not have to install that - packages from within Emacs. For instance, if you wanted to use - company, counsel, - flycheck, ivy, - magit, projectile, and - use-package you could use this as a - ~/.config/nixpkgs/config.nix override: - - - -{ - packageOverrides = pkgs: with pkgs; { - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - } -} - - - - You can install it like any other packages via nix-env -iA - myEmacs. However, this will only install those packages. It will - not configure them for us. To do this, we need to - provide a configuration file. Luckily, it is possible to do this from - within Nix! By modifying the above example, we can make Emacs load a custom - config file. The key is to create a package that provide a - default.el file in - /share/emacs/site-start/. Emacs knows to load this - file automatically when it starts. - - - -{ - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' -;; initialize package - -(require 'package) -(package-initialize 'noactivate) -(eval-when-compile - (require 'use-package)) - -;; load some packages - -(use-package company - :bind ("<C-tab>" . company-complete) - :diminish company-mode - :commands (company-mode global-company-mode) - :defer 1 - :config - (global-company-mode)) - -(use-package counsel - :commands (counsel-descbinds) - :bind (([remap execute-extended-command] . counsel-M-x) - ("C-x C-f" . counsel-find-file) - ("C-c g" . counsel-git) - ("C-c j" . counsel-git-grep) - ("C-c k" . counsel-ag) - ("C-x l" . counsel-locate) - ("M-y" . counsel-yank-pop))) - -(use-package flycheck - :defer 2 - :config (global-flycheck-mode)) - -(use-package ivy - :defer 1 - :bind (("C-c C-r" . ivy-resume) - ("C-x C-b" . ivy-switch-buffer) - :map ivy-minibuffer-map - ("C-j" . ivy-call)) - :diminish ivy-mode - :commands ivy-mode - :config - (ivy-mode 1)) - -(use-package magit - :defer - :if (executable-find "git") - :bind (("C-x g" . magit-status) - ("C-x G" . magit-dispatch-popup)) - :init - (setq magit-completing-read-function 'ivy-completing-read)) - -(use-package projectile - :commands projectile-mode - :bind-keymap ("C-c p" . projectile-command-map) - :defer 5 - :config - (projectile-global-mode)) - ''; - myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' -mkdir -p $out/share/emacs/site-lisp -cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el -'') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; -} - - - - This provides a fairly full Emacs start file. It will load in addition to - the user's presonal config. You can always disable it by passing - -q to the Emacs command. - - - - Sometimes emacsWithPackages is not enough, as this - package set has some priorities imposed on packages (with the lowest - priority assigned to Melpa Unstable, and the highest for packages manually - defined in pkgs/top-level/emacs-packages.nix). But you - can't control this priorities when some package is installed as a - dependency. You can override it on per-package-basis, providing all the - required dependencies manually - but it's tedious and there is always a - possibility that an unwanted dependency will sneak in through some other - package. To completely override such a package you can use - overrideScope'. - - - -overrides = self: super: rec { - haskell-mode = self.melpaPackages.haskell-mode; - ... -}; -((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ - # here both these package will use haskell-mode of our own choice - ghc-mod - dante -]) - -
-
Weechat @@ -762,64 +456,6 @@ stdenv.mkDerivation { }
-
- Citrix Receiver - - - 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. - - - - 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 - 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: - - { config.allowUnfree = true; }; -let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_receiver.override { - inherit extraCerts; -}]]> - - -
-
ibus-engines.typing-booster @@ -887,33 +523,6 @@ citrix_receiver.override { On NixOS it can be installed using the following expression: { pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; -} - -
- -
- DLib - - - DLib is a modern, C++-based toolkit which - provides several machine learning algorithms. - - -
- Compiling without AVX support - - - Especially older CPUs don't support - AVX - (Advanced Vector Extensions) instructions that are used by DLib to - optimize their algorithms. - - - - On the affected hardware errors like Illegal instruction will occur. - In those cases AVX support needs to be disabled: -self: super: { - dlib = super.dlib.override { avxSupport = false; }; }
diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml new file mode 100644 index 00000000000..ef9198d1de2 --- /dev/null +++ b/doc/package-specific-user-notes.xml @@ -0,0 +1,469 @@ + + Package-specific usage notes + + These chapters includes some notes + that apply to specific packages and should + answer some of the frequently asked questions + related to Nixpkgs use. + + Some useful information related to package use + can be found in package-specific development notes. + + +
+ OpenGL + + + Packages that use OpenGL have NixOS desktop as their primary target. The + current solution for loading the GPU-specific drivers is based on + libglvnd and looks for the driver implementation in + LD_LIBRARY_PATH. If you are using a non-NixOS + GNU/Linux/X11 desktop with free software video drivers, consider launching + OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of + libglvnd and mesa_drivers in + LD_LIBRARY_PATH. For proprietary video drivers you might + have luck with also adding the corresponding video driver package. + +
+
+ Locales + + + To allow simultaneous use of packages linked against different versions of + glibc with different locale archive formats Nixpkgs + patches glibc to rely on + LOCALE_ARCHIVE environment variable. + + + + On non-NixOS distributions this variable is obviously not set. This can + cause regressions in language support or even crashes in some + Nixpkgs-provided programs. The simplest way to mitigate this problem is + exporting the LOCALE_ARCHIVE variable pointing to + ${glibcLocales}/lib/locale/locale-archive. The drawback + (and the reason this is not the default) is the relatively large (a hundred + MiB) size of the full set of locales. It is possible to build a custom set + of locales by overriding parameters allLocales and + locales of the package. + +
+ +
+ Emacs + +
+ Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to + configure. emacsWithPackages allows you to manage + packages from ELPA. This means that you will not have to install that + packages from within Emacs. For instance, if you wanted to use + company, counsel, + flycheck, ivy, + magit, projectile, and + use-package you could use this as a + ~/.config/nixpkgs/config.nix override: + + + +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} + + + + You can install it like any other packages via nix-env -iA + myEmacs. However, this will only install those packages. It will + not configure them for us. To do this, we need to + provide a configuration file. Luckily, it is possible to do this from + within Nix! By modifying the above example, we can make Emacs load a custom + config file. The key is to create a package that provide a + default.el file in + /share/emacs/site-start/. Emacs knows to load this + file automatically when it starts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} + + + + This provides a fairly full Emacs start file. It will load in addition to + the user's presonal config. You can always disable it by passing + -q to the Emacs command. + + + + Sometimes emacsWithPackages is not enough, as this + package set has some priorities imposed on packages (with the lowest + priority assigned to Melpa Unstable, and the highest for packages manually + defined in pkgs/top-level/emacs-packages.nix). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all the + required dependencies manually - but it's tedious and there is always a + possibility that an unwanted dependency will sneak in through some other + package. To completely override such a package you can use + overrideScope'. + + + +overrides = self: super: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) + +
+
+ +
+ DLib + + + DLib is a modern, C++-based toolkit which + provides several machine learning algorithms. + + +
+ Compiling without AVX support + + + Especially older CPUs don't support + AVX + (Advanced Vector Extensions) instructions that are used by DLib to + optimize their algorithms. + + + + On the affected hardware errors like Illegal instruction will occur. + In those cases AVX support needs to be disabled: +self: super: { + dlib = super.dlib.override { avxSupport = false; }; +} + +
+
+ +
+ Unfree software + + + All users of Nixpkgs are free software users, and many users (and + developers) of Nixpkgs want to limit and tightly control their exposure to + unfree software. At the same time, many users need (or want) + to run some specific + pieces of proprietary software. Nixpkgs includes some expressions for unfree + software packages. By default unfree software cannot be installed and + doesn’t show up in searches. To allow installing unfree software in a + single Nix invocation one can export + NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users + can set allowUnfree in the Nixpkgs configuration. + + + + Fine-grained control is possible by defining + allowUnfreePredicate function in config; it takes the + mkDerivation parameter attrset and returns + true for unfree packages that should be allowed. + +
+ +
+ Steam + +
+ Steam in Nix + + + Steam is distributed as a .deb file, for now only as + an i686 package (the amd64 package only has documentation). When unpacked, + it has a script called steam that in Ubuntu (their + target distro) would go to /usr/bin . When run for the + first time, this script copies some files to the user's home, which include + another script that is the ultimate responsible for launching the steam + binary, which is also in $HOME. + + + + Nix problems and constraints: + + + + We don't have /bin/bash and many scripts point + there. Similarly for /usr/bin/python . + + + + + We don't have the dynamic loader in /lib . + + + + + The steam.sh script in $HOME can not be patched, as + it is checked and rewritten by steam. + + + + + The steam binary cannot be patched, it's also checked. + + + + + + + The current approach to deploy Steam in NixOS is composing a FHS-compatible + chroot environment, as documented + here. + This allows us to have binaries in the expected paths without disrupting + the system, and to avoid patching them to work in a non FHS environment. + +
+ +
+ How to play + + + For 64-bit systems it's important to have +hardware.opengl.driSupport32Bit = true; + in your /etc/nixos/configuration.nix. You'll also need +hardware.pulseaudio.support32Bit = true; + if you are using PulseAudio - this will enable 32bit ALSA apps integration. + To use the Steam controller or other Steam supported controllers such as + the DualShock 4 or Nintendo Switch Pro, you need to add +hardware.steam-hardware.enable = true; + to your configuration. + +
+ +
+ Troubleshooting + + + + + + Steam fails to start. What do I do? + + + + Try to run +strace steam + to see what is causing steam to fail. + + + + + + Using the FOSS Radeon or nouveau (nvidia) drivers + + + + + + The newStdcpp parameter was removed since NixOS + 17.09 and should not be needed anymore. + + + + + Steam ships statically linked with a version of libcrypto that + conflics with the one dynamically loaded by radeonsi_dri.so. If you + get the error +steam.sh: line 713: 7842 Segmentation fault (core dumped) + have a look at + this + pull request. + + + + + + + + Java + + + + + + There is no java in steam chrootenv by default. If you get a message + like +/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + You need to add + steam.override { withJava = true; }; + to your configuration. + + + + + + + +
+ +
+ steam-run + + + The FHS-compatible chroot used for steam can also be used to run other + linux games that expect a FHS environment. To do it, add +pkgs.(steam.override { + nativeOnly = true; + newStdcpp = true; + }).run + to your configuration, rebuild, and run the game with +steam-run ./foo + +
+
+ +
+ Citrix Receiver + + + 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 license + 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. + +
+ +
+ 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 + 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: + + { config.allowUnfree = true; }; +let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in +citrix_receiver.override { + inherit extraCerts; +}]]> + + +
+
+ From 180f6a82f792bfcf04407c90018a108e34599c41 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 22 May 2019 23:01:46 +0800 Subject: [PATCH 504/637] dconf: Disable tests on armv7l-linux Fixes: #59590 --- pkgs/desktops/gnome-3/core/dconf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 1a9516430d9..43f8dd08dbf 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; passthru = { updateScript = gnome3.updateScript { From 38e31e9a253ead99362396114191338f0d16cba5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 08:13:23 -0700 Subject: [PATCH 505/637] python37Packages.distlib: 0.2.8 -> 0.2.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-distlib/versions --- pkgs/development/python-modules/distlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index bdc31856f33..73bc143beeb 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "068zqb3w7nyqiv2hpy0zcpz2xd6xwhq5chigqrp9h9zav7bpr5sp"; + sha256 = "1z9c4ig19hjk18agwljv5ib3pphicg50w9z5zsnqn97q7vnv17gm"; extension = "zip"; }; From 6349ef157f414e2628911509b88fb7b543a4d6ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 08:31:42 -0700 Subject: [PATCH 506/637] python37Packages.deluge-client: 1.7.0 -> 1.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-deluge-client/versions --- pkgs/development/python-modules/deluge-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 477468a0eb3..6f82adc94ca 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; + sha256 = "1ragmpihjr9p6n27hw7gy83qyc68csqpn18m9kvwsby1vi7mgdy8"; }; # it will try to connect to a running instance From 42232ebea405a1b1ff4692bd0f33b131e4eadf08 Mon Sep 17 00:00:00 2001 From: mkenigs <40775676+mkenigs@users.noreply.github.com> Date: Wed, 22 May 2019 08:40:01 -0700 Subject: [PATCH 507/637] docker: fix typo --- nixos/modules/virtualisation/docker.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ba04dfd5794..7d196a46276 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -46,8 +46,8 @@ in description = '' When enabled dockerd is started on boot. This is required for - container, which are created with the - --restart=always flag, to work. If this option is + containers which are created with the + --restart=always flag to work. If this option is disabled, docker might be started on demand by socket activation. ''; }; From 15eaeeb4933ba53e32ddf7e18904b7666e780146 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 09:01:42 -0700 Subject: [PATCH 508/637] python37Packages.factory_boy: 2.11.1 -> 2.12.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-factory_boy/versions --- pkgs/development/python-modules/factory_boy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0bb1e00778a..0c87f309489 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca"; + sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; }; propagatedBuildInputs = [ faker ]; From 2874e849d99e4e96154fc2a7ce4b2e5d8ed4e699 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 22 May 2019 18:19:55 +0200 Subject: [PATCH 509/637] addOpenGLRunpath: Add new hook for setting RUNPATH. This hook allows to add NixOS driver libraries path to given ELF objects' RUNPATH. We use it instead of settings RUNPATH manually everywhere. It must be invoked in postFixup so that RUNPATH stripping does not remove the path. It puts the path first instead of last so that system-wide drivers are always preferred. --- .../add-opengl-runpath/default.nix | 12 ++++++++ .../add-opengl-runpath/setup-hook.sh | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/build-support/add-opengl-runpath/default.nix create mode 100644 pkgs/build-support/add-opengl-runpath/setup-hook.sh diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/build-support/add-opengl-runpath/default.nix new file mode 100644 index 00000000000..5cab0937e07 --- /dev/null +++ b/pkgs/build-support/add-opengl-runpath/default.nix @@ -0,0 +1,12 @@ +{ lib, stdenv }: + +stdenv.mkDerivation { + name = "add-opengl-runpath"; + + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; + + buildCommand = '' + mkdir -p $out/nix-support + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; +} diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh new file mode 100644 index 00000000000..7645033ca20 --- /dev/null +++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh @@ -0,0 +1,28 @@ +# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. +# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid +# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run +# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf +# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary +# it set on (including for dlopen), so the RUNPATH must indeed be set on these +# libraries and would not work if set only on executables. +addOpenGLRunpath() { + local forceRpath= + + while [ $# -gt 0 ]; do + case "$1" in + --) shift; break;; + --force-rpath) shift; forceRpath=1;; + --*) + echo "addOpenGLRunpath: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1;; + *) break;; + esac + done + + for file in "$@"; do + local origRpath="$(patchelf --print-rpath "$file")" + patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file" + done +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b86fa5c3d08..a60df81e929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ in } ''); + addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; From 1860e506e7f2fd66982929cfb75ec83b0a586acb Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Wed, 22 May 2019 18:30:05 +0200 Subject: [PATCH 510/637] libglvnd, ocl-icd, vulkan-loader: Add driver library paths to RUNPATH. Previously we were relying on LD_LIBRARY_PATH to discover driver libraries (libGL, ligGLX, libEGL, OpenCL and Vulkan). This has the problem that setuid programs (in particular VirtualBox) ignore LD_LIBRARY_PATH. Fix it by setting RUNPATH in various dispatch libraries. This is not needed for libvdpau because it is already configured to look for libraries in the driver paths. Fixes https://github.com/NixOS/nixpkgs/issues/22760. --- .../development/libraries/libglvnd/default.nix | 18 +++++++++++------- pkgs/development/libraries/ocl-icd/default.nix | 12 +++++++++--- .../libraries/vulkan-loader/default.nix | 12 +++++++++--- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index c7b76497fa8..62c6b45c5d4 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: -let - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libglvnd-${version}"; version = "1.0.0"; @@ -13,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 @@ -45,7 +43,13 @@ in stdenv.mkDerivation rec { }); outputs = [ "out" "dev" ]; - passthru = { inherit driverLink; }; + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so + ''; + + passthru = { inherit (addOpenGLRunpath) driverLink; }; meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index ec6dc5f9052..abdc7502052 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: +{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -9,12 +9,18 @@ stdenv.mkDerivation rec { sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2"; }; - nativeBuildInputs = [ ruby ]; + nativeBuildInputs = [ ruby addOpenGLRunpath ]; buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + ''; + + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libOpenCL.so ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 7d53065ba32..891ad373e02 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig -, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let version = "1.1.106"; @@ -17,17 +17,23 @@ stdenv.mkDerivation rec { sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${addOpenGLRunpath.driverLink}/share:/usr/local/share:/usr/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; outputs = [ "out" "dev" ]; + # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/libvulkan.so + ''; + meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = https://www.lunarg.com; From cff544bc99c2cc64a21bf1f305fa329632593945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 22 May 2019 18:32:02 +0200 Subject: [PATCH 511/637] matrix-synapse: 0.99.4 -> 0.99.5 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 824aacb599d..cde8ae16a33 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.4"; + version = "0.99.5"; src = fetchPypi { inherit pname version; - sha256 = "136041apawi05mzc0s4s2chrwgql6l9f1i2iinrgi9dabwlb1qpc"; + sha256 = "0f50nfddrd4zxyv27wn9k5fxhqqa9kgvk2ijby0pgf61b054dhfn"; }; patches = [ From 28a09189166c767ad284adb9f7e137a3f98546a4 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Wed, 22 May 2019 18:34:09 +0200 Subject: [PATCH 512/637] Add driver library path to some packages to find CUDA libraries. This is to avoid relying on LD_LIBRARY_PATH for finding the CUDA driver libraries. --- pkgs/applications/misc/blender/default.nix | 14 ++++++++++++-- pkgs/development/compilers/cudatoolkit/default.nix | 14 ++++++++++++-- .../libraries/science/math/cudnn/generic.nix | 9 +++++++++ .../libraries/science/math/nccl/default.nix | 8 ++++++-- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 353cf620ee7..5445c7efb59 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -2,7 +2,7 @@ , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages -, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd +, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; + nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost cmake ffmpeg gettext glew ilmbase + [ boost ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc @@ -80,6 +81,15 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages} ''; + # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be + # found. See the explanation in libglvnd. + postFixup = optionalString cudaSupport '' + for program in $out/bin/blender $out/bin/.blender-wrapped; do + isELF "$program" || continue + addOpenGLRunpath "$program" + done + ''; + meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; homepage = https://www.blender.org; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index e2c3c8fe587..6a18c05f38e 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib , gcc48, gcc49, gcc5, gcc6, gcc7 , xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc +, addOpenGLRunpath }: let @@ -39,7 +40,7 @@ let outputs = [ "out" "lib" "doc" ]; - nativeBuildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ]; buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook runtimeDependencies = [ ncurses5 expat python zlib glibc @@ -143,10 +144,19 @@ let else rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 fi - patchelf --set-rpath $rpath2 --force-rpath $i + patchelf --set-rpath "$rpath2" --force-rpath $i done < <(find $out $lib $doc -type f -print0) ''; + # Set RPATH so that libcuda and other libraries in + # /run/opengl-driver(-32)/lib can be found. See the explanation in + # addOpenGLRunpath. Don't try to figure out which libraries really need + # it, just patch all (but not the stubs libraries). Note that + # --force-rpath prevents changing RPATH (set above) to RUNPATH. + postFixup = '' + addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so + ''; + # cuda-gdb doesn't run correctly when not using sandboxing, so # temporarily disabling the install check. This should be set to true # when we figure out how to get `cuda-gdb --version` to run correctly diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index bb1258655b5..3c448abeccf 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -7,6 +7,7 @@ , lib , cudatoolkit , fetchurl +, addOpenGLRunpath }: stdenv.mkDerivation rec { @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + nativeBuildInputs = [ addOpenGLRunpath ]; + installPhase = '' function fixRunPath { p=$(patchelf --print-rpath $1) @@ -31,6 +34,12 @@ stdenv.mkDerivation rec { cp -a lib64 $out/lib64 ''; + # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = '' + addOpenGLRunpath $out/lib/lib*.so + ''; + propagatedBuildInputs = [ cudatoolkit ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index badd08291de..a099b779a78 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, cudatoolkit }: +{ stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which addOpenGLRunpath ]; buildInputs = [ cudatoolkit ]; @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput lib/libnccl_static.a $dev + + # Set RUNPATH so that libnvidia-ml in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/lib*.so ''; NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; From 59b5eaa71b9ea4463d177147f04c6ebfad513424 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 09:39:52 -0700 Subject: [PATCH 513/637] python37Packages.flask_marshmallow: 0.10.0 -> 0.10.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-flask-marshmallow/versions --- pkgs/development/python-modules/flask-marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 92e4542bfef..b03f3307d08 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.10.0"; + version = "0.10.1"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; + sha256 = "0hbp0lrdlzpcdjv1jn2hk98z9gg624nswcm0hi48k4rk28x9xsb9"; }; propagatedBuildInputs = [ flask marshmallow ]; From 87783a2900ba49a120730fc85fea7f268c38e528 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Tue, 21 May 2019 17:26:00 -0700 Subject: [PATCH 514/637] plata-theme: 0.7.6 -> 0.8.0 --- pkgs/data/themes/plata/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index b43a6e35ab2..3b80c60044b 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -8,23 +8,26 @@ , xfceSupport ? true , gtkNextSupport ? false , plankSupport ? false +, steamSupport ? false , telegramSupport ? false -, tweetdeckSupport ? false +, tweetdeckSupport ? false, zip ? null , selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) , accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) , suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500) , destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) }: +assert tweetdeckSupport -> zip != null; + stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1jllsl2h3zdvlp3k2dy3h4jyccrzzymwbqz43jhnm6mxxabxzijg"; + sha256 = "10xvfrc945zqlgzlx8zjyg0gnkwmq9vfjk0yqjy3gg62i65s8sch"; }; preferLocalBuild = true; @@ -37,7 +40,8 @@ stdenv.mkDerivation rec { inkscape libxml2 gnome2.glib.dev - ]; + ] + ++ stdenv.lib.optional tweetdeckSupport zip; buildInputs = [ gdk_pixbuf @@ -62,6 +66,7 @@ stdenv.mkDerivation rec { (enableFeature xfceSupport "xfce") (enableFeature gtkNextSupport "gtk_next") (enableFeature plankSupport "plank") + (enableFeature steamSupport "airforsteam") (enableFeature telegramSupport "telegram") (enableFeature tweetdeckSupport "tweetdeck") ] @@ -70,6 +75,13 @@ stdenv.mkDerivation rec { ++ (withOptional suggestionColor "suggestion_color") ++ (withOptional destructionColor "destruction_color"); + postInstall = '' + for dest in $out/share/gtksourceview-{3.0,4}/styles; do + mkdir -p $dest + cp $out/share/themes/Plata-{Noir,Lumine}/gtksourceview/*.xml $dest + done + ''; + meta = with stdenv.lib; { description = "A Gtk+ theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; From ab5926ba67b013fe8f012bd91f9791ecfbb8d761 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 22 May 2019 18:52:27 +0200 Subject: [PATCH 515/637] nixos/nextcloud: Improve autoUpdateApps description string --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 887478d0788..bb39a5d1d71 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -262,7 +262,7 @@ in { type = types.bool; default = false; description = '' - Run a auto update of all installed apps from the nextcloud repository. + Run regular auto update of all apps installed from the nextcloud app store. ''; }; startAt = mkOption { From ec589b38bdd8f5a3669e9a06c9a6094305f6303f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 10:32:46 -0700 Subject: [PATCH 516/637] python37Packages.html5-parser: 0.4.5 -> 0.4.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-html5-parser/versions --- pkgs/development/python-modules/html5-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 63c7188f03a..2c24d7b9d6a 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9"; + sha256 = "0pxcwk5lc8ljil77xqywr0bq1xxj11z92lpfj185ac72d2b1sma5"; }; nativeBuildInputs = [ pkgconfig ]; From 48e28eec08db0afb9f5c11ad2075473e9f848219 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 10:50:31 -0700 Subject: [PATCH 517/637] python37Packages.ipyparallel: 6.2.3 -> 6.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-ipyparallel/versions --- pkgs/development/python-modules/ipyparallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 7ce31228705..3fa1acb875a 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.3"; + version = "6.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1k9701r120gv0an0wxvcjrbmhns8lq3zj6px5y2izly56j2dafqy"; + sha256 = "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn"; }; buildInputs = [ nose ]; From ad2e3b9386316a87aef6f14458d4f843ab7dc1d8 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Wed, 22 May 2019 21:05:59 +0300 Subject: [PATCH 518/637] golangci-lint: 1.9.2 -> 1.16.0 (#58336) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/development/tools/golangci-lint/default.nix | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da77f80a1ac..dc57313c878 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -375,6 +375,11 @@ github = "ankhers"; name = "Justin Wood"; }; + anpryl = { + email = "anpryl@gmail.com"; + github = "anpryl"; + name = "Anatolii Prylutskyi"; + }; anton-dessiatov = { email = "anton.dessiatov@gmail.com"; github = "anton-dessiatov"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index d2db1f1a2a6..f0870598956 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,8 +1,8 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { +buildGoModule rec { name = "golangci-lint-${version}"; - version = "1.9.2"; + version = "1.16.0"; goPackagePath = "github.com/golangci/golangci-lint"; subPackages = [ "cmd/golangci-lint" ]; @@ -11,14 +11,16 @@ buildGoPackage rec { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0r05j6ayk5778fkd5r1sgcwq675ra0vq82lqs125g70291ryha08"; + sha256 = "1yzcfmrxyrxhq3vx13qm7czvhvdnaqay75v8ry1lgpg0bnh9pakx"; }; + modSha256 = "1dsaj6qsac9y4rkssjbmk46vaqbblzdim2rbdh3dgn1m0vdpv505"; + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; license = licenses.agpl3; platforms = platforms.unix; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ anpryl manveru ]; }; } From 532516744dff6301a64dc8341351343e67de2748 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 11:07:30 -0700 Subject: [PATCH 519/637] python37Packages.kitchen: 1.2.5 -> 1.2.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-kitchen/versions --- pkgs/development/python-modules/kitchen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 2e8abf0da52..494a4f8fc06 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd"; + sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; }; meta = with stdenv.lib; { From 788e9b7e2655947cf7fc4bf26353e5dad35762ab Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 May 2019 20:19:43 +0200 Subject: [PATCH 520/637] gns3Packages.{server,gui}Stable: 2.1.17 -> 2.1.18 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 2f588cd304d..55691fcde50 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.17"; + stableVersion = "2.1.18"; previewVersion = "2.2.0a5"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1caqb644nq0hhszlg3ac87730m1xmw48b17jisqiq7zmk9scsh40"; - serverSrcHash = "0zyfh5sw8r2n41v0nazgdbr50cz6g5an2myvlgj5xx41smr9gflb"; + guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i"; + serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf"; in { guiStable = mkGui { stable = true; From f38707a4e4f137e78f73ddf1a6e4ef7cee59bc20 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 May 2019 20:23:30 +0200 Subject: [PATCH 521/637] gns3Packages.{server,gui}Preview: 2.2.0a5 -> 2.2.0b1 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 55691fcde50..6ef4465cd92 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.18"; - previewVersion = "2.2.0a5"; + previewVersion = "2.2.0b1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0p4g5hszys68ijzsi2rb89j1rpg04wlqlzzrl92npvqqf2i0jdf8"; + sha256Hash = "0kx68r8kgnsb7710a1a5y64blmw2jl1gv37bzbbivi15dzgmykfh"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1yvdfczi8ah9m7b49l7larfs678hh7c424i1f73kivfds6211bj5"; + sha256Hash = "1jxkba7hc7271hjw3839r0yfzs87dzv1nqx62adhk9qrrcfqhg58"; }; } From 48be21ce25c31628cbfaf7a7fd380ecad19aec10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 11:33:48 -0700 Subject: [PATCH 522/637] python37Packages.marshmallow-sqlalchemy: 0.16.2 -> 0.16.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-marshmallow-sqlalchemy/versions --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 6412e04f93d..01f80473fee 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.2"; + version = "0.16.3"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "755e6e930c1ffe3430f62091085f0a51e0817b240986d931014f03b3556fff34"; + sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; From f15118a883d5d78ffb063051c44dee62c824e034 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 21 May 2019 15:12:39 -0400 Subject: [PATCH 523/637] nixos/bitcoind: add bitcoind service --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/bitcoind.nix | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 nixos/modules/services/networking/bitcoind.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 434cb69868c..bc8bcc0cd8f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -536,6 +536,7 @@ ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix ./services/networking/bind.nix + ./services/networking/bitcoind.nix ./services/networking/autossh.nix ./services/networking/bird.nix ./services/networking/bitlbee.nix diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix new file mode 100644 index 00000000000..e9426556459 --- /dev/null +++ b/nixos/modules/services/networking/bitcoind.nix @@ -0,0 +1,195 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.bitcoind; + pidFile = "${cfg.dataDir}/bitcoind.pid"; + configFile = pkgs.writeText "bitcoin.conf" '' + ${optionalString cfg.testnet "testnet=1"} + ${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"} + ${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"} + + # Connection options + ${optionalString (cfg.port != null) "port=${toString cfg.port}"} + + # RPC server options + ${optionalString (cfg.rpc.port != null) "rpcport=${toString cfg.rpc.port}"} + ${concatMapStringsSep "\n" + (rpcUser: "rpcauth=${rpcUser.name}:${rpcUser.passwordHMAC}") + (attrValues cfg.rpc.users) + } + + # Extra config options (from bitcoind nixos service) + ${cfg.extraConfig} + ''; + cmdlineOptions = escapeShellArgs [ + "-conf=${cfg.configFile}" + "-datadir=${cfg.dataDir}" + "-pid=${pidFile}" + ]; + hexStr = types.strMatching "[0-9a-f]+"; + rpcUserOpts = { name, ... }: { + options = { + name = mkOption { + type = types.str; + example = "alice"; + description = '' + Username for JSON-RPC connections. + ''; + }; + passwordHMAC = mkOption { + type = with types; uniq (strMatching "[0-9a-f]+\\$[0-9a-f]{64}"); + example = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; + description = '' + Password HMAC-SHA-256 for JSON-RPC connections. Must be a string of the + format <SALT-HEX>$<HMAC-HEX>. + ''; + }; + }; + config = { + name = mkDefault name; + }; + }; +in { + options = { + + services.bitcoind = { + enable = mkEnableOption "Bitcoin daemon"; + + package = mkOption { + type = types.package; + default = pkgs.altcoins.bitcoind; + defaultText = "pkgs.altcoins.bitcoind"; + description = "The package providing bitcoin binaries."; + }; + configFile = mkOption { + type = types.path; + default = configFile; + example = "/etc/bitcoind.conf"; + description = "The configuration file path to supply bitcoind."; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + par=16 + rpcthreads=16 + logips=1 + ''; + description = "Additional configurations to be appended to bitcoin.conf."; + }; + dataDir = mkOption { + type = types.path; + default = "/var/lib/bitcoind"; + description = "The data directory for bitcoind."; + }; + + user = mkOption { + type = types.str; + default = "bitcoin"; + description = "The user as which to run bitcoind."; + }; + group = mkOption { + type = types.str; + default = cfg.user; + description = "The group as which to run bitcoind."; + }; + + rpc = { + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Override the default port on which to listen for JSON-RPC connections."; + }; + users = mkOption { + default = {}; + example = literalExample '' + { + alice.passwordHMAC = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; + bob.passwordHMAC = "b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99"; + } + ''; + type = with types; loaOf (submodule rpcUserOpts); + description = '' + RPC user information for JSON-RPC connnections. + ''; + }; + }; + + testnet = mkOption { + type = types.bool; + default = false; + description = "Whether to use the test chain."; + }; + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Override the default port on which to listen for connections."; + }; + dbCache = mkOption { + type = types.nullOr (types.ints.between 4 16384); + default = null; + example = 4000; + description = "Override the default database cache size in megabytes."; + }; + prune = mkOption { + type = types.nullOr (types.coercedTo + (types.enum [ "disable" "manual" ]) + (x: if x == "disable" then 0 else 1) + types.ints.unsigned + ); + default = null; + example = 10000; + description = '' + Reduce storage requirements by enabling pruning (deleting) of old + blocks. This allows the pruneblockchain RPC to be called to delete + specific blocks, and enables automatic pruning of old blocks if a + target size in MiB is provided. This mode is incompatible with -txindex + and -rescan. Warning: Reverting this setting requires re-downloading + the entire blockchain. ("disable" = disable pruning blocks, "manual" + = allow manual pruning via RPC, >=550 = automatically prune block files + to stay under the specified target size in MiB) + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + "L '${cfg.dataDir}/bitcoin.conf' - - - - '${cfg.configFile}'" + ]; + systemd.services.bitcoind = { + description = "Bitcoin daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/bitcoind ${cmdlineOptions}"; + Restart = "on-failure"; + + # Hardening measures + PrivateTmp = "true"; + ProtectSystem = "full"; + NoNewPrivileges = "true"; + PrivateDevices = "true"; + MemoryDenyWriteExecute = "true"; + + # Permission for preStart + PermissionsStartOnly = "true"; + }; + }; + users.users.${cfg.user} = { + name = cfg.user; + group = cfg.group; + description = "Bitcoin daemon user"; + home = cfg.dataDir; + }; + users.groups.${cfg.group} = { + name = cfg.group; + }; + }; +} From f3ced69e8e349893b071fa8695aea49fd0645f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 22 May 2019 23:09:42 +0200 Subject: [PATCH 524/637] gtk{2,3}-x11: build against cairo with X11 support enabled On Darwin cairo does not have X11 support enabled by default, but gtk{2,3}-x11 requires it. Force gtk{2,3}-x11 to be built against cairo with X11 support enabled. Fixes #61891. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8fcb68aeba..5127862b130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10732,6 +10732,7 @@ in }; gtk2-x11 = gtk2.override { + cairo = cairo.override { x11Support = true; }; gdktarget = "x11"; }; @@ -10741,6 +10742,7 @@ in # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { + cairo = cairo.override { x11Support = true; }; x11Support = true; }; From d7f6429c0e4d7b77a5d70399a7d5b1ea4878cbdf Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 22 May 2019 23:43:18 +0200 Subject: [PATCH 525/637] castxml: 20180403 -> 0.2.0 0.2.0 is the first tagged release from upstream Published 2019-04-18 --- pkgs/development/tools/castxml/default.nix | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index aea94633bae..653d0d4505e 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -2,37 +2,39 @@ , pythonPackages , cmake , llvmPackages +, libffi, libxml2, zlib , withMan ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "CastXML"; - version = "20180403"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "CastXML"; - repo = "CastXML"; - rev = "c2a44d06d9379718292b696f4e13a2725ff9d95e"; - sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1qpgr5hyb692h7l5igmq53m6a6vi4d9qp8ks893cflfx9955h3ip"; }; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + cmakeFlags = [ "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; buildInputs = [ - cmake llvmPackages.clang-unwrapped llvmPackages.llvm - ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + libffi libxml2 zlib + ]; - propagatedbuildInputs = [ llvmPackages.libclang ]; + propagatedBuildInputs = [ llvmPackages.libclang ]; - # 97% tests passed, 96 tests failed out of 2866 + # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all - doCheck=false; + doCheck = false; checkPhase = '' # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.kitware.com; + homepage = "https://github.com/CastXML/CastXML"; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; platforms = platforms.unix; From eaf4f440285e36469cd45fffbbf1444c8ba25427 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 15:23:22 -0700 Subject: [PATCH 526/637] python37Packages.pyutilib: 5.6.5 -> 5.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyutilib/versions --- pkgs/development/python-modules/pyutilib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 4227a255ad3..0e19b971a16 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyutilib"; - version = "5.6.5"; + version = "5.7.0"; src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "4730084624be98f2c326da88f3852831c6aa919e11babab2c34b0299c8f5ce2a"; + sha256 = "086fzgjb2mjgkfhg1hvc2gcyam2ab28mijygwica5fg4zz6rn32l"; }; propagatedBuildInputs = [ From 291347cde75131148b07ea3889754002a6d7e418 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Thu, 23 May 2019 00:33:50 +0200 Subject: [PATCH 527/637] python.pkgs.pybindgen: disable checks on Py3 --- pkgs/development/python-modules/pybindgen/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 9b5991a424c..4d8d0589eda 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.19.0"; @@ -11,6 +11,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; checkInputs = [ pygccxml ]; + doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k meta = with stdenv.lib; { homepage = https://github.com/gjcarneiro/pybindgen; @@ -19,5 +20,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ teto ]; }; } - - From 569569666490524a99a1f64ee6f7f5ac18a9e609 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 23 May 2019 00:50:51 +0200 Subject: [PATCH 528/637] nixosTests.signal-desktop: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/signal-desktop.nix | 37 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 nixos/tests/signal-desktop.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c1c9e7e5037..9bce49c9e30 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -222,6 +222,7 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sddm = handleTest ./sddm.nix {}; + signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; slim = handleTest ./slim.nix {}; slurm = handleTest ./slurm.nix {}; diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix new file mode 100644 index 00000000000..605b9c3e130 --- /dev/null +++ b/nixos/tests/signal-desktop.nix @@ -0,0 +1,37 @@ +import ./make-test.nix ({ pkgs, ...} : + +{ + name = "signal-desktop"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + services.xserver.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.signal-desktop ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + startAll; + $machine->waitForX; + + # start signal desktop + $machine->execute("su - alice -c signal-desktop &"); + + # wait for the "Link your phone to Signal Desktop" message + $machine->waitForText(qr/Link your phone to Signal Desktop/); + $machine->screenshot("signal_desktop"); + ''; +}) From d4e5b4b3e0d4a87038d1f7ed1e3eab3930d0bc81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 16:06:27 -0700 Subject: [PATCH 529/637] python37Packages.rpmfluff: 0.5.6 -> 0.5.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rpmfluff/versions --- pkgs/development/python-modules/rpmfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index bdbc3629ec7..76fc508a5d8 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.6"; + version = "0.5.7.1"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; + sha256 = "19vnlzma8b0aghdiixk0q3wc10y6306hsnic0qvswaaiki94fss1"; }; LC_ALL="en_US.utf-8"; From c095548f996f75a7359e1dc327b47a4c13fb6461 Mon Sep 17 00:00:00 2001 From: "soner.cirit" Date: Thu, 23 May 2019 02:06:29 +0300 Subject: [PATCH 530/637] nodejs_latest: init at v12 --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d9e4a7ac5..c9ff4badcb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4185,6 +4185,9 @@ in openssl = openssl_1_1; }; + # Update this when adding the newest nodejs major version! + nodejs_latest = nodejs-12_x; + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; }); From 4f0a2d5db816d754e98c75e7f64e20fa9fff8319 Mon Sep 17 00:00:00 2001 From: "soner.cirit" Date: Thu, 23 May 2019 02:07:06 +0300 Subject: [PATCH 531/637] nodejs-slim_latest: init at v12 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9ff4badcb8..6f1342e8600 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4187,6 +4187,7 @@ in # Update this when adding the newest nodejs major version! nodejs_latest = nodejs-12_x; + nodejs-slim_latest = nodejs-slim-12_x; nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; From acb5655bd6c7f13972fa40f9f06baa2e2b7c65ae Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 23 May 2019 10:11:13 +0900 Subject: [PATCH 532/637] ocamlPackages.{camlpdf,cpdf}: fix build --- pkgs/development/ocaml-modules/camlpdf/default.nix | 6 ++++++ pkgs/development/ocaml-modules/cpdf/default.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 01441fcb4ec..a0a00472a4d 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { EOF ''; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index bcbb96c2c0c..b6473126158 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; + makeFlags = with stdenv.lib; + optionals (versionAtLeast ocaml.version "4.06") [ + "OCAMLBCFLAGS+=-unsafe-string" + "OCAMLNCFLAGS+=-unsafe-string" + ]; + createFindlibDestdir = true; postInstall = '' From 983908ad9ff4b2ea8b4d7a3f593e77d109db8576 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 May 2019 19:09:29 -0500 Subject: [PATCH 533/637] shadowfox: 1.7.20 -> 2.0.1 https://github.com/SrKomodo/shadowfox-updater/releases/tag/v2.0.0 https://github.com/SrKomodo/shadowfox-updater/releases/tag/v2.0.1 --- pkgs/tools/networking/shadowfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 4f9dba1d62f..3b76f8b7c18 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "shadowfox"; - version = "1.7.20"; + version = "2.0.1"; src = fetchFromGitHub { owner = "SrKomodo"; repo = "shadowfox-updater"; rev = "v${version}"; - sha256 = "14crips12l4n050b8hrqkfqbxl0l8s3y4y9lm8n0bjpxdpjbpr7q"; + sha256 = "0j8ljnx281a5nwd3zpw7b25ndsxc26b52glk2hqhm5fh08f9w0d8"; }; goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "143ky1fj7xglhjyzh78qzgh1m4j53kqps25c9vnq9q4vdyzm93sr"; + modSha256 = "0anxrff09r5aw3a11iph0gigmcbmpfczm8him6ly57ywfzc5c850"; buildFlags = "--tags release"; From d250c0c6f985356c44bc795a25502fa2a8332e3b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 May 2019 19:03:28 -0500 Subject: [PATCH 534/637] xterm: 344 -> 345 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index c306e8e6d92..f91989e22a9 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-344"; + name = "xterm-345"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; + sha256 = "0dfmy9vgpmxi8rsnv2lb2lmq5ny26f0pjhcj348l0d3rs61afjb6"; }; buildInputs = From 6287f99a226792453bd1bbb0891f4a31b7dd07bf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 22 May 2019 17:59:50 -0500 Subject: [PATCH 535/637] strace: 5.0 -> 5.1 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index c3553d04981..49b12b60b14 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"; + sha256 = "12wsga1v3rab24gr0mpfip7j7gwr90m8f9h6fviqxa3xgnwl38zm"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From f7cea7a400b1176c6aba963d8ae1176843384701 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 May 2019 18:49:33 -0500 Subject: [PATCH 536/637] utf8proc: 2.3.0 -> 2.4.0 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 72f6f57553f..91bf7e39378 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; + sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; }; makeFlags = [ "prefix=$(out)" ]; From 6518817736b4df1e33b4b2471f9aaff621f5c407 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 09:31:36 -0700 Subject: [PATCH 537/637] python37Packages.faker: 1.0.5 -> 1.0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-faker/versions --- pkgs/development/python-modules/faker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index b79999bba41..2204c25e6bc 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -16,23 +16,23 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.5"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "3f2f4570df28df2eb8f39b00520eb610081d6552975e926c6a2cbc64fd89c4c1"; + sha256 = "1jins8jlqyxjwx6i2h2jknwwfpi0bpz1qggvw6xnbxl0g9spyiv0"; }; buildInputs = [ pytestrunner ]; checkInputs = [ email_validator freezegun - mock - more-itertools pytest random2 ukpostcodeparser - ]; + ] + ++ lib.optionals (pythonOlder "3.3") [ mock ] + ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; propagatedBuildInputs = [ dateutil From fde6161827789df1f72ab169457302a5cf6e9e31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 22:10:48 -0500 Subject: [PATCH 538/637] nodejs-8_x: 8.15.1 -> 8.16.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index b29add5d057..cf877521144 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.15.1"; - sha256 = "1ldd4p7cf7bjl4yg9d91khzd9662g3wda7g1yr0ljqjjyjiqcr3b"; + version = "8.16.0"; + sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m"; } From 28c8647020fff93dbeca0d24fc534cd1d539f198 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 21:00:00 -0500 Subject: [PATCH 539/637] nodejs-12_x: 12.2.0 -> 12.3.1 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 66133b432ee..06eb3e45e6f 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.2.0"; - sha256 = "10vr8yqrvdmcaszg7l7cjchzzik709vcygcnpkjf2sjhz929glf5"; + version = "12.3.1"; + sha256 = "1zhb5nq9s6cshbm6lf7qsy310fcsiy9wdr869vs6hw76zyn50axs"; } From a4a5e9c65d705da870e5cbf173c08a4b8bed701c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 21:00:00 -0500 Subject: [PATCH 540/637] hanazono: 20141012 -> 20170904 --- pkgs/data/fonts/hanazono/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 4def0b44b14..cc219b74179 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,23 +1,30 @@ { lib, fetchzip }: let - version = "20141012"; + version = "20170904"; in fetchzip { name = "hanazono-${version}"; - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; + url = "mirror://sourceforgejp/hanazono-font/68253/hanazono-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; - sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; meta = with lib; { - description = "Free kanji font containing 96,327 characters"; - homepage = http://fonts.jp/hanazono/; + description = "Japanese Mincho-typeface TrueType font"; + homepage = "https://fonts.jp/hanazono/"; + longDescription = '' + Hanazono Mincho typeface is a Japanese TrueType font that developed with a + support of Grant-in-Aid for Publication of Scientific Research Results + from Japan Society for the Promotion of Science and the International + Research Institute for Zen Buddhism (IRIZ), Hanazono University. also with + volunteers who work together on glyphwiki.org. + ''; # Dual-licensed under OFL and the following: # This font is a free software. From 0fdc1eac4afc88dc31fc2a336fedece0b9474efb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 22:00:00 -0500 Subject: [PATCH 541/637] flow: 0.98.1 -> 0.99.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 390c0e44133..a5e6ed3d2dd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.98.1"; + version = "0.99.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1ik758ca6mfybnzb987fa8blqaskqbfk5hkzl4yg1j08p7kli5ll"; + sha256 = "0afm3mz2b4aivqm3hbp6kc7d7a5v89r13x7dahzhf7l21qjv3mz5"; }; installPhase = '' From fabd6ac95549431ea2c1880676c010c62c09b940 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 23 May 2019 00:10:10 -0400 Subject: [PATCH 542/637] alacritty: build on aarch64-linux --- pkgs/applications/misc/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ed5bf6a85c5..dfd1ddf8503 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -119,6 +119,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; } From 62bd8f6d2495c4e40c62d1f2f39f1de34109c7fa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 May 2019 23:23:41 -0500 Subject: [PATCH 543/637] pythonPackages.curio: init at 0.9 --- .../python-modules/curio/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/curio/default.nix diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix new file mode 100644 index 00000000000..65d225dc377 --- /dev/null +++ b/pkgs/development/python-modules/curio/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, sphinx +}: + +buildPythonPackage rec { + pname = "curio"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "51d1a7b49b4f8dd1486ac785c72d522962e93ccfdcfc1f818f5c7553a307b5ef"; + }; + + disabled = !isPy3k; + + checkInputs = [ pytest sphinx ]; + + # test_aside_basic times out, + # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest + checkPhase = '' + pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel + ''; + + meta = with lib; { + homepage = "https://github.com/dabeaz/curio"; + description = "Library for performing concurrent I/O with coroutines in Python 3"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index def44703e4b..ebb423c4732 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -335,6 +335,8 @@ in { cozy = callPackage ../development/python-modules/cozy { }; + curio = callPackage ../development/python-modules/curio { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dependency-injector = callPackage ../development/python-modules/dependency-injector { }; From e6a25e5645908b5f7271979e16c27c940dc54f14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 May 2019 16:42:29 -0700 Subject: [PATCH 544/637] python37Packages.sniffio: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-sniffio/versions --- .../python-modules/sniffio/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 9893bc5828a..f5674c09e02 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,26 +1,27 @@ { buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars -, pythonOlder +, pythonOlder, pytest, curio }: buildPythonPackage rec { pname = "sniffio"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21"; }; - # breaks with the following error: - # > TypeError: 'encoding' is an invalid keyword argument for this function disabled = !isPy3k; buildInputs = [ glibcLocales ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; - # no tests distributed with PyPI - doCheck = false; + checkInputs = [ pytest curio ]; + + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://github.com/python-trio/sniffio; From 721d2bc1af9c68e78bbee848bafeba83373e87c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 May 2019 06:06:27 +0000 Subject: [PATCH 545/637] qarte: 3.10.0+188 -> 4.6.0 --- pkgs/applications/video/qarte/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index aba3b81fde8..f0c3776a433 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { - name = "qarte-3.10.0+188"; + name = "qarte-4.6.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; - rev = "188"; - sha256 = "06xpkjgm5ci5gfkza9f44m8l4jj32gfmr65cqs4x0j2ihrc6b4r9"; + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; + rev = "22"; + sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; buildInputs = [ makeWrapper pythonEnv ]; From 9c4d318f06c5728980f1c7f781cf4703ef8c476d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 23 May 2019 01:12:23 +0100 Subject: [PATCH 546/637] libheif: add patch for CVE-2019-11471 (PR #61919) --- .../libraries/libheif/1.4.0-CVE-2019-11471.patch | 15 +++++++++++++++ pkgs/development/libraries/libheif/default.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch new file mode 100644 index 00000000000..2ea1b124ce7 --- /dev/null +++ b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch @@ -0,0 +1,15 @@ +Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 +--- a/libheif/heif_context.cc ++++ b/libheif/heif_context.cc +@@ -571,6 +571,11 @@ + image->set_is_alpha_channel_of(refs[0]); + + auto master_iter = m_all_images.find(refs[0]); ++ if (master_iter == m_all_images.end()) { ++ return Error(heif_error_Invalid_input, ++ heif_suberror_Nonexisting_item_referenced, ++ "Non-existing alpha image referenced"); ++ } + master_iter->second->set_alpha_channel(image); + } + diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 581a579cbe2..3182345bfd4 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; }; + patches = [ ./1.4.0-CVE-2019-11471.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; From 0612588aa59612148920217daf2415db70c4cc06 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 23 May 2019 10:34:58 +0200 Subject: [PATCH 547/637] krdc: add kwindowsystem dependency --- pkgs/applications/kde/krdc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 87204c1fe9f..89ac92bb474 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, makeWrapper, kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, - libvncserver, freerdp + kwindowsystem, libvncserver, freerdp }: mkDerivation { @@ -10,7 +10,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons - freerdp libvncserver + kwindowsystem freerdp libvncserver ]; postFixup = '' wrapProgram $out/bin/krdc \ From 5a7c98df12acc75403b40f3581037bfc4a7e3423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Wo=C5=9B?= Date: Thu, 23 May 2019 17:36:27 +0900 Subject: [PATCH 548/637] nixos/kernel-headers: makeLinuxHeaders While it is easy to make a custom kernel by applying kernelPatches it is not so easy to get the corresponding headers; the derivation uses a hard-coded kernel version. --- .../linux/kernel-headers/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index ea4e041d43a..cc3e039d241 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -4,13 +4,10 @@ }: let - common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation { - name = "linux-headers-${version}"; + makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { + inherit src; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - inherit sha256; - }; + name = "linux-headers-${version}"; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; @@ -73,13 +70,18 @@ let }; }; in { + inherit makeLinuxHeaders; - linuxHeaders = common { - version = "4.19.16"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; - patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above - ]; - }; + linuxHeaders = let version = "4.19.16"; in + makeLinuxHeaders { + inherit version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + }; + patches = [ + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above + ]; + }; } From 2bcc8de18252e1fef41db1879d83525c9d0ddaa2 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 23 May 2019 11:06:57 +0200 Subject: [PATCH 549/637] terraform_0_11: 0.11.13 -> 0.11.14 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3c4e58098c7..8fc21b123d3 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.13"; - sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna"; + version = "0.11.14"; + sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 8669561bde00b4039cda2b662f9f726db8385069 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 23 May 2019 11:07:23 +0200 Subject: [PATCH 550/637] terraform_0_12: 0.12.0-rc1 -> 0.12.0 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8fc21b123d3..1cdfa8570a1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0-rc1"; - sha256 = "1ap1q5bixkzshnwy8xyfh768qwg3y4pcjzaiajzn2icjf4ay5nqm"; + version = "0.12.0"; + sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 8f3bfa5a199906300ff67c0bc9f69c9516624036 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 May 2019 11:16:49 +0200 Subject: [PATCH 551/637] python37Packages.google_api_python_client: 1.7.8 -> 1.7.9 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 291d038258f..d59bc5a70b8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.8"; + version = "1.7.9"; src = fetchPypi { inherit pname version; - sha256 = "0n18frf0ghmwf5lxmkyski4b5h1rsx93ibq3iw0k3s2wxl371406"; + sha256 = "1v551xaavqff085gplinnnrz2sk6sikmm7j47gi0wf34hpba1384"; }; # No tests included in archive From f39f4a716e318b4f84bf534eb958164a11f58be1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 13:26:25 -0500 Subject: [PATCH 552/637] buildah: 1.8.1 -> 1.8.2 Signed-off-by: Austin Seipp --- pkgs/development/tools/buildah/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 002d90e3f1f..9d429ab9ba3 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,14 +3,15 @@ , go-md2man }: let - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { - rev = "v${version}"; - owner = "containers"; - repo = "buildah"; - sha256 = "1w8w10pw5mpr3lc78z2dx3vck40cl7s3zsizsxhs0a9kxnfp01j9"; + rev = "v${version}"; + owner = "containers"; + repo = "buildah"; + sha256 = "1r91ndnc3ysrfdjybsnlnbkw26n25mfwc9i8ys5y3c26fq8ic3zd"; }; + goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { From a86c178a58cf335c2e5bf44efcceafcf801487f7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 21 May 2019 13:33:43 -0500 Subject: [PATCH 553/637] conmon: unstable-2019-03-19 -> 0.0.1pre52_6905a4d Signed-off-by: Austin Seipp --- .../virtualization/podman/conmon.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix index 7ddfc2ebab0..a8e15d075b3 100644 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ b/pkgs/applications/virtualization/podman/conmon.nix @@ -1,23 +1,21 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib }: with lib; +with builtins; stdenv.mkDerivation rec { name = "conmon-${version}"; - version = "unstable-2019-03-19"; - rev = "84c860029893e2e2dd71d62231f009c9dcd3c0b4"; + version = "0.0.1pre52_${substring 0 7 src.rev}"; src = fetchFromGitHub { - owner = "containers"; - repo = "conmon"; - sha256 = "1ydidl3s7s5rfwk9gx0k80nxcixlilxw61g7x0vqsdy3mkylysv5"; - inherit rev; + owner = "containers"; + repo = "conmon"; + rev = "6905a4dc47830fbd1110e937228057c0b073ebe1"; + sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glib - ]; + buildInputs = [ glib ]; installPhase = '' install -D -m 555 bin/conmon $out/bin/conmon From 99c8680f49b8f2d986c56d30725d19035e4843f8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 17 May 2019 09:00:40 -0500 Subject: [PATCH 554/637] podman: 1.2.0 -> 1.3.1 Signed-off-by: Austin Seipp --- .../virtualization/podman/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 6321be0f070..4ea831168d8 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig -, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp +, buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd , go-md2man }: buildGoPackage rec { name = "podman-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { - owner = "containers"; - repo = "libpod"; - rev = "v${version}"; - sha256 = "1nlll4q62w3i897wraj18pdi5cc91b8gmp360pzyqzzjdm9ag7v6"; + owner = "containers"; + repo = "libpod"; + rev = "v${version}"; + sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x"; }; goPackagePath = "github.com/containers/libpod"; @@ -22,9 +22,7 @@ buildGoPackage rec { hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man ]; - buildInputs = [ - btrfs-progs libseccomp gpgme lvm2 - ]; + buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' pushd $NIX_BUILD_TOP/go/src/${goPackagePath} From ef3157d8a99a9fd121a56a15b2a65d5eb277d818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Thu, 23 May 2019 12:18:41 +0200 Subject: [PATCH 555/637] gtk{2,3}-x11: build against pango with X11 support enabled --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 168cd3fa79b..eeb2c2e03f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10743,6 +10743,7 @@ in gtk2-x11 = gtk2.override { cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; gdktarget = "x11"; }; @@ -10753,6 +10754,7 @@ in # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; x11Support = true; }; From d2838d20c6d0769843111984e476b901af918d97 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 23 May 2019 12:21:12 +0200 Subject: [PATCH 556/637] helmfile: 0.40.1 -> 0.64.1 - Adopt vgo2nix - Add me to maintainers --- .../networking/cluster/helmfile/default.nix | 9 +- .../networking/cluster/helmfile/deps.nix | 165 ++++++++++++++++++ 2 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/cluster/helmfile/deps.nix diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 73ec998ed8e..6116a9b66da 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.40.1"; in +let version = "0.64.1"; in buildGoPackage { name = "helmfile-${version}"; @@ -9,9 +9,11 @@ buildGoPackage { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv"; + sha256 = "1258c545fv4mcrzaw3z5gxl264fcahigaijgkjd4igh4pl0z0wxk"; }; + goDeps = ./deps.nix; + goPackagePath = "github.com/roboll/helmfile"; nativeBuildInputs = [ makeWrapper ]; @@ -26,12 +28,11 @@ buildGoPackage { --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} ''; - meta = { description = "Deploy Kubernetes Helm charts"; homepage = https://github.com/roboll/helmfile; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pneumaticat ]; + maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/deps.nix b/pkgs/applications/networking/cluster/helmfile/deps.nix new file mode 100644 index 00000000000..77b19aef250 --- /dev/null +++ b/pkgs/applications/networking/cluster/helmfile/deps.nix @@ -0,0 +1,165 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.4.1"; + sha256 = "1sr9nxvasy2mw00al3i7yp3wdz2q21wp3l1n1nydvmyf27ibg3bj"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.15.0"; + sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "v1.0.1"; + sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.0.0"; + sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.6"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/tatsushid/go-prettytable"; + fetch = { + type = "git"; + url = "https://github.com/tatsushid/go-prettytable"; + rev = "ed2d14c29939"; + sha256 = "01l2v8vfv9ng0g9p0ys5szkqpc0f9baglkavn7yxkif05kdqi0ik"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "6011f165dc28"; + sha256 = "159q8lwf40jaxbm7cybzsws176k0wsdcaaj2rx0wdw4m6xha8034"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "v1.1.0"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "v1.8.0"; + sha256 = "0i9pfm5br4qq94ys1y5sr8h31bbq1xwcaxibx7g2n5n1bcbqviam"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "b2aa35443fbc"; + sha256 = "05qaicps075s77020q1vjihi5k7jbgr85ry0br9lj3jynwnrgyyg"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + }; + } +] From bc3413b0e6863c3ede28b6f0417cace621a50ea4 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 23 May 2019 15:13:52 +0300 Subject: [PATCH 557/637] lsd: 0.14.0 -> 0.15.0 --- pkgs/tools/misc/lsd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 78dba7e3a6f..fa20c1fad1d 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Peltoche"; - repo = "lsd"; + repo = pname; rev = version; - sha256 = "1k054c4mz0z9knfn7kvvs3305z2g2w44l0cjg4k3cax06ic1grlr"; + sha256 = "0wh68dxdzkmyrz9dsd3rdr5yrvny3y11xgm2pxb3z83ajngp1hcv"; }; - cargoSha256 = "0pg4wsk2qaljrqklnl5p3iv83314wmybyxsn1prvsjsl4b64mil9"; + cargoSha256 = "095jf63jyd485fk8pl7grvycn7pkwnxdm5lwkmfl9p46m8q1qqr2"; preFixup = '' install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd From c37e00067dce3ce4e7526f7476e92af9bc706732 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 May 2019 09:42:06 +0000 Subject: [PATCH 558/637] coqPackages.ltac2: init at 0.1 --- .../development/coq-modules/ltac2/default.nix | 49 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/coq-modules/ltac2/default.nix diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix new file mode 100644 index 00000000000..30917fcb78f --- /dev/null +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, which, coq }: + +let params = { + "8.7" = { + version = "0.1"; + rev = "v0.1-8.7"; + sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; + }; + "8.8" = { + version = "0.1"; + rev = "0.1"; + sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; + }; + "8.9" = { + version = "0.1"; + rev = "a69551a49543b22a7d4e6a2484356b56bd05068e"; + sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; + }; +}; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + inherit (param) version; + name = "coq${coq.coq-version}-ltac2-${version}"; + + src = fetchFromGitHub { + owner = "coq"; + repo = "ltac2"; + inherit (param) rev sha256; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A robust and expressive tactic language for Coq"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index a6fa43df92f..21ce3a91cfd 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -33,6 +33,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp { }) mathcompGen mathcompGenSingle mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs From c96ef6fc44c574de0ebc5b37882f8d6f4e2726a5 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Tue, 5 Mar 2019 13:56:55 +0100 Subject: [PATCH 559/637] updating packages coqPackages.bignums and coqPackages.equations --- .../coq-modules/bignums/default.nix | 38 +++++++++---------- .../coq-modules/equations/default.nix | 12 +++--- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0d5a892e2e9..14a7f2dc4e2 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, coq }: -let params = - let v_8_8_0 = { - rev = "V8.8.0"; - sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; +let params = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; + "8.8" = { + rev = "V8.8.0"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; + "8.9" = { + rev = "V8.9.0"; + sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; + }; }; - in - { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; - "8.8" = v_8_8_0; - "8.9" = v_8_8_0; - }; - param = params."${coq.coq-version}" -; in + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 86e5687321b..b31fcde1b80 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,15 @@ let }; "8.8" = { - version = "1.0"; - rev = "v1.0-8.8"; - sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.8"; + sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; }; "8.9" = { - version = "1.2beta"; - rev = "v1.2-beta-8.9"; - sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.9"; + sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; }; }; param = params."${coq.coq-version}"; From 0f2e9c00f700124e36752ebb5b808e823e9660f4 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 23 May 2019 16:06:25 +0300 Subject: [PATCH 560/637] pijul: fix darwin build --- pkgs/applications/version-management/pijul/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 4f716251153..180664d3386 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "pijul-${version}"; version = "0.12.0"; @@ -23,7 +21,7 @@ buildRustPackage rec { LIBCLANG_PATH = libclang + "/lib"; buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Security ]); + (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); doCheck = false; From 731fdbef7cc5982301b3009aa83fcff293337a35 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 May 2019 13:37:19 +0200 Subject: [PATCH 561/637] sqlitebrowser: 3.10.1 -> 3.11.2 The latest releases of `sqlitebrowser` contain several new features like a dark mode, improved CSV import/export and a lot of new bugfixes: https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.2 https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.1 https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.0 Also some minor changes were applied to the package definition: * Using the `pname`/`version` convention now. * Use internal `qscintilla` rather than our package to fix the build (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936). This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged. * Dropped patch which removed Test and Print support as QT 5.12 is now used to build the application. --- .../tools/database/sqlitebrowser/default.nix | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 929dfc61ba3..7813eba0436 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,38 +1,32 @@ { mkDerivation, lib, fetchFromGitHub, cmake, antlr -, qtbase, qttools, qscintilla, sqlite }: +, qtbase, qttools, sqlite }: mkDerivation rec { - version = "3.10.1"; - name = "sqlitebrowser-${version}"; + version = "3.11.2"; + pname = "sqlitebrowser"; src = fetchFromGitHub { - repo = "sqlitebrowser"; - owner = "sqlitebrowser"; + repo = pname; + owner = pname; rev = "v${version}"; - sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; + sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; }; - buildInputs = [ qtbase qscintilla sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake antlr qttools ]; + # Use internal `qscintilla` rather than our package to fix the build + # (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936). + # This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged. + cmakeFlags = [ "-DFORCE_INTERNAL_QSCINTILLA=ON" ]; + NIX_LDFLAGS = [ "-lQt5PrintSupport" ]; enableParallelBuilding = true; - # We have to patch out Test and PrintSupport to make this work with Qt 5.9 - # It can go when the application supports 5.9 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace Test "" \ - --replace PrintSupport "" - - substituteInPlace libs/qcustomplot-source/CMakeLists.txt \ - --replace PrintSupport "" - ''; - meta = with lib; { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; From 525ba92d222fb09ad522680d85692bf2607d1c9a Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 23 May 2019 10:55:11 +0300 Subject: [PATCH 562/637] rustup: 1.18.2 -> 1.18.3 --- pkgs/development/tools/rust/rustup/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d6c5718d3ec..0bf1c61c959 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; + sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x"; }; - cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; + cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11"; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { '') ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { homepage = https://www.rustup.rs/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; + platforms = platforms.all; }; } From de9c022ba0474b1e92fd21ca7728d97044e8e8b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 May 2019 06:19:44 -0700 Subject: [PATCH 563/637] python37Packages.rasterio: 1.0.22 -> 1.0.23 (#61915) * python37Packages.rasterio: 1.0.22 -> 1.0.23 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-rasterio/versions * python.pkgs.rasterio: fix check phase with Py27 by adding mock in checkInputs --- pkgs/development/python-modules/rasterio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index f5a563545a1..5d825f7579e 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,22 +1,22 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3 +, pytest, pytestcov, packaging, hypothesis, boto3, mock }: buildPythonPackage rec { pname = "rasterio"; - version = "1.0.22"; + version = "1.0.23"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; + sha256 = "1xypc86prwkv6ypy87g6r1p5y6d6c51vfxd3z6hjd1hv2ks7zjs1"; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; + checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ]; From a9d67d54b03e76e19236f9ed45da51a219c35feb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Sep 2018 21:28:45 +0200 Subject: [PATCH 564/637] hunspellDicts.fr-any: link fr-moderne to fr_FR Some packages like `ibus-engines.typing-booster` require the dictionary `fr_FR.dic` to provide proper support for the french language. Until now the hunspell package set of nixpkgs didn't provide this dictionary. It has been recommended to use `fr-moderne` as base and link `fr_FR.dic` from it as done by other distros such as ArchLinux. See https://github.com/NixOS/nixpkgs/issues/46940#issuecomment-423684570 Fixes #46940 --- nixos/doc/manual/release-notes/rl-1909.xml | 6 ++++++ pkgs/development/libraries/hunspell/dictionaries.nix | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index b78c3e08b79..60b4a3bc17b 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -156,6 +156,12 @@ + + + The hunspellDicts.fr-any dictionary now ships with fr_FR.{aff,dic} + which is linked to fr-toutesvariantes.{aff,dic}. + +
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 08ef667b24e..b8de133f502 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -20,6 +20,7 @@ let # docs install -dm755 "$out/share/doc" install -m644 ${readmeFile} $out/share/doc/${name}.txt + runHook postInstall ''; } // args); @@ -107,7 +108,7 @@ let }; mkDictFromDicollecte = - { shortName, shortDescription, longDescription, dictFileName }: + { shortName, shortDescription, longDescription, dictFileName, isDefault ? false }: mkDict rec { inherit dictFileName; version = "5.3"; @@ -131,6 +132,12 @@ let unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} ''; + postInstall = stdenv.lib.optionalString isDefault '' + for ext in aff dic; do + ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext + ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext + done + ''; }; mkDictFromWordlist = @@ -483,6 +490,7 @@ in { réformées, suivant la lente évolution de l’orthographe actuelle. Ce dictionnaire contient les graphies les moins polémiques de la réforme. ''; + isDefault = true; }; fr-reforme1990 = mkDictFromDicollecte { From 77d8f5c040db8ebcdd98c0a8af0f534b9bf0c7a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 21 Sep 2018 21:37:09 +0200 Subject: [PATCH 565/637] ibus-engines.typing-booster: support french by default This has been postponed[1] because of an unclear state of the french dictionary provided by hunspell[2]. [1] https://github.com/NixOS/nixpkgs/pull/46779#issuecomment-422764601 [2] https://github.com/NixOS/nixpkgs/issues/46940#issuecomment-423288963 --- doc/package-notes.xml | 2 +- .../inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index d3cffab3307..29b6b2420b5 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -494,7 +494,7 @@ stdenv.mkDerivation { The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries - de-de, en-us, + de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this: diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix index e6505f3cc46..1115e4e232f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix @@ -1,5 +1,5 @@ { typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper -, langs ? [ "de-de" "en-us" "es-es" "it-it" "sv-se" "sv-fi" ] +, langs ? [ "de-de" "en-us" "es-es" "fr-moderne" "it-it" "sv-se" "sv-fi" ] }: let From 2327dc0b23c8631b80a88e33c6da6857919d82bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 May 2019 08:58:07 -0700 Subject: [PATCH 566/637] python37Packages.persistent: 4.4.3 -> 4.5.0 (#61911) * python37Packages.persistent: 4.4.3 -> 4.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-persistent/versions * python.pkgs.persistent: add cffi to runtime deps + update meta (homepage and license) --- .../python-modules/persistent/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index bc4c4b20aa4..88008cd9530 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,23 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, zope_interface +, zope_interface, cffi , sphinx, manuel }: buildPythonPackage rec { pname = "persistent"; - version = "4.4.3"; + version = "4.5.0"; nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "05hi8yfvxl5ns7y7xhbgbqp78ydaxabjp5b64r4nmrfdfsqylrb7"; + sha256 = "0slbvq1m3rilgyhj6i522rsyv592xv9pmvm61mrmgkgf40kfnz69"; }; meta = { description = "Automatic persistence for Python objects"; - homepage = http://www.zope.org/Products/ZODB; + homepage = "http://www.zodb.org/"; + license = lib.licenses.zpl21; }; } From 91ef57bbefbb42280be3ae6c756f4bc37fe6da1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 May 2019 09:36:22 -0700 Subject: [PATCH 567/637] python37Packages.pex: 1.6.6 -> 1.6.7 (#61910) * python37Packages.pex: 1.6.6 -> 1.6.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pex/versions * python.pkgs.pex: unset meta.broken --- pkgs/development/python-modules/pex/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 9f87d8a16cb..4d064af18fa 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,20 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "pex"; - version = "1.6.6"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "ca887bedc9c6e0eab72fcb4c20eda8fff975d06b75993a85ee1dfc763ba38e86"; + sha256 = "1hg30y8b4b96r4skhz2qmsp7li1izcg8854q3fi48rks0kcfx5fw"; }; - prePatch = '' - substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"' - ''; + nativeBuildInputs = [ setuptools ]; # A few more dependencies I don't want to handle right now... doCheck = false; @@ -24,7 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - broken = true; }; } From 6d81ca80ad9e37835b411a16a0a091c5bf75578c Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 22 May 2019 21:23:35 -0700 Subject: [PATCH 568/637] cocoapods: define updateScript --- pkgs/development/mobile/cocoapods/default.nix | 3 +++ pkgs/development/mobile/cocoapods/update | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 9a816261b3e..0b9bb7c5b5f 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -9,6 +9,9 @@ bundlerApp rec { gemset = if beta then ./gemset-beta.nix else ./gemset.nix; exes = [ "pod" ]; + # toString prevents the update script from being copied into the nix store + passthru.updateScript = toString ./update; + meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; homepage = https://github.com/CocoaPods/CocoaPods; diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 53c113046c6..309142e0e1d 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -3,6 +3,8 @@ set -e +cd "$(dirname "${BASH_SOURCE[0]}")" + rm -f Gemfile.lock Gemfile-beta.lock bundler lock BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock From 0c42941997697a74a1bff948198cb6ed219fb405 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Thu, 23 May 2019 13:12:43 -0500 Subject: [PATCH 569/637] zfsUnstable: 0.8.0-rc5 -> 0.8.0 Technically, this is a stable release, but it seems prudent to test as zfsUnstable before upgrading zfsStable. --- pkgs/os-specific/linux/zfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c6140bd12be..c2d4d8645a4 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -182,9 +182,10 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc5"; + # This is now "stable". Move to zfsStable after it's tested more. + version = "0.8.0"; - sha256 = "1944w36rk33mn44zfvc1qbn2sv9h90r25zxnanwvyhss0vgqw73v"; + sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; isUnstable = true; extraPatches = [ From 506f86186c56b259f20c465ec785e670a52447bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 May 2019 11:21:18 -0700 Subject: [PATCH 570/637] python37Packages.livereload: 2.6.0 -> 2.6.1 (#61905) * python37Packages.livereload: 2.6.0 -> 2.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-livereload/versions * python.pkgs.livereload: fix v2.6.1 build But the newly added test 'test_watch_multiple_dirs' is failing consistently --- .../python-modules/livereload/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index a3c084cc8c6..e329f36a716 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -5,34 +5,26 @@ , django , tornado , six -, pytest }: buildPythonPackage rec { pname = "livereload"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "lepture"; repo = "python-livereload"; rev = "v${version}"; - sha256 = "0p3yvvr1iv3fv3pwc2qfzl3mi3b5zv6dh7kmfm1k7krxvganj87n"; + sha256 = "15v2a0af897ijnsfjh2r8f7l5zi5i2jdm6z0xzlyyvp9pxd6mpfm"; }; - buildInputs = [ nose django ]; + buildInputs = [ django ]; propagatedBuildInputs = [ tornado six ]; - # Remove this patch when PR merged - # https://github.com/lepture/python-livereload/pull/173 - postPatch = '' - substituteInPlace tests/test_watcher.py \ - --replace 'watcher.watch(filepath, add_count)' \ - 'add_count.repr_str = "add_count test task"; watcher.watch(filepath, add_count)' - ''; - - checkInputs = [ pytest ]; - checkPhase = "pytest tests"; + checkInputs = [ nose ]; + # TODO: retry running all tests after v2.6.1 + checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; meta = { description = "Runs a local server that reloads as you develop"; From a9643e18af8ea4a21709b237deaf77c3f1340ab1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 23 May 2019 20:20:23 +0200 Subject: [PATCH 571/637] tor-browser-bundle-bin: 8.0.9 -> 8.5 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 177b3c6e925..88fbcb76774 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.9"; + version = "8.5"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc"; + sha256 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv"; + sha256 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; }; }; in From 0ca30f22f1a7c42c274a5fc60c433cbf03906666 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 23 May 2019 14:32:00 -0500 Subject: [PATCH 572/637] liburing: 1.0.0pre116 -> 1.0.0pre118 Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index a1a171e9ecb..b7dd2c8ae17 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre116_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre118_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "ffe3e090cd41d0977ca74fafcb452838f76ceea1"; - sha256 = "1nmg89jgz1kbv7lv1drkkb4x0pank51sijagflxmnmvqgrk53gxd"; + rev = "2e719820d47cdb48308265f95547d2c9458bbfe7"; + sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5"; }; enableParallelBuilding = true; From 44b551c0c0555fb6814fdac202d417df98451fe2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 May 2019 16:50:55 -0400 Subject: [PATCH 573/637] addOpenGLRunpath: only apply to ELF files Fixes libglvnd build --- pkgs/build-support/add-opengl-runpath/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh index 7645033ca20..e556e7ead2a 100644 --- a/pkgs/build-support/add-opengl-runpath/setup-hook.sh +++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh @@ -21,6 +21,7 @@ addOpenGLRunpath() { done for file in "$@"; do + if ! isELF "$file"; then continue; fi local origRpath="$(patchelf --print-rpath "$file")" patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file" done From 3055ae4f793f1f4ae6ac855c2daca49ed323b73a Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 23 May 2019 14:11:59 -0700 Subject: [PATCH 574/637] vscode-extensions.formulahendry.auto-close-tag: init at 0.5.6 (#60405) --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 1c4c59f4ecb..fb7e163dbe7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ rec { }; }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "auto-close-tag"; + publisher = "formulahendry"; + version = "0.5.6"; + sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; From 6180fcb54f7395fd17d52e27a2083701cddb48d6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 23 May 2019 23:42:15 +0200 Subject: [PATCH 575/637] rtl_433: enable soapysdr backend support soapy support was added in 18.12 --- pkgs/applications/radio/rtl_433/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 5d012437e6e..88dc64471ec 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libusb1, rtl-sdr, soapysdr-with-plugins +}: + stdenv.mkDerivation rec { version = "18.12"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libusb1 rtl-sdr ]; + buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; meta = with stdenv.lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz"; From 089eeed671d0f7b1141694ed37710f81c92f804f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 23 May 2019 17:48:40 -0400 Subject: [PATCH 576/637] vivaldi: 2.5.1525.43-1 -> 2.5.1525.46-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 39351512a6a..1c1c9fd5bff 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.43-1"; + version = "2.5.1525.46-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0mmyl32fz6p43gz8vzkhh0z1wcb3l5cckxl8vkz53lb9k2mckjqi"; + sha256 = "0hxmpd4j1cq4643x17syzqxfxki6jngvf28jd71pp58hngffh3g4"; }; unpackPhase = '' From 082ed38cb11b1a53cc5583ea44fdd8e90500e43b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 24 May 2019 00:17:40 +0200 Subject: [PATCH 577/637] firefox-wrapper: stop creating new profiles when the binary path changes With a recent change to firefox (that landed in 67) a new profile is created whenever the install location changes. Since our install location (the binary path) always changes when we do a new build it is rather annoying. Setting the environment variable `SNAP_NAME` to `firefox` is supposed to workaround the issue. related to #58923 Woarkound taken from https://github.com/rail/nixos-configs/commit/1ff8b6c3d8b98d0695045eedb97ce135025c36a1 cc @rail --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 90df5c40395..61484478e4d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -127,6 +127,7 @@ let --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ + --set SNAP_NAME "firefox" \ ${lib.optionalString gdkWayland '' --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) From d8d85a2cd274aa464ab2c3236ef94deea96e931f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20NICOLE?= Date: Fri, 24 May 2019 00:41:51 +0200 Subject: [PATCH 578/637] carla: init at 2.0.0 (#60346) --- pkgs/applications/audio/carla/default.nix | 71 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/audio/carla/default.nix diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix new file mode 100644 index 00000000000..af29c3dc9e0 --- /dev/null +++ b/pkgs/applications/audio/carla/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, fftw, jack2, + liblo, libpulseaudio, libsndfile, makeWrapper, pkgconfig, python3Packages, + which, withFrontend ? true, + withQt ? true, qtbase ? null, + withGtk2 ? true, gtk2 ? null, + withGtk3 ? true, gtk3 ? null }: + +with stdenv.lib; + +assert withFrontend -> python3Packages ? pyqt5; +assert withQt -> qtbase != null; +assert withGtk2 -> gtk2 != null; +assert withGtk3 -> gtk3 != null; + +stdenv.mkDerivation rec { + pname = "carla"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "falkTX"; + repo = pname; + rev = "v${version}"; + sha256 = "0fqgncqlr86n38yy7pa118mswfacmfczj7w9xx6c6k0jav3wk29k"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython pkgconfig which ]; + + pythonPath = with python3Packages; [ + rdflib pyliblo + ] ++ optional withFrontend pyqt5; + + buildInputs = [ + file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile + ] ++ pythonPath + ++ optional withQt qtbase + ++ optional withGtk2 gtk2 + ++ optional withGtk3 gtk3; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + # Also sets program_PYTHONPATH and program_PATH variables + wrapPythonPrograms + + find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do + patchPythonScript "$f" + done + patchPythonScript "$out/share/carla/carla_settings.py" + + for program in $out/bin/*; do + wrapProgram "$program" \ + --prefix PATH : "$program_PATH:${which}/bin" \ + --set PYTHONNOUSERSITE true \ + --prefix QT_PLUGIN_PATH : "${qtbase.bin}/${qtbase.qtPluginPrefix}" + done + ''; + + meta = with stdenv.lib; { + homepage = http://kxstudio.sf.net/carla; + description = "An audio plugin host"; + longDescription = '' + It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3 + and AU plugin formats, plus GIG, SF2 and SFZ file support. + It uses JACK as the default and preferred audio driver but also + supports native drivers like ALSA, DirectSound or CoreAudio. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.minijackson ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e23e812db2e..6b76d509ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17009,6 +17009,8 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; + carla = qt5.callPackage ../applications/audio/carla { }; + catfish = callPackage ../applications/search/catfish { }; catimg = callPackage ../tools/misc/catimg { }; From 105d274058888fdb223bb4cdff6c43c32b86eee1 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 18 May 2019 13:09:55 +0200 Subject: [PATCH 579/637] cointop: 2018-05-03 -> 1.2.0 Signed-off-by: Matthias Beyer --- pkgs/applications/misc/cointop/default.nix | 38 ++++++++++------------ pkgs/applications/misc/cointop/deps.nix | 3 -- 2 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/misc/cointop/deps.nix diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index e1fcbbfe13c..b973c73c0dd 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,31 +1,29 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "cointop-unstable-${version}"; - version = "2018-05-03"; - rev = "08acd96082682347d458cd4f861e2debd3255745"; +buildGoModule rec { + pname = "cointop"; + version = "1.2.0"; - goPackagePath = "github.com/miguelmota/cointop"; - - src = fetchgit { - inherit rev; - url = "https://github.com/miguelmota/cointop"; - sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi"; + src = fetchFromGitHub { + owner = "miguelmota"; + repo = pname; + rev = version; + sha256 = "1vhsbk55rrsmnh9b3cxjiv1pzdiip54cyj31j4aj33vlr4hkampn"; }; - goDeps = ./deps.nix; + modSha256 = "0vvypp97b3bjwxb96hajpjzr52sb5lc4r3zdkrdgg3vjwwacjwsn"; - meta = { + meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; longDescription = '' - cointop is a fast and lightweight interactive terminal based UI application - for tracking and monitoring cryptocurrency coin stats in real-time. + cointop is a fast and lightweight interactive terminal based UI + application for tracking and monitoring cryptocurrency coin stats in + real-time. - The interface is inspired by htop and shortcut keys are inspired by vim. + The interface is inspired by htop and shortcut keys are inspired by vim. ''; - homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.unix; # cannot test others - maintainers = [ ]; - license = stdenv.lib.licenses.asl20; + homepage = "https://cointop.sh"; + maintainers = [ maintainers.marsam ]; + license = licenses.asl20; }; } diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix deleted file mode 100644 index 3ba1d12a804..00000000000 --- a/pkgs/applications/misc/cointop/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ -] From 1bc73d1a9a46e264bafd386ead366093b066cba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Gersdorf?= Date: Fri, 24 May 2019 03:04:57 +0200 Subject: [PATCH 580/637] kind: 0.2.1 -> v0.3.0 (#61964) Co-Authored-By: lewo --- pkgs/development/tools/kind/default.nix | 7 +- pkgs/development/tools/kind/deps.nix | 507 ++++++++++++++++++++++++ 2 files changed, 511 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/kind/deps.nix diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index f02105aede9..3a2040e712a 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,18 +4,19 @@ with stdenv.lib; buildGoPackage rec { name = "kind-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { - rev = "${version}"; + rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "14ddhml9rh7x4j315fb332206xbn1rzx3i0ngj3220vb6d5dv8if"; + sha256 = "1azl5knw1n7g42xp92r9k7y4rzwp9xx0spcldszrpry2v4lmc5sb"; }; # move dev tool package that confuses the go compiler patchPhase = "rm -r hack"; + goDeps = ./deps.nix; goPackagePath = "sigs.k8s.io/kind"; excludedPackages = "images/base/entrypoint"; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix new file mode 100644 index 00000000000..1681fe9e2eb --- /dev/null +++ b/pkgs/development/tools/kind/deps.nix @@ -0,0 +1,507 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad4578"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "v0.17.0"; + sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "v0.17.0"; + sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "v0.19.0"; + sha256 = "1527dbn74c0gw9gib5lmdr5vjgp5h57r1j92c3wh37irz90vnb6a"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "v0.17.0"; + sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.1"; + sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "4bd1920723d7"; + sha256 = "0z21hxin616xvkv075vdz416zm36qs0mbi76526l9yz8khbg7jmr"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "68f4ded48ba9"; + sha256 = "0l6qkbpmy2qd0q8h7dghhv27qjngll739kzm389qdbjxj3inq2dl"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.1.0"; + sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/munnerz/goautoneg"; + fetch = { + type = "git"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "11459a886d9c"; + sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "dcabb60a477c"; + sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.1"; + sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3ec191127204"; + sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "1f849cf54d09"; + sha256 = "19a3srk9dcqad3sqd8mfg36pbaxcfkbzhp3jinhqxnzd90bds6am"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "6e4e0e4f393b"; + sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "6a84e37a896d"; + sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "v11.0.0"; + sha256 = "006007k55b5q95fa0vih4bprwvx5sk4a5chvsn46baqa5znphyn1"; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v0.3.0"; + sha256 = "05lp8ddqnbypgszv3ra7x105qpr8rr1g4rk2148wcmgfjrfhw437"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "a01b7d5d6c22"; + sha256 = "182s6gqhzal5602dfyk9h8adsdqgh5fmgh0bifksp1x856v4aizx"; + }; + } + { + goPackagePath = "sigs.k8s.io/kustomize"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/kustomize"; + rev = "v2.0.3"; + sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "ea680f03cc65"; + sha256 = "1drc908qcvwifvbz12vxahplycnaj177pz5ay6ygbn3q8824qv7b"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "v1.0.0"; + sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128cc"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "9f3314589c9a"; + sha256 = "13rr34jmgisgy8mc7yqz3474w4qbs01gz4b7zrgkvikdv4a6py3h"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "8fab8cb257d5"; + sha256 = "0ckkl9zj8c0p5csfgsnvgb3vm91l2zgxgxhbjcf3ds3wryljalyj"; + }; + } +] From 54a50114c7433b52fc20b5042c200674e7ecdfbc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 23 May 2019 22:27:17 -0400 Subject: [PATCH 581/637] wingpanel-indicator-bluetooth: 2.1.2 -> 2.1.3 https://github.com/elementary/wingpanel-indicator-bluetooth/releases/tag/2.1.3 --- .../desktop/wingpanel-indicators/bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 8db8eb5d5e0..571dab02c31 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44"; + sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9"; }; passthru = { From c89b2de425db938a06a418a11f792ca1ab7ea9ff Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 24 May 2019 02:29:45 +0000 Subject: [PATCH 582/637] androidenv: fix the $out/bin symlink for ndk-bundle --- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 5d70a9f0a1c..b81fab1ed76 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -44,7 +44,7 @@ deployAndroidPackage { mkdir -p $out/bin for i in ndk-build do - ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done ''; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script From cadd88967f3c6499858aa9eba87b03d1284a38fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 22 May 2019 17:00:01 +0200 Subject: [PATCH 583/637] gildas: 20190401_a -> 20190501_a --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 3fe48ab26a2..592225b1696 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "apr19a"; - version = "20190401_a"; + srcVersion = "may19a"; + version = "20190501_a"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c"; + sha256 = "f6132116bce0ea716a6eb13a63f538d27567a8bfb159f7d567abb9dac5429e30"; }; enableParallelBuilding = true; From 6ac02de3c36edc74597fe1c9fb9ed37e98a3071a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 00:23:13 -0700 Subject: [PATCH 584/637] rdma-core: 23 -> 23.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/rdma-core/versions --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 192e1d61e43..02d628fdfbc 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "23"; + version = "23.1"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1n0v075ndczwrc87b70vxhx42nv1p953cqycmgnz334790zg002g"; + sha256 = "0blwqfj73bnk7byj2mavvnyh87mwhpzwgzg60s9vv9jnfcnbhlhk"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; From eb7bd3206c86bc3e30ad809c8e2fa9f809a770d6 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 24 May 2019 11:01:31 +0300 Subject: [PATCH 585/637] cjdns: 20.2 -> 20.3 --- pkgs/tools/networking/cjdns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 60fd42962fb..82fbfac842a 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.2"; in +let version = "20.3"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,13 +8,14 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn"; + sha256 = "02cxrjmpi7pyf0qfvhkqg3y5rq7vlnib55n2hhxnyhzznxhgrsgy"; }; buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux utillinux; + CFLAGS = "-O2"; buildPhase = stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; From c229c046b83d460c40da75a0056c3566242cc30e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 01:15:34 -0700 Subject: [PATCH 586/637] rshell: 0.0.14 -> 0.0.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rshell/versions --- pkgs/development/tools/rshell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b6ba02633ac..421aeb9ad91 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.14"; + version = "0.0.25"; src = fetchPypi { inherit pname version; - sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g"; + sha256 = "f6857cdc3c53c8ce9ba7a560c2759c10b988f3d9fafde912d3fa4deecb4d4664"; }; propagatedBuildInputs = [ pyserial pyudev ]; From fb225dfecda12643a616c288c45364e875de99eb Mon Sep 17 00:00:00 2001 From: marius851000 Date: Fri, 24 May 2019 10:31:40 +0200 Subject: [PATCH 587/637] gallery-dl : update 1.8.3 -> 1.8.4 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 4b2bcde04a4..742b535b33d 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.8.3"; + version = "1.8.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "671ee6ff7baa3d63393d9856686313b4e0146f875dd937326942dd2fff605a72"; + sha256 = "01df9aph7qr2yxy0ckpkr5f6yscs29raqs2f4xxg7xn5zaimjhan"; }; doCheck = false; From 6b0d806fcc243747458201ec57533a7e2aa59cbf Mon Sep 17 00:00:00 2001 From: marius851000 Date: Fri, 24 May 2019 12:24:25 +0200 Subject: [PATCH 588/637] hackertyper: 20190226 -> 2.1 --- pkgs/tools/misc/hackertyper/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix index dc3cd68fac6..8657e34e160 100644 --- a/pkgs/tools/misc/hackertyper/default.nix +++ b/pkgs/tools/misc/hackertyper/default.nix @@ -2,26 +2,18 @@ stdenv.mkDerivation rec { pname = "hackertyper"; - version = "20190226"; + version = "2.1"; src = fetchFromGitHub { owner = "Hurricane996"; repo = "Hackertyper"; - rev = "dc017270777f12086271bb5a1162d0f3613903c4"; - sha256 = "0szkkkxspmfq1z2n4nldj2c9jn6jgiqik085rx1wkks0zgcdcgy1"; + rev = "8d08e3200c65817bd8c5bd0baa5032919315853b"; + sha256 = "0shri0srihw9fk027k61qkxr9ikwkn28aaamrhps6lg0vpbqpx2w"; }; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ ncurses ]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - ''; - - - doInstallCheck = true; installCheckPhase = '' $out/bin/hackertyper -v From 7c62ef8685730fcdfbd544bbc5720bf18f13a5fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 24 May 2019 12:38:19 +0200 Subject: [PATCH 589/637] libpsl: don't build docs to unbreak staging-next cc @worldofpeace --- pkgs/development/libraries/libpsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 65da1f8e9d1..b32732fa88c 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-builtin" "--disable-static" - "--enable-gtk-doc" +# "--enable-gtk-doc" "--enable-man" ]; From f4a20199d221320591a5a671e793a52b200864ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 03:50:06 -0700 Subject: [PATCH 590/637] stacks: 2.3e -> 2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/stacks/versions --- pkgs/applications/science/biology/stacks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 01b1c0ba81b..d188ca02b18 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.3e"; + version = "2.4"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "046gmq8nzqy5v70ydqrhib2aiyrlja3cljvd37w4qbd4ryj3jr0w"; + sha256 = "1ha1avkh6rqqvsy4k42336a2gj14y1jq19a2x8cjmiidi9l3s29h"; }; buildInputs = [ zlib ]; From 03c07393ba12a7e72cea197385ffef8d483c35c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 03:58:24 -0700 Subject: [PATCH 591/637] stunnel: 5.53 -> 5.54 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/stunnel/versions --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index b85e146971b..04b79b9d394 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.53"; + version = "5.54"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"; + sha256 = "00krr0h3vsyi93mqhrbgfgn8v47l4l3hzdg1ccfnpd3lqak8i1ay"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 1abbb659310dfbe4509bc1d2d1a017b011a60c7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 19:29:28 -0700 Subject: [PATCH 592/637] libsass: 3.5.5 -> 3.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsass/versions --- .../development/libraries/libsass/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index ce43ed73432..957201b83ab 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libsass-${version}"; - version = "3.5.5"; + pname = "libsass"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/e2e/unicode-pwd + ''; }; - patches = [ - (fetchpatch { - name = "CVE-2018-19827.patch"; - url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; - sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; - }) - ]; - preConfigure = '' export LIBSASS_VERSION=${version} ''; From 69a7856825c72ad856b14798f808970dd7dce033 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 May 2019 06:15:14 -0500 Subject: [PATCH 593/637] sassc: 3.5.0 -> 3.6.0 --- pkgs/development/tools/sassc/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 5598dc1606d..db4d9dcd1ac 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, libsass }: +{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { - name = "sassc-${version}"; - version = "3.5.0"; + pname = "sassc"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2"; }; patchPhase = '' From 9de07d894f9483899c64cc60be516f8fd1476053 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 06:02:27 -0700 Subject: [PATCH 594/637] tautulli: 2.1.28 -> 2.1.29 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tautulli/versions --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 63882766b3b..68c922783c3 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.1.28"; + version = "2.1.29"; pname = "Tautulli"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0yq2dqljfc7ci1n8c8szpylxcimhbfjr46m24hnsqp623w2gvm46"; + sha256 = "1n5kpfcm59qg27xhlan3w2x71dp1h3gycdlp0iyxaqzaaw5splry"; }; buildPhase = ":"; From 6297561e28cb8b8244821e67509d05b7bcea2a85 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 24 May 2019 15:46:00 +0200 Subject: [PATCH 595/637] shadowfox: Don't install compiler binary --- pkgs/tools/networking/shadowfox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 3b76f8b7c18..b22a3f464d3 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -17,6 +17,12 @@ buildGoModule rec { buildFlags = "--tags release"; + postInstall = '' + # Contains compiler package only used by projects CI, and buildGoModule + # installs all binaries by default. So we remove this again. + rm $out/bin/compiler + ''; + meta = with stdenv.lib; { description = '' This project aims at creating a universal dark theme for Firefox while From 1e62f167fbded9f44b893dbd765d49e27ec7f1d2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 24 May 2019 16:24:04 +0200 Subject: [PATCH 596/637] vimPlugins: update (#62005) --- pkgs/misc/vim-plugins/generated.nix | 96 ++++++++++++++--------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 51abecf6aa1..b2b861c100f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-20"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "89db85121c001fc60787647f012978a2328816a5"; - sha256 = "0dyb2rmp5mc6rc1a0454jpb322ynr29lj98dddbx9h8jqbkwcz16"; + rev = "bb08b81bf719d4c55669c583c65fbe4bbd795501"; + sha256 = "0c5i1c3dn1apj5h1b7iwnphqjpz9fjh7pi87a4rszhfhqdgwyl0a"; }; }; @@ -237,12 +237,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-05-20"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "727982667e568264b512b5dda080f0ce414ed1d3"; - sha256 = "1rh7q0d81mxg7si3ljid5zlskbkifn0fkg4dapj60s33zda8yb0g"; + rev = "86f938db42dd071257a16c6f500c7d7a8dd8f34d"; + sha256 = "0p2w7brlvhsxcvq199a4x59w6zmm3m4mhnr52rm660dydrbvd8gl"; }; }; @@ -471,12 +471,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-03-02"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "f89669d2b089d75f1eccbf8d14277b74857a850d"; - sha256 = "0v0jisqzxb3f77xsqcy5i0s4ik0g66bjfh110111lpynki7lcdyc"; + rev = "55471c298412ea3017b0189fd96c032a780963e1"; + sha256 = "1s85a6inp4j1k2llg8vgdiwb4n1rk9hdahrczl32fwxi95c0fv41"; fetchSubmodules = true; }; }; @@ -516,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-05-20"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0ad6844e7d161e6c989c78197f66eed0924897d8"; - sha256 = "1nfmkg3bccw6f9xlwqz42czmxa8zfk33vkzabj60sbm5s3r7fxrh"; + rev = "94b33d6a5f9e6bae8ac2abc0bddc89b5ddf02b02"; + sha256 = "0143gz63vas2a4rjxlg0g0pssqvdkipi24las9ap2bhvwhqjh3y7"; }; }; @@ -583,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-05-19"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "758421535f58ab3a4a3dbbbb5e84f1aa7350f8ab"; - sha256 = "01hcmc7jk6dh7yzra5bm7x04rd3909d5p5bd7lwsn3glb21n5007"; + rev = "0414b53a23c1da180370bf1228b8553fc5022e3f"; + sha256 = "0hhkzdhrszifbylv9kc23ygg82pvp0m0lyk9lagv305wy7p3dff2"; fetchSubmodules = true; }; }; @@ -927,12 +927,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2019-04-19"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "386371f4b35d68c7ec55c09c78cf687ddfafd69b"; - sha256 = "0b3hrqlw7nvcv1w9ir0fsda6crx0a68012a6pii8awdgaw086hzi"; + rev = "6468c3d4f9ee9c32c9e84c5a8743bff8cb429f45"; + sha256 = "18qn0xdxf2ax9qnzib5gbpws1h0gmwfmwalhpismkbwnm8cswipk"; }; }; @@ -1180,12 +1180,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-19"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "45b5d4a8b59f4921ab3fb41db5f0350e64591d69"; - sha256 = "093j0y4zxmh411271i0w5spiwqipw3d0j0f6whkqjn75p65azqj9"; + rev = "8a75afa95ae3a49a690afd72fe86c984c06a672c"; + sha256 = "1g3dyvvkhc6h4l0y8s8pswlrzsbcwdjvyfx4fiwzbqgfccjbnaj9"; }; }; @@ -1796,12 +1796,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-04-24"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "53a5adc5e23b2dcc6a11397fd47b75ff8e0b664a"; - sha256 = "142gac4appj7iswwxaflimjxxb0sdpkqhcinrv7nnxnwdmpnhzak"; + rev = "a79447f261e4b8b4327557aa03726f3849334b84"; + sha256 = "0x6a9rmv220kncjgak6aw3gbf3sidnj6nijphnsm5360lvi3ck4w"; }; }; @@ -1961,12 +1961,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-05-17"; + version = "2019-05-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "9ab9d12521191e548be2caa6b606d0866ffdf5c5"; - sha256 = "1yjw36lpgr17hwwdhxx20cjrgcpxqymizw45sppjrc1qkm0w4wnm"; + rev = "bfbc3cadbd142e74d3b92e63f1de8711261015a4"; + sha256 = "1dsxgjia5lb5i3zyagf1gqqk6vil5lj918ihiddik4a96s9vz1s8"; }; }; @@ -2192,12 +2192,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-14"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "7b20361baf5f8947ff55ac5d26dd4a75aacfc7d7"; - sha256 = "07bcd3f41jc52kn3spjrn8s3p58fsy6vn6kjrsl1j9qvmjc7x1q8"; + rev = "193e3504408118687a4063d19d6245cc676281c8"; + sha256 = "0lr47syf1b5xc5y8vw2idm3i3za4scibk7r4cbbbiivikf1v2sgv"; }; }; @@ -2599,12 +2599,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-17"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "6f12616ee3d2160054270a9fb444006f580667d6"; - sha256 = "0ms1xpp3kw98qq4dl7mp4c353acqncav6dwfz690lacpy0bgb9d3"; + rev = "d390b89ef151caf66c8a56a4ecdbdf7c38655727"; + sha256 = "030s4ax4lbw04d2xzklyx9m33sjbkql9nj0djgz14i7h2kq1yw6v"; }; }; @@ -2654,12 +2654,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-05-04"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d99841b22928f1597d447c68de844989bf9a804"; - sha256 = "1af7hz2jqkh4lbfkvpyb1hfgxlfk2f2z9idp5f0f8zz8mmbdf6yr"; + rev = "0f9db6af704f6fcf5cd06de964deb8223e47db4c"; + sha256 = "1brg6m84zlhb4s8gmjpqa204g4ym5qg6rir9s163wfynkr0prw19"; }; }; @@ -2720,12 +2720,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-20"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "3dba44e24526f05ed487d3267a7996bd6b511893"; - sha256 = "1g4bp7bh650kscn94s9yfh7kgy4b9q4bxnf4rzr4zd5ml1458pmx"; + rev = "79ea9ef26807eda0b55809d0521993bcecfa09e5"; + sha256 = "06aid6k8128zx0dbp52whwii9xjy8m5lwrvn4l30in29mbl0nrqk"; }; }; @@ -3293,12 +3293,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-05-16"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2b91b338c371c4d7a7ab75901246d992b3542d7e"; - sha256 = "1yn1kip09s37hs8ngld67zxa20gvvman6jd7q4vdrxlmy2miy9q4"; + rev = "11e86deecb715fe1b9ca04d9b313f9432013b2b1"; + sha256 = "171xkz7wvrb7c6c12sgf3v2clmbdand23wvi5rm6g8lf1x11kvsq"; }; }; @@ -3898,12 +3898,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-04-27"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "7fa183675d690054022e5d27dbfc29e740637641"; - sha256 = "14hl9v5l08qcsj3a9zd53v72lr7hm4vkyv8idmxg9wi0m0bqgq5i"; + rev = "88a3c999d44baa0c6a8b9711843159c25e75e950"; + sha256 = "049m0plpvay4sqx9mqkln80bm6g89ydy32hpfpnbbdd0r4ifp1kr"; }; }; @@ -4107,12 +4107,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-05-08"; + version = "2019-05-22"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "81652d1384a8491fd0dea53f466d95fef7c9f46e"; - sha256 = "029nvdwn04hq46nh7q94fazsxf17vhjk07mxhbhdxx1syfw0fslg"; + rev = "c5c412fae2f72a07dff24ba8652c6d5e13924167"; + sha256 = "08rx1xb0mn6krfj3q8vrzlvzzh2dljjddn3wbkjvamihblnjbf7v"; }; }; From 4e2d06165047f5d40ebb50c6446cd7853ffbec73 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 24 May 2019 16:44:18 +0200 Subject: [PATCH 597/637] home-manager: 2019-04-23 -> 2019-05-24 (#62007) --- pkgs/tools/package-management/home-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 43a8c464463..ca3fa8eca96 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2019-04-23"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; - sha256 = "1ksr8fw5p5ai2a02whppc0kz9b3m5363hvfjghkzkd623kfh9073"; + rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe"; + sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf"; }; nativeBuildInputs = [ makeWrapper ]; From c3a0f32d3edce3bf3e878fbc97f0fcbc6fe40e58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 08:31:09 -0700 Subject: [PATCH 598/637] uftp: 4.9.9 -> 4.9.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uftp/versions --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 297a0215aac..1530480dc4b 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.9"; + version = "4.9.11"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; + sha256 = "06kb4h10n5nvmv79fs5nwk40pc4vl4xqidksy9fxasgn6md87p1d"; }; buildInputs = [ openssl ]; From 10b83ac7ad8aaad18a53bb8e19fc74d0a8bce9a8 Mon Sep 17 00:00:00 2001 From: David Leung Date: Wed, 24 Apr 2019 22:28:20 +0800 Subject: [PATCH 599/637] pythonPackages.aws-lambda-builders: 0.2.1 -> 0.3.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 16f5e19b786..4554fe98c1b 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.2.1"; + version = "0.3.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1pbi6572q1nqs2wd7jx9d5vgf3rqdsqlaz4v8fqvl23wfb2c4vpd"; + sha256 = "1c3r3iz29s68mlmdsxbl65x5zqx25b89d40rir6729ck4gll4dyd"; }; # Package is not compatible with Python 3.5 From 2da548f856996a5c9bc56d28758d0f3ab49307c7 Mon Sep 17 00:00:00 2001 From: David Leung Date: Tue, 7 May 2019 08:06:03 +0800 Subject: [PATCH 600/637] pythonPackages.serverlessrepo: fix build by pinning pyyaml at 3.12 --- .../python-modules/serverlessrepo/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index d70abe1f95f..7c89d9d1f8d 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -1,13 +1,24 @@ { lib -, buildPythonPackage -, fetchPypi -, pytest -, boto3 -, six -, pyyaml -, mock +, python }: +let + py = python.override { + packageOverrides = self: super: { + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "3.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; + }; + }); + }; + }; + +in + +with py.pkgs; + buildPythonPackage rec { pname = "serverlessrepo"; version = "0.1.8"; From b644d5b15923dcd5fc66566af53bf8d57b89ce8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 May 2019 08:52:19 +0200 Subject: [PATCH 601/637] LTS Haskell 13.22 --- .../configuration-hackage2nix.yaml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0f942bb25b4..2a61c9f03d2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.21 + # LTS Haskell 13.22 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -342,8 +342,8 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - - bytestring-strict-builder ==0.4.5.1 - - bytestring-tree-builder ==0.2.7.2 + - bytestring-strict-builder ==0.4.5.2 + - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 @@ -563,7 +563,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.6 + - dbus ==1.2.7 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -823,7 +823,7 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - - ghc-syntax-highlighter ==0.0.3.1 + - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3 - ghc-typelits-knownnat ==0.6 @@ -916,7 +916,7 @@ default-package-overrides: - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - - haskey-btree ==0.3.0.0 + - haskey-btree ==0.3.0.1 - haskoin-core ==0.8.4 - hasql ==1.3.0.5 - hasql-optparse-applicative ==0.3.0.3 @@ -965,7 +965,7 @@ default-package-overrides: - hmatrix-morpheus ==0.1.1.2 - hmatrix-vector-sized ==0.1.1.3 - hmpfr ==0.4.4 - - hoauth2 ==1.8.5 + - hoauth2 ==1.8.6 - Hoed ==0.5.1 - hOpenPGP ==2.7.4.1 - hopfli ==0.2.2.1 @@ -979,7 +979,7 @@ default-package-overrides: - hpack-dhall ==0.5.2 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.6 + - hruby ==0.3.8 - hsass ==0.8.0 - hs-bibutils ==6.7.0.0 - hschema ==0.0.1.1 @@ -1028,7 +1028,7 @@ default-package-overrides: - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 - - HsYAML ==0.1.1.3 + - HsYAML ==0.1.2.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 - HTF ==0.13.2.5 @@ -1146,8 +1146,8 @@ default-package-overrides: - IPv6Addr ==1.1.2 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - - irc-client ==1.1.0.5 - - irc-conduit ==0.3.0.1 + - irc-client ==1.1.0.6 + - irc-conduit ==0.3.0.2 - irc-ctcp ==0.1.3.0 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 @@ -1170,7 +1170,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.5 - json-rpc-server ==0.2.6.0 - JuicyPixels ==3.3.3 - - JuicyPixels-extra ==0.4.0 + - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - kan-extensions ==5.2 @@ -1257,7 +1257,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.3 + - logging-effect ==1.3.4 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.3 @@ -1427,7 +1427,7 @@ default-package-overrides: - network-multicast ==0.2.0 - network-simple ==0.4.3 - network-simple-tls ==0.3.2 - - network-transport ==0.5.2 + - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - newtype ==0.2.1.0 @@ -1445,7 +1445,7 @@ default-package-overrides: - non-negative ==0.1.2 - nowdoc ==0.1.1.0 - nqe ==0.6.1 - - nsis ==0.3.2 + - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 @@ -1509,7 +1509,7 @@ default-package-overrides: - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.0 + - partial-semigroup ==0.5.1.1 - path ==0.6.1 - path-extra ==0.2.0 - path-io ==1.4.2 @@ -1540,7 +1540,7 @@ default-package-overrides: - persistent-postgresql ==2.9.1 - persistent-sqlite ==2.9.3 - persistent-template ==2.5.4 - - pgp-wordlist ==0.1.0.2 + - pgp-wordlist ==0.1.0.3 - pg-transact ==0.1.0.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 @@ -1640,7 +1640,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.7 + - pusher-http-haskell ==1.5.1.8 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.4 @@ -1685,7 +1685,7 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.3.1 + - rebase ==1.3.1.1 - record-dot-preprocessor ==0.1.5 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1707,13 +1707,13 @@ default-package-overrides: - regex-tdfa ==1.2.3.2 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.4.0 + - registry ==0.1.5.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.1.0 - - relational-query-HDBC ==0.7.1.1 + - relational-query ==0.12.2.1 + - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - - relational-schemas ==0.1.6.2 + - relational-schemas ==0.1.7.0 - relude ==0.4.0 - renderable ==0.2.0.1 - repa ==3.4.1.4 @@ -1723,7 +1723,7 @@ default-package-overrides: - req ==1.2.1 - req-conduit ==1.0.0 - req-url-extra ==0.1.0.0 - - rerebase ==1.3.1 + - rerebase ==1.3.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 @@ -1786,7 +1786,7 @@ default-package-overrides: - semigroups ==0.18.5 - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - - semver ==0.3.3.1 + - semver ==0.3.4 - sendfile ==0.7.10 - seqalign ==0.2.0.4 - serf ==0.1.1.0 @@ -1898,7 +1898,7 @@ default-package-overrides: - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 - sqlite-simple-errors ==0.6.1.0 - - sql-words ==0.1.6.2 + - sql-words ==0.1.6.3 - srcloc ==0.5.1.2 - stache ==2.0.1 - stack2nix ==0.2.3 @@ -1993,7 +1993,7 @@ default-package-overrides: - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10 + - tasty-quickcheck ==0.10.1 - tasty-silver ==3.1.12 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 @@ -2022,7 +2022,7 @@ default-package-overrides: - texmath ==0.11.2.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.6.5 + - text-builder ==0.6.5.1 - text-conversions ==0.3.0 - text-format ==0.3.2 - text-icu ==0.7.0.1 @@ -2089,7 +2089,7 @@ default-package-overrides: - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.4 + - transformers-compat ==0.6.5 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - tree-diff ==0.0.2.1 @@ -2229,7 +2229,7 @@ default-package-overrides: - warp-tls-uid ==0.2.0.6 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.8.3.1 + - web3 ==0.8.3.2 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 @@ -2243,8 +2243,8 @@ default-package-overrides: - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.11 - - wild-bind ==0.1.2.3 - - wild-bind-x11 ==0.2.0.6 + - wild-bind ==0.1.2.4 + - wild-bind-x11 ==0.2.0.7 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - winery ==0.3.1 @@ -2321,7 +2321,7 @@ default-package-overrides: - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.1 + - yesod-markdown ==0.12.6.2 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.2 - yesod-persistent ==1.6.0.2 @@ -2337,7 +2337,7 @@ default-package-overrides: - yjtools ==0.9.18 - yoga ==0.0.0.5 - youtube ==0.2.1.1 - - zero ==0.1.4 + - zero ==0.1.5 - zeromq4-haskell ==0.7.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 From ea3c0aa1b57e323b76a64f84fdf20af22c88719b Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 22 May 2019 20:56:38 +1000 Subject: [PATCH 602/637] haskellPackages.hakyll: remove obsolete patch --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 548f9750d7e..9a7fef86621 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -165,10 +165,7 @@ self: super: { then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else appendPatch super.hakyll (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/pull/691/commits/a44ad37cd15310812e78f7dab58d6d460451f20c.patch"; - sha256 = "13xpznm19rjp51ds165ll9ahyps1r4131c77b8r7gpjd6i505832"; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2a61c9f03d2..0a32ef97100 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5094,7 +5094,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib From 49345f233ca61db9e5327d6a7ea4e60f34058fbb Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 15 May 2019 19:44:04 +1000 Subject: [PATCH 603/637] hackage2nix: lattices is no longer broken --- 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 0a32ef97100..848382ab3cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6507,7 +6507,6 @@ broken-packages: - latex-formulae-image - latex-formulae-pandoc - LATS - - lattices - launchpad-control - lawless-concurrent-machines - layers From 3643fa4bca2094558c5c95ecc989a499262b4242 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 23 May 2019 15:35:13 +0200 Subject: [PATCH 604/637] hackage2nix: un-break some Haskell packages Either because they're no longer broken at all or by overriding them with a fix --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ .../configuration-hackage2nix.yaml | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a7fef86621..f5c6f3da14a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1265,4 +1265,21 @@ self: super: { # Haddock failure: https://github.com/haskell/haddock/issues/979 esqueleto = dontHaddock (dontCheck super.esqueleto); + # Requires API keys to run tests + algolia = dontCheck super.algolia; + + # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but + # hspec which isn't in stackage is already past that + antiope-s3 = doJailbreak super.antiope-s3; + + # Has tasty < 1.2 requirement, but works just fine with 1.2 + temporary-resourcet = doJailbreak super.temporary-resourcet; + + # Tests require internet + dhall_1_23_0 = dontCheck super.dhall_1_23_0; + + # Requires dhall >= 1.23.0 + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 848382ab3cf..d44f421e5c7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2625,11 +2625,9 @@ broken-packages: - AC-VanillaArray - AC-Vector - AC-Vector-Fancy - - accelerate - accelerate-arithmetic - accelerate-fftw - accelerate-fourier - - accelerate-io - accelerate-llvm - accelerate-llvm-native - accelerate-random @@ -2693,7 +2691,6 @@ broken-packages: - aeson-applicative - aeson-decode - aeson-diff-generic - - aeson-extra - aeson-flowtyped - aeson-injector - aeson-native @@ -2721,9 +2718,6 @@ broken-packages: - airship - airtable-api - aivika-distributed - - aivika-experiment-cairo - - aivika-experiment-chart - - aivika-experiment-diagrams - ajhc - AlanDeniseEricLauren - alerta @@ -2736,7 +2730,6 @@ broken-packages: - algebraic - algebraic-prelude - algo-s - - algolia - AlgoRhythm - AlgorithmW - align-text @@ -2757,7 +2750,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka-s3-streaming - amby - AMI - ampersand @@ -2789,10 +2781,6 @@ broken-packages: - anticiv - antigate - antimirov - - antiope-contract - - antiope-messages - - antiope-s3 - - antiope-sqs - antisplice - antlr-haskell - antlrc @@ -2892,14 +2880,12 @@ broken-packages: - atlassian-connect-core - atmos-dimensional-tf - atndapi - - atom-conduit - atom-msp430 - atomic-modify - atomic-primops-foreign - atomic-primops-vector - atomo - ats-format - - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -4024,7 +4010,6 @@ broken-packages: - dgs - dhall-check - dhall-nix - - dhall-to-cabal - dhcp-lease-parser - di - di-df1 @@ -9124,7 +9109,6 @@ broken-packages: - templatepg - tempodb - temporal-csound - - temporary-resourcet - tempus - tensor - tensorflow From bdb704e8d7a5b4ce71696e108f4e8608c94fb13f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 May 2019 17:35:13 +0200 Subject: [PATCH 605/637] hackage2nix: update list of broken builds --- .../configuration-hackage2nix.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d44f421e5c7..936e8c15291 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2691,6 +2691,7 @@ broken-packages: - aeson-applicative - aeson-decode - aeson-diff-generic + - aeson-extra - aeson-flowtyped - aeson-injector - aeson-native @@ -2718,6 +2719,9 @@ broken-packages: - airship - airtable-api - aivika-distributed + - aivika-experiment-cairo + - aivika-experiment-chart + - aivika-experiment-diagrams - ajhc - AlanDeniseEricLauren - alerta @@ -2750,6 +2754,8 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka-cognito-identity + - amazonka-ecs - amby - AMI - ampersand @@ -2880,6 +2886,7 @@ broken-packages: - atlassian-connect-core - atmos-dimensional-tf - atndapi + - atom-conduit - atom-msp430 - atomic-modify - atomic-primops-foreign @@ -2950,6 +2957,7 @@ broken-packages: - aws-sign4 - aws-simple - aws-sns + - axel - axiom - azubi - azure-service-api @@ -2998,6 +3006,7 @@ broken-packages: - battleship-combinatorics - battleships - bayes-stack + - bbi - BCMtools - bdcs - bdcs-api @@ -3540,6 +3549,7 @@ broken-packages: - cmt - cmv - cnc-spec-compiler + - co-log - co-log-polysemy - co-log-sys - Coadjute @@ -3581,6 +3591,7 @@ broken-packages: - combinatorial-problems - Combinatorrent - combobuffer + - comfort-array - comic - Command - commander @@ -3686,6 +3697,7 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous - contiguous-checked - contiguous-fft - continue @@ -4304,6 +4316,7 @@ broken-packages: - eros - eros-client - eros-http + - error-codes - error-context - error-continuations - error-list @@ -4827,6 +4840,7 @@ broken-packages: - git-jump - git-monitor - git-object + - git-remote-ipfs - git-repair - git-sanity - git-vogue @@ -5180,6 +5194,7 @@ broken-packages: - harvest-api - has - has-th + - HasBigDecimal - HasCacBDD - hascas - Haschoo @@ -5424,6 +5439,7 @@ broken-packages: - hedgehog-checkers-lens - hedgehog-fn - hedgehog-gen-json + - hedgehog-quickcheck - Hedi - hedis-config - hedis-pile @@ -5898,6 +5914,7 @@ broken-packages: - hsx-jmacro - hsx-xhtml - hsXenCtrl + - HsYAML-aeson - hsyscall - hsyslog-tcp - hsyslog-udp @@ -5990,6 +6007,7 @@ broken-packages: - hw-simd - hw-streams - hw-succinct + - hw-uri - hw-vector - hw-xml - hwall-auth-iitk @@ -6039,6 +6057,7 @@ broken-packages: - hypher - hzulip - i18n + - i3blocks-hs-contrib - i3ipc - iap-verifier - ib-api @@ -6169,6 +6188,7 @@ broken-packages: - ip2proxy - ipatch - ipc + - ipld-cid - ipopt-hs - iptables-helpers - iptadmin @@ -6359,6 +6379,7 @@ broken-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-hails-reactivevalues + - kerry - Ketchup - keter - kevin @@ -6485,6 +6506,7 @@ broken-packages: - language-vhdl - language-webidl - lapack + - lapack-comfort-array - Lastik - lat - latest-npm-version @@ -7084,9 +7106,11 @@ broken-packages: - multi-cabal - multiaddr - multiarg + - multibase - multifile - multifocal - multihash + - multihash-serialise - multilinear - multilinear-io - multipass @@ -7189,6 +7213,7 @@ broken-packages: - netclock - netcore - netease-fm + - netlib-comfort-array - netlines - netrium - NetSNMP @@ -7299,9 +7324,11 @@ broken-packages: - numerical - numhask - numhask-array + - numhask-hedgehog - numhask-histogram - numhask-prelude - numhask-range + - numhask-space - numhask-test - Nussinov78 - Nutri @@ -7778,11 +7805,14 @@ broken-packages: - prim-array - prim-instances - primes-type + - primitive-addr + - primitive-atomic - primitive-containers - primitive-indexed - primitive-maybe - primitive-simd - primitive-sort + - primitive-unlifted - primula-board - primula-bot - pringletons @@ -8217,11 +8247,13 @@ broken-packages: - RNAlien - RNAwolf - rncryptor + - rng-utils - rob - robin - robots-txt - roc-cluster - roc-cluster-demo + - rocksdb-query - roku-api - rollbar-hs - roller @@ -9070,6 +9102,7 @@ broken-packages: - tasty-auto - tasty-fail-fast - tasty-groundhog-converters + - tasty-hedgehog-coverage - tasty-integrate - tasty-jenkins-xml - tasty-laws @@ -9426,6 +9459,7 @@ broken-packages: - typelevel-tensor - TypeNat - typeparams + - typerep-map - types-compat - typesafe-precure - typescript-docs @@ -9595,6 +9629,7 @@ broken-packages: - verilog - versioning - versioning-servant + - vflow-types - vfr-waypoints - vgrep - vhd From 2ad8ac54bf69abad9f81b1baec7efc5feac38219 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 May 2019 18:33:31 +0200 Subject: [PATCH 606/637] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e029651cf82fabffb5b1102b019bd0ae5facc11f. --- .../haskell-modules/hackage-packages.nix | 2288 ++++++++++------- 1 file changed, 1298 insertions(+), 990 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4cc3c34b9d1..b93579babbe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9075,6 +9075,8 @@ self: { pname = "HTF"; version = "0.13.2.5"; sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin"; + revision = "1"; + editedCabalFile = "0l18mp06jjwpjbnvj548naas1xhnc46c8l0pbgzi3bm6siq5hhv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9083,9 +9085,11 @@ self: { pretty process QuickCheck random regex-compat text time unix vector xmlgen ]; + libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ array base cpphs directory HUnit mtl old-time random text ]; + executableToolDepends = [ cpphs ]; testHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath HUnit mtl process random regex-compat template-haskell temporary text @@ -9104,6 +9108,8 @@ self: { pname = "HTTP"; version = "4000.3.13"; sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657"; + revision = "1"; + editedCabalFile = "07wn0skwbmms9g5lyzaaal6cbjffvisampv85r934cqh7kl9wkzh"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9349,16 +9355,16 @@ self: { "HaTeX" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, matrix - , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers - , wl-pprint-extras + , parsec, prettyprinter, QuickCheck, tasty, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "HaTeX"; - version = "3.20.0.1"; - sha256 = "02v4fqrrx5fw3ggrgvanfhaawnci8c7zw9q282bmy19p5sqpj88n"; + version = "3.21.0.0"; + sha256 = "0vavvs83r63sgzz4vyb617xady51ncli4ra9zwjhks8avzw3l1z1"; libraryHaskellDepends = [ - base bytestring containers hashable matrix parsec QuickCheck text - transformers wl-pprint-extras + base bytestring containers hashable matrix parsec prettyprinter + QuickCheck text transformers ]; testHaskellDepends = [ base parsec QuickCheck tasty tasty-quickcheck text @@ -10531,21 +10537,6 @@ self: { }) {}; "HsYAML" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: - mkDerivation { - pname = "HsYAML"; - version = "0.1.1.3"; - sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers mtl parsec text - ]; - description = "Pure Haskell YAML 1.2 parser"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "HsYAML_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: mkDerivation { pname = "HsYAML"; @@ -10558,7 +10549,6 @@ self: { ]; description = "Pure Haskell YAML 1.2 parser"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsYAML-aeson" = callPackage @@ -11068,8 +11058,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "JSONParser"; - version = "0.1.0.3"; - sha256 = "0nznnp9mr36npdzy8avbxbpm07mzm8mz4na1hfyv24g9iqmp31f8"; + version = "0.1.0.4"; + sha256 = "1xda2dy2mizpvxvn3gyhx7aql7pi26zvw044r3bm14xr5qj11q26"; libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; @@ -11166,6 +11156,18 @@ self: { broken = true; }) {}; + "Jazzkell" = callPackage + ({ mkDerivation, base, Euterpea, random }: + mkDerivation { + pname = "Jazzkell"; + version = "0.0.1"; + sha256 = "11sqcvdi1msnxn6fp590sy272lv2dp6qlzfard6sp1xnwqxx85nh"; + libraryHaskellDepends = [ base Euterpea random ]; + description = "Library for modeling jazz improvisation"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Jdh" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -11252,8 +11254,8 @@ self: { pname = "JuicyPixels"; version = "3.3.3"; sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c"; - revision = "1"; - editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq"; + revision = "2"; + editedCabalFile = "1vvbvvkpm4vlh0v8d8irzipd5yg1rrd5xdfcm2yibn1h0iqpzdi4"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -11299,23 +11301,6 @@ self: { }) {}; "JuicyPixels-extra" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover - , JuicyPixels - }: - mkDerivation { - pname = "JuicyPixels-extra"; - version = "0.4.0"; - sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base hspec JuicyPixels ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion JuicyPixels ]; - description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels-extra_0_4_1" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover , JuicyPixels }: @@ -11330,7 +11315,6 @@ self: { benchmarkHaskellDepends = [ base criterion JuicyPixels ]; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -12985,20 +12969,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MissingH_1_4_2_0" = callPackage + "MissingH_1_4_2_1" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , network-bsd, old-locale, old-time, parsec, process, random - , regex-compat, time, unix + , old-locale, old-time, parsec, process, random, regex-compat, time + , unix }: mkDerivation { pname = "MissingH"; - version = "1.4.2.0"; - sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9"; + version = "1.4.2.1"; + sha256 = "1m9qdgs2ma1svjcagv7qd31xcvym2mnzx001qwchdh46q9y288k1"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process random regex-compat - time unix + old-locale old-time parsec process random regex-compat time unix ]; testHaskellDepends = [ base containers directory errorcall-eq-instance filepath HUnit @@ -13232,8 +13215,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; - revision = "2"; - editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k"; + revision = "3"; + editedCabalFile = "0fiblwmwk48d1g9j99qrcg1ak904csgfb86y80d1nl2vr782cq6w"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -15869,8 +15852,8 @@ self: { pname = "QuickCheck"; version = "2.12.6.1"; sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; - revision = "2"; - editedCabalFile = "0d7dzba96vglz4k7ryf0zzqm18vl0wrr9v3xwwjf4cv91cc8cql2"; + revision = "3"; + editedCabalFile = "1cxsn5y6mnzqp681fcghjiqk47bq8mnkvcfc5c8c7yvl258lz5yf"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -15888,8 +15871,8 @@ self: { pname = "QuickCheck"; version = "2.13.1"; sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; - revision = "1"; - editedCabalFile = "1i8h75cxxpkriqprkr0ry5ig29pqhhhs5syjjxsyf1df6rngxipx"; + revision = "2"; + editedCabalFile = "061d4nf7n75rri0mzz5k50d8v5ja4a6w43fmm990z07vgxm5rj5n"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -18021,6 +18004,8 @@ self: { pname = "Spock"; version = "0.13.0.0"; sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa"; + revision = "1"; + editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -20485,8 +20470,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.6"; - sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j"; + version = "0.1.0.8"; + sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik"; libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; @@ -21166,8 +21151,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-arithmetic" = callPackage @@ -21468,8 +21451,6 @@ self: { ]; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-llvm" = callPackage @@ -23162,8 +23143,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-filthy" = callPackage @@ -24167,8 +24146,6 @@ self: { ]; description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-experiment-chart" = callPackage @@ -24186,8 +24163,6 @@ self: { ]; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-experiment-diagrams" = callPackage @@ -24204,8 +24179,6 @@ self: { ]; description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aivika-gpss" = callPackage @@ -24502,6 +24475,8 @@ self: { pname = "alga"; version = "0.2.2"; sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y"; + revision = "1"; + editedCabalFile = "1g1cxg4rxcm53pwlc0wh47s4w8h4lp5dsvnacrc1f5pmjhx3740y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -24717,8 +24692,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "align" = callPackage @@ -27208,8 +27181,6 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -28271,6 +28242,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "annotated-fix" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "annotated-fix"; + version = "0.1.0.0"; + sha256 = "1lhyllmi8j9r5mdr5pngw1s1xzs1cwv2hh2ym8kkdrxvrq93dk2i"; + libraryHaskellDepends = [ base recursion-schemes ]; + description = "A fixpoint of a functor that can be annotated"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "annotated-wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28599,8 +28581,6 @@ self: { ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-core" = callPackage @@ -28713,8 +28693,6 @@ self: { unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-messages_7_0_3" = callPackage @@ -28739,7 +28717,6 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -28784,8 +28761,6 @@ self: { network-uri resourcet text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-s3_7_0_3" = callPackage @@ -28814,7 +28789,6 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-sns" = callPackage @@ -28879,8 +28853,6 @@ self: { monad-loops network-uri text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiope-sqs_7_0_3" = callPackage @@ -28907,7 +28879,6 @@ self: { description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "antiprimes" = callPackage @@ -31815,8 +31786,8 @@ self: { pname = "async"; version = "2.2.1"; sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; - revision = "1"; - editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31"; + revision = "2"; + editedCabalFile = "130rc6icx3h471qs417lkw9b2pfn27xd009liw58cmdk66zscizp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -32108,8 +32079,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.8.0"; - sha256 = "0vqwrzr9axhxc2mvbwv4qzk5jgf9wplh2ss1hkbaqc9zp7wb4j7f"; + version = "0.4.9.0"; + sha256 = "1wgfgdimfp2fnd630s8288dciip26ysl7p0lmvm321migm22idq9"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -32215,31 +32186,30 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, data-default - , filepath, lens-simple, parsers, pretty-simple - , quickcheck-instances, refined, resourcet, safe-exceptions, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep + ({ mkDerivation, base-noprelude, blaze-builder, conduit + , data-default, filepath, generic-random, lens-simple, parsers + , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances + , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.6.0.0"; - sha256 = "1j88cnilxmybjc981a4z4hgsdq94gv386hc1zlbrm8zklq2rpgx2"; + version = "0.7.0.0"; + sha256 = "1xl2p06s26zm65sn9a13bzcq30d5vggnq32s8f51ss86b4h431q2"; libraryHaskellDepends = [ - base blaze-builder conduit lens-simple parsers refined - safe-exceptions text time timerep uri-bytestring xml-conduit - xml-types + base-noprelude blaze-builder conduit lens-simple parsers + prettyprinter refined relude safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base blaze-builder conduit data-default filepath lens-simple - parsers pretty-simple quickcheck-instances refined resourcet - safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck + base-noprelude conduit data-default filepath generic-random + lens-simple pretty-simple QuickCheck quickcheck-instances refined + relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + license = stdenv.lib.licenses.cc0; }) {}; "atom-msp430" = callPackage @@ -32454,8 +32424,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-setup" = callPackage @@ -33003,15 +32971,15 @@ self: { }) {}; "aur" = callPackage - ({ mkDerivation, aeson, base, errors, http-client, http-client-tls - , servant, servant-client, tasty, tasty-hunit, text + ({ mkDerivation, aeson, base, http-client, http-client-tls, servant + , servant-client, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.1.0.1"; - sha256 = "02qr5jmp2i1dn1wx9nsflrp81gnx32yvsvmbzxany5ab78g52gsz"; + version = "6.2.0.1"; + sha256 = "00h5v3b4is5jc11x85cjzq25lsqrlhidibsyn847bl0cpn9292d2"; libraryHaskellDepends = [ - aeson base errors http-client servant servant-client text + aeson base http-client servant servant-client text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -35902,6 +35870,23 @@ self: { broken = true; }) {}; + "bazel-coverage-report-renderer" = callPackage + ({ mkDerivation, base, cmdargs, directory, filepath, hxt, hxt-xpath + , listsafe, MissingH + }: + mkDerivation { + pname = "bazel-coverage-report-renderer"; + version = "0.1.0"; + sha256 = "19bin8hym1zqd85v7kbkk4jbpqs19yn4588q8x903i8m7863p83v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs directory filepath hxt hxt-xpath listsafe MissingH + ]; + description = "HTML Coverage Reports for Rules_Haskell"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bazel-runfiles" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -37714,6 +37699,17 @@ self: { broken = true; }) {}; + "binary-varint" = callPackage + ({ mkDerivation, base, binary }: + mkDerivation { + pname = "binary-varint"; + version = "0.1.0.0"; + sha256 = "1i183ab4bbq3yarijnb2pwgbi9k1w1nc0fs6ph8d8xnysj6ws8l8"; + libraryHaskellDepends = [ base binary ]; + description = "VarInt encoding/decoding via Data.Binary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binarydefer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41680,8 +41676,8 @@ self: { ({ mkDerivation, array, base, containers, parsec }: mkDerivation { pname = "brain-bleep"; - version = "0.1.0.1"; - sha256 = "18d9nfr9pykj5xb50m1gc024nw5h8i75facw2a1wz325jyzncg84"; + version = "0.1.0.2"; + sha256 = "08rb1b7m5lpgiwdy1gl3dkc2ymc6l8ifssj4q2rqp46b27nbwsgz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parsec ]; @@ -43186,7 +43182,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bv-little_1_0_0" = callPackage + "bv-little_1_0_1" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -43194,8 +43190,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.0.0"; - sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms"; + version = "1.0.1"; + sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6"; libraryHaskellDepends = [ base deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -43324,6 +43320,8 @@ self: { pname = "bytes"; version = "0.15.5"; sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683"; + revision = "1"; + editedCabalFile = "0k05cszpxmdwgnbxhmlmmvsxkwlanvz8dn0p3f6bzs8qlv3kbhm7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43354,6 +43352,8 @@ self: { pname = "byteslice"; version = "0.1.0.0"; sha256 = "13qzkhj2ify1q097n1zrjwjkw2803153vp9a4281i5idkm7x9pfg"; + revision = "1"; + editedCabalFile = "191drdfs4frgg5pg7fa0qh5ikik9lnm6kbrj1bmmnmzr4s9vdklv"; libraryHaskellDepends = [ base primitive ]; description = "Slicing ByteArray and MutableByteArray"; license = stdenv.lib.licenses.bsd3; @@ -43700,29 +43700,6 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; - version = "0.4.5.1"; - sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q"; - revision = "1"; - editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-strict-builder_0_4_5_2" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty , tasty-hunit, tasty-quickcheck @@ -43741,7 +43718,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-substring" = callPackage @@ -43788,29 +43764,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.2"; - sha256 = "03h2nmhyrr63gw4xmflsrmwf80gvayhs32wnpg3k9aqfjzpz4bd1"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit , tasty-quickcheck, text @@ -43831,7 +43784,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -44539,8 +44491,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.8.1.2"; - sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil"; + version = "0.8.2.0"; + sha256 = "1j3h28w9sva1kj410irysl4lbwbar0nbddb9w5gv6jn82ca2dl93"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -46260,8 +46212,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.2.0.0"; - sha256 = "0b026vbp9xkwfis5xr1z4svi5z5b4dpj5c3w28133fr4rl6cdpx4"; + version = "0.2.1.0"; + sha256 = "14mda2yvg0phpfhkacm5whh4hqcvyw14xiilx28ghc4rkf7al0fi"; libraryHaskellDepends = [ async base bytestring pretty-show prettyprinter rio teardown time uuid @@ -48786,8 +48738,8 @@ self: { }: mkDerivation { pname = "check-pvp"; - version = "0.0.2.1"; - sha256 = "0n3rq7zf0q92jm6y1gicp98b5yww8s8d430kc6a48rsxqs96i1w6"; + version = "0.0.3"; + sha256 = "1x7bzl7fb5h1d69ggqcg3dk0dnw75h4namjqhjh4izxf02zvic7m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48932,8 +48884,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.1.0"; - sha256 = "1aj0lnvscc07q879s9mxv0kgr8spnzvdskazi2maf7hsgirpijsl"; + version = "0.3.1.1"; + sha256 = "05jwz1nq5wiqdpnwn31wyc4gpryh9b4qzil4rkgx7vhavck2w1ap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49399,8 +49351,8 @@ self: { pname = "chronos"; version = "1.0.5"; sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; - revision = "2"; - editedCabalFile = "02szph6d6x1s866p0qzq0by68r4vpxcwmk1l3pfmpqrxl9c038yz"; + revision = "3"; + editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -52947,6 +52899,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colonnade_1_2_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, contravariant + , doctest, fast-logger, profunctors, QuickCheck, semigroupoids + , semigroups, text, vector + }: + mkDerivation { + pname = "colonnade"; + version = "1.2.0.2"; + sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; + libraryHaskellDepends = [ + base bytestring contravariant profunctors semigroups text vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base doctest fast-logger QuickCheck semigroupoids + ]; + description = "Generic types and functions for columnar encoding and decoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "color-counter" = callPackage ({ mkDerivation, aeson, base, cmdargs, colour, containers , data-default, directory, friday, friday-devil, split, v4l2 @@ -53418,19 +53390,23 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, containers, deepseq, guarded-allocation - , non-empty, primitive, QuickCheck, storable-record, transformers + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , guarded-allocation, non-empty, prelude-compat, primitive + , QuickCheck, semigroups, storable-record, tagged, transformers , utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.3.1"; - sha256 = "1lbfx35v8qzi2wacqg47v6hw4kx2rxs5xml8mwb1fyqqxbzbv7n7"; + version = "0.4"; + sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m"; libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty primitive - QuickCheck storable-record transformers utility-ht + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record tagged transformers + utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers QuickCheck tagged ]; - testHaskellDepends = [ base containers QuickCheck ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56599,8 +56575,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.0"; - sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; + version = "2.2.0.1"; + sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -57984,8 +57960,8 @@ self: { pname = "country"; version = "0.1.6"; sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9"; - revision = "2"; - editedCabalFile = "0721d9nc2snr6046ybmdj80xas7627lwd1ym6h1n8lclihw7ll6d"; + revision = "3"; + editedCabalFile = "034cd94hiwgci0qhkdkkqmx2igmf1wxmd4b70g6sdlk1kklcn7x1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq ghc-prim hashable primitive scientific text unordered-containers @@ -59907,8 +59883,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "3"; - editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g"; + revision = "4"; + editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -60002,6 +59978,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_26" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.26"; + sha256 = "1pdf0zzbfr0cdzls6bab6f6kpx08wa8c2qc1zfqzv5ajapgr0wy4"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -61884,6 +61883,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-accessor_0_2_3" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "data-accessor"; + version = "0.2.3"; + sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-accessor-monadLib" = callPackage ({ mkDerivation, base, data-accessor, monadLib }: mkDerivation { @@ -62106,6 +62117,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-combinator-gen" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "data-combinator-gen"; + version = "0.1.0.1"; + sha256 = "0z1x36y4d3i1pm33fjp3f0xdn9dqjbgfvd3b7yskznfjywn0jg42"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Generate a special combinator from any data type"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-compat" = callPackage ({ mkDerivation, base, constraints }: mkDerivation { @@ -63645,6 +63667,35 @@ self: { broken = true; }) {}; + "datadog_0_2_4_0" = callPackage + ({ mkDerivation, aeson, auto-update, base, buffer-builder + , bytestring, Cabal, containers, dlist, exceptions, hspec + , http-client, http-client-tls, http-types, lens, lifted-base + , monad-control, network, old-locale, random, text, time + , transformers-base, unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "datadog"; + version = "0.2.4.0"; + sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4"; + libraryHaskellDepends = [ + aeson auto-update base buffer-builder bytestring containers dlist + http-client http-client-tls http-types lens lifted-base + monad-control network old-locale text time transformers-base + unliftio unordered-containers vector + ]; + testHaskellDepends = [ + aeson auto-update base buffer-builder bytestring Cabal containers + dlist exceptions hspec http-client http-client-tls http-types lens + lifted-base monad-control network old-locale random text time + transformers-base unliftio unordered-containers vector + ]; + description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "datadog-tracing" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , ffunctor, generic-random, hspec-golden-aeson, http-media @@ -64181,33 +64232,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.2.6"; - sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_7" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -64232,7 +64256,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -65314,6 +65337,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_10_1" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.10.1"; + sha256 = "15lwcc7i7wmi1gkkmak677qw0fnz4a4ldnv842xaimfi64753shv"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive transformers + unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -66670,6 +66716,8 @@ self: { pname = "dhall"; version = "1.23.0"; sha256 = "074xpiag5csg08s9g9lcymi2mhvlwgjpqzmg7bw190mdpb8vk9zd"; + revision = "1"; + editedCabalFile = "06z5f1jk0s65dkvv5gmflla3j18vxwzgspg0lfql1vihxnvrk9hj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66903,8 +66951,6 @@ self: { ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -68041,6 +68087,8 @@ self: { pname = "digestive-functors"; version = "0.8.4.0"; sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; + revision = "2"; + editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -71895,8 +71943,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "4"; - editedCabalFile = "1ln3lwx4h7yi3gf5r4ix92nvjcjjhphiqan1lnci81wn0frs9wrz"; + revision = "5"; + editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72534,10 +72582,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.3.0.0"; - sha256 = "0a674aqs9jnkga3a9sp24qyr3fssbizh4p1zwfvzwafnjrbmrc5c"; - revision = "1"; - editedCabalFile = "0f0n6pkgvhgvqh33dlzid3mb35r87w9kirdilky6zk8bcr2li4da"; + version = "0.4.0.0"; + sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -76032,12 +76078,12 @@ self: { }) {}; "error-codes" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "error-codes"; - version = "0.1.0.0"; - sha256 = "1i78vxk5ldasbn0fs8nwjfsjzkxjmg05i6vgzs4jlj1ajsgwhhkj"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.0.1"; + sha256 = "0df14g66vwz56bbiyjbis86cv106rlnniaf39kqzrnrdwswx1s1d"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; @@ -76246,6 +76292,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_6" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.6"; + sha256 = "0h99i04690c7f1zpkzbh31p641nmxyj7grisxw5yaavdbinagmvq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -77423,6 +77497,43 @@ self: { broken = true; }) {}; + "eventstore_1_3_0" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, file-embed, hashable + , http-client, interpolate, lifted-async, lifted-base + , monad-control, monad-logger, mono-traversable, mtl, protobuf + , random, safe, safe-exceptions, semigroups, stm, stm-chans + , streaming, tasty, tasty-hspec, tasty-hunit, text, time + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "eventstore"; + version = "1.3.0"; + sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan ekg-core exceptions fast-logger + hashable http-client interpolate lifted-async lifted-base + monad-control monad-logger mono-traversable mtl protobuf random + safe safe-exceptions semigroups stm stm-chans streaming text time + transformers-base unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger file-embed hashable + lifted-async lifted-base monad-control mono-traversable protobuf + safe safe-exceptions semigroups stm stm-chans streaming tasty + tasty-hspec tasty-hunit text time transformers-base + unordered-containers uuid vector + ]; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -78286,6 +78397,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "explicit-exception_0_1_10" = callPackage + ({ mkDerivation, base, deepseq, semigroups, transformers }: + mkDerivation { + pname = "explicit-exception"; + version = "0.1.10"; + sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; + description = "Exceptions which are explicit in the type signature"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "explicit-iomodes" = callPackage ({ mkDerivation, base, base-unicode-symbols, tagged }: mkDerivation { @@ -80798,8 +80923,8 @@ self: { }: mkDerivation { pname = "ffunctor"; - version = "1.1.100"; - sha256 = "07s9ax9pi8bxvj94dfh237wfxdmx63gglkw8cx7pn2w1jybpb8v9"; + version = "1.2.0"; + sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -81464,6 +81589,8 @@ self: { pname = "fin"; version = "0.0.2"; sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i"; + revision = "1"; + editedCabalFile = "11jxsij60l69n79sws23sgvbal2kbw7w5yv2fbp5580f8swj95c4"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -83047,8 +83174,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.8.0.0"; - sha256 = "0gidczc4d3gi97w7ck3xp7q4amvnhkyzfpksyxc8r6cyfz29n9ic"; + version = "0.8.0.2"; + sha256 = "07q7xb7h48by6gj284fczszay4gg1r0j2nr7fmffj72nkjgzzyhx"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -83131,8 +83258,8 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.2.0.0"; - sha256 = "1hmyr5vnv7inkjnffadfjiwp9fwsw9jr0c45dcbk5gs9kwpa77zz"; + version = "0.2.0.2"; + sha256 = "07f21cr07kfzzrsk6j63livwjbi0ci43i5czbplj3wsy58sq8pn7"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -83526,8 +83653,8 @@ self: { pname = "foldl"; version = "1.4.5"; sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; - revision = "2"; - editedCabalFile = "080v2qwck5k9jfix55bv04h9m9ci14kgdrjbrssab2wgraxpyjvz"; + revision = "3"; + editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -85644,6 +85771,8 @@ self: { pname = "frpnow"; version = "0.18"; sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz"; + revision = "1"; + editedCabalFile = "0biplda0z6pmnm28vcdnaa4k82zcbhrghynqzsy7whs0kc86zq4a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl transformers ]; description = "Principled practical FRP"; @@ -90064,8 +90193,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190516"; - sha256 = "0jk0k870iznichiw7f99snv2syyqhaqh3faglc32fkhghmawv9y5"; + version = "0.20190523.1"; + sha256 = "12mb2s6l8vjda091j5ch99chvffhvbqc2vmrjjvls7wx94qaz3hi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90089,8 +90218,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "0.20190516"; - sha256 = "0blwr9gii81rh689skmzxqfhiya412hic9rvkqafwwrilppn8043"; + version = "0.20190523"; + sha256 = "0z023rimlifffds03h25r9m1s5c51wfwra0d0isfiijqfxmq3ki7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -90487,20 +90616,6 @@ self: { }) {}; "ghc-syntax-highlighter" = callPackage - ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: - mkDerivation { - pname = "ghc-syntax-highlighter"; - version = "0.0.3.1"; - sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_4_0" = callPackage ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; @@ -90512,7 +90627,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -92583,6 +92697,37 @@ self: { broken = true; }) {}; + "git-remote-ipfs" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, conduit-extra, cryptonite, filepath, formatting + , generics-sop, git, http-client, ipfs-api, ipld-cid, lens + , lens-aeson, mtl, multibase, multihash-cryptonite, network-uri + , optparse-applicative, primitive, safe-exceptions, servant + , servant-client, stm, text, transformers, typed-process + , unordered-containers, vector + }: + mkDerivation { + pname = "git-remote-ipfs"; + version = "0.1.0.0"; + sha256 = "1zh7wbyd01p17c7lxx4xvj0rhnzqkpqcjdj1a3kynak2zi8wf6k2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit cryptonite filepath + formatting generics-sop git http-client ipfs-api ipld-cid lens + lens-aeson mtl multibase multihash-cryptonite network-uri + optparse-applicative primitive safe-exceptions servant + servant-client stm text transformers typed-process + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra mtl + optparse-applicative text + ]; + description = "Git remote helper to store git objects on IPFS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "git-repair" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-default, directory, exceptions, filepath, hslogger, IfElse @@ -97147,8 +97292,8 @@ self: { }: mkDerivation { pname = "gopher-proxy"; - version = "0.1.1.1"; - sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd"; + version = "0.1.1.2"; + sha256 = "1ji7gfvcagvnv716ii6hwlv3g1np9iif7dk94mg42k265j30h4gh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -98258,8 +98403,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.3.1.3"; - sha256 = "1v63hp99q3idyq5hmrcax45yp22cswvfs0jj4s7vs94s918a0xg4"; + version = "0.3.2.1"; + sha256 = "1853jmyh2lxgx4hhcgdlnrq4sdrqva0026whfdfa909gi51bg91w"; libraryHaskellDepends = [ base containers json text ]; description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; @@ -102372,8 +102517,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -104587,8 +104730,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.16"; - sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6"; + version = "0.0.0.17"; + sha256 = "1p7cwj9bm7wc39ra4vfwiv98f2zm1s9irmaf3kg64gdd2zi37d24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105085,6 +105228,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashtables_1_2_3_2" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + mkDerivation { + pname = "hashtables"; + version = "1.2.3.2"; + sha256 = "0scwvwswx5wyqmwac09izf1yx01l13gx7334q6qjkjplarpbrwyi"; + revision = "1"; + editedCabalFile = "19d3739zphrp82wnn248ws18lknbh3dfpki87q0d2palxbnyh1hx"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -106126,7 +106285,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_12_1_0" = callPackage + "haskell-lsp_0_13_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, filepath, hashable, haskell-lsp-types , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec @@ -106136,8 +106295,10 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.12.1.0"; - sha256 = "12h8vq2gr62mwf230m1z7hvi3mpv69lwhbvhp21wnk1r77mipd5k"; + version = "0.13.0.0"; + sha256 = "0mxmgw32j9fzr63qj1pviszcd2fb3mqdxnhz6ghv83lgj5j8517c"; + revision = "1"; + editedCabalFile = "0qni50rymq7qx95i6jcj3mb49zxc123ciyyih82vvm15gks62fp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106193,6 +106354,8 @@ self: { pname = "haskell-lsp-types"; version = "0.8.2.0"; sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; + revision = "1"; + editedCabalFile = "0gmfxhjn92kzbpd9kzq5n3707lcpkxhnzxgg7lk34jhayiw5kyzj"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -106201,15 +106364,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_12_1_0" = callPackage + "haskell-lsp-types_0_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.12.1.0"; - sha256 = "1657p73gyqhpb459qf349j0xx6icdj720x0v6x7nb6iyk63q6l6r"; + version = "0.13.0.0"; + sha256 = "18np1n5qvy5020vzvvcpj431fn4dbnd3zgzqngfnhv604yymywx8"; + revision = "2"; + editedCabalFile = "02yh8lkxbr7pzr97n5w2waz9cr1fisb8c0k16ajibhj57y3dn8il"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -107945,29 +108110,6 @@ self: { }) {}; "haskey-btree" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-ordlist - , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, vector - }: - mkDerivation { - pname = "haskey-btree"; - version = "0.3.0.0"; - sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; - libraryHaskellDepends = [ - base binary bytestring containers hashable mtl semigroups text - transformers vector - ]; - testHaskellDepends = [ - base binary bytestring containers data-ordlist HUnit mtl QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers vector - ]; - description = "B+-tree implementation in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskey-btree_0_3_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-ordlist , hashable, HUnit, mtl, QuickCheck, semigroups, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -107988,7 +108130,6 @@ self: { ]; description = "B+-tree implementation in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskey-mtl" = callPackage @@ -109181,6 +109322,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_3_0_6" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, dlist, hashable, hashtables + , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.3.0.6"; + sha256 = "01kp8ajg7mw3j6g6d13fsygcbbw7gyrqh3hdllhb1jv53mr7fgb3"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug data-default-class QuickCheck quickcheck-instances rebase + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -111510,10 +111680,8 @@ self: { ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { pname = "hedgehog-quickcheck"; - version = "0.1"; - sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "5"; - editedCabalFile = "0x3vsw9pvdgbi0a2fc0kbk9x3dbfq963bb8lkpj8cy2in29qv77f"; + version = "0.1.1"; + sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; @@ -113488,6 +113656,8 @@ self: { pname = "hgis"; version = "1.0.0.3"; sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8"; + revision = "1"; + editedCabalFile = "1p44ngzglxp8kdj6jlczgfjpms889r3fs7waz69zf50cbqq2am0c"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 @@ -114017,8 +114187,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.1.1"; - sha256 = "03jza44q99qfc46kb1r66qjirgklp7h8l2c28k4cmkzd2r23bd7a"; + version = "0.2.0.0"; + sha256 = "0q1xns7l7g1m4nfj4wr90r55m4n5c4fvigww12shr1x9hp30pqy0"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; testHaskellDepends = [ base doctest hspec lens QuickCheck ]; description = "Partial types as a type constructor"; @@ -115235,21 +115405,22 @@ self: { }) {}; "hjugement-protocol" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , cryptonite, deepseq, memory, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, criterion, cryptonite, deepseq, memory, QuickCheck + , random, reflection, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.0.20190513"; - sha256 = "0m51216rxy0lm8q6v0hc1fa1qkxmxlnrd47plm3jjcxl5pg2li25"; + version = "0.0.0.20190519"; + sha256 = "163ihhjz3ma2x6hng7zssbcr9xfni7xn7imyg98w1qv68gbb3b7r"; libraryHaskellDepends = [ - base bytestring containers cryptonite deepseq memory random text - transformers unordered-containers + aeson base base64-bytestring binary bytestring containers + cryptonite deepseq memory random reflection text transformers + unordered-containers ]; testHaskellDepends = [ - base containers QuickCheck random tasty tasty-hunit + aeson base containers QuickCheck random tasty tasty-hunit tasty-quickcheck text transformers ]; benchmarkHaskellDepends = [ @@ -115789,8 +115960,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.20"; - sha256 = "01dgz9lqkx6j06r9vclicjaiylk05pzcglnqmrvyy3yk9h93lhs1"; + version = "2.1.21"; + sha256 = "1il8nrpk5iw6949dfchb2329z5xi7rx4zq028lmfqr8sg2hhjwj4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -116863,25 +117034,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit - , http-types, microlens, text, unordered-containers, uri-bytestring - , uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; - version = "1.8.5"; - sha256 = "1s96zijcmsd3kfh7pjvbs4ks3hi6fkbq04pnxp9zfgr4di6ifmwz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_8_6" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , http-types, microlens, text, unordered-containers, uri-bytestring , uri-bytestring-aeson @@ -116898,7 +117050,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -118974,21 +119125,21 @@ self: { "hpqtypes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector + , directory, exceptions, filepath, HUnit, lifted-base + , monad-control, mtl, postgresql, QuickCheck, random, resource-pool + , scientific, semigroups, test-framework, test-framework-hunit + , text, text-show, time, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.6.1.0"; - sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn"; + version = "1.7.0.0"; + sha256 = "0vk6yj7rw3cqdvyfmpjis10av1apj79v0b8d9hagc8v8zzfp0wki"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - aeson async base bytestring containers data-default-class - exceptions lifted-base monad-control mtl resource-pool semigroups - text text-show time transformers transformers-base vector + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups text text-show time + transformers transformers-base vector ]; librarySystemDepends = [ postgresql ]; testHaskellDepends = [ @@ -119005,18 +119156,20 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, data-default, exceptions, fields-json, hpqtypes - , lifted-base, log-base, monad-control, mtl, safe, semigroups - , tasty, tasty-hunit, text, text-show, transformers + , cryptohash, exceptions, fields-json, hpqtypes, lifted-base + , log-base, monad-control, mtl, safe, semigroups, tasty + , tasty-hunit, text, text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.8.0.0"; - sha256 = "1q90y8qm5hmyh4q344p844p78cqi0l5w8sxzazyg3mmf8xmz9xy1"; + version = "1.9.0.0"; + sha256 = "04aibdf45w75f60wh77xk1n3a74mjqc1x4dlnxm5nx0vd8hypm2j"; + revision = "2"; + editedCabalFile = "132rdymxzkxrj8hwn7080k9xhawni3javx45rlzkr8cyv41qxwdl"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash - data-default exceptions fields-json hpqtypes lifted-base log-base - monad-control mtl safe semigroups text text-show + base base16-bytestring bytestring containers cryptohash exceptions + fields-json hpqtypes lifted-base log-base monad-control mtl safe + semigroups text text-show ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control tasty @@ -119381,8 +119534,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.6"; - sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx"; + version = "0.3.8"; + sha256 = "0x72gh0lzwrr10w7lply72yqz5q0hxq39virhm2sqqsmy9r305k8"; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text @@ -119396,29 +119549,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; - "hruby_0_3_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , process, QuickCheck, ruby, scientific, stm, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hruby"; - version = "0.3.7"; - sha256 = "1i77gmkggm6l17zr1jrn65rjgh3m47f7wz5j9c715mi2ilr01qfx"; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring scientific stm text - unordered-containers vector - ]; - librarySystemDepends = [ ruby ]; - testHaskellDepends = [ - aeson attoparsec base QuickCheck text vector - ]; - description = "Embed a Ruby intepreter in your Haskell program !"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ruby;}; - "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -120133,6 +120263,26 @@ self: { broken = true; }) {}; + "hs-zstd" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib + }: + mkDerivation { + pname = "hs-zstd"; + version = "0.1.1.1"; + sha256 = "1510r677j4vf9yrih3mimjrw31vgwcnw3wli41cddvghinm9paih"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs2048" = callPackage ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint , hspec, HUnit, process, QuickCheck, random, regex-compat @@ -122899,8 +123049,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.0.2"; - sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5"; + version = "1.0.1.0"; + sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -123048,8 +123198,8 @@ self: { pname = "hspec2"; version = "0.6.1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; - revision = "1"; - editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl"; + revision = "2"; + editedCabalFile = "1q0pw1ggki7h839jicf2k0lllbm219qjcr3407hvcih9vfkbw03j"; libraryHaskellDepends = [ base hspec hspec-discover ]; description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; @@ -125706,12 +125856,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "httpd-shed_0_4_1_0" = callPackage + "httpd-shed_0_4_1_1" = callPackage ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; - version = "0.4.1.0"; - sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y"; + version = "0.4.1.1"; + sha256 = "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-bsd network-uri ]; @@ -126739,6 +126889,32 @@ self: { broken = true; }) {}; + "hw-excess_0_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.0.3"; + sha256 = "0g7izay5q8krg570jxkiwwrc0kw926q6hyx6bpg9a1qx9dlpy1bi"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe vector + ]; + testHaskellDepends = [ + base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector + ]; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-fingertree" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog @@ -127176,6 +127352,32 @@ self: { broken = true; }) {}; + "hw-prim_0_6_2_24" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.24"; + sha256 = "17bm69hva7cb6pf8qx4w027bckhgcci4mrqlfpf0vkbbzg3vm3wf"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -127388,6 +127590,30 @@ self: { broken = true; }) {}; + "hw-uri" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core + , antiope-s3, base, bytestring, directory, exceptions, filepath + , hedgehog, hspec, hspec-discover, http-client, http-types + , hw-hspec-hedgehog, lens, mtl, resourcet, text + }: + mkDerivation { + pname = "hw-uri"; + version = "0.0.0.1"; + sha256 = "11cibgdyk4r1ad6hamb81ffcf27yar9w8045533f2sr6vfnhrj6m"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base + bytestring directory exceptions filepath http-client http-types + lens mtl resourcet text + ]; + testHaskellDepends = [ + antiope-core antiope-s3 base bytestring filepath hedgehog hspec + http-types hw-hspec-hedgehog lens text + ]; + testToolDepends = [ hspec-discover ]; + description = "CI Assistant for Haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-vector" = callPackage ({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck , vector @@ -128598,6 +128824,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "hyphenation_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , doctest, text, unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8"; + sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring containers text unordered-containers zlib + ]; + testHaskellDepends = [ + base containers doctest unordered-containers + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -128762,6 +129009,25 @@ self: { broken = true; }) {}; + "i3blocks-hs-contrib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, text + , time, transformers, turtle, wreq + }: + mkDerivation { + pname = "i3blocks-hs-contrib"; + version = "1.0.0"; + sha256 = "1lg60cgmyavlmn5a9ywa45vxskndqfbpy18vc6r6kxl49xgcqmpn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text turtle ]; + executableHaskellDepends = [ + aeson attoparsec base lens lens-aeson text time transformers turtle + wreq + ]; + description = "Base i3blocks written in haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "i3ipc" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec , network, text, typed-process, vector @@ -131379,6 +131645,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-cpp_0_3_0_2" = callPackage + ({ mkDerivation, base, hspec, inline-c, safe-exceptions + , template-haskell + }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.3.0.2"; + sha256 = "03dfikf43mmx4vzlp6nd6f1c3niklh2f9mq1s2fwsikh8x8x3qp6"; + libraryHaskellDepends = [ + base inline-c safe-exceptions template-haskell + ]; + testHaskellDepends = [ base hspec inline-c safe-exceptions ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-win32" = callPackage ({ mkDerivation, base, containers, inline-c, template-haskell , Win32 @@ -132949,6 +133232,8 @@ self: { pname = "ip"; version = "1.5.0"; sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; + revision = "1"; + editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector wide-word @@ -133074,6 +133359,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipfs-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-media, http-types + , servant, text + }: + mkDerivation { + pname = "ipfs-api"; + version = "0.1.0.0"; + sha256 = "1fvvb36vfqpzbhsyp8ps0y9qpizj1b4xygiwxiqzf6g813yl53b8"; + libraryHaskellDepends = [ + aeson base bytestring http-media http-types servant text + ]; + description = "Auto-generated IPFS HTTP API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ipld-cid" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring + , cryptonite, deepseq, hashable, hedgehog, multibase + , multihash-cryptonite, text + }: + mkDerivation { + pname = "ipld-cid"; + version = "0.1.0.0"; + sha256 = "1y08j0ibcrpfcm0zv1h17zdgbl3hm3sjvm0w9bk1lzdipd6p6cwj"; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + multibase multihash-cryptonite text + ]; + testHaskellDepends = [ + base bytestring cryptonite hedgehog multibase multihash-cryptonite + text + ]; + description = "IPLD Content-IDentifiers "; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ipopt-hs" = callPackage ({ mkDerivation, ad, ansi-wl-pprint, base, c2hs, containers, ipopt , lens, mtl, nlopt, template-haskell, uu-parsinglib, vector @@ -133272,26 +133593,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.0.5"; - sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_0_6" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -133309,7 +133610,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -133324,24 +133624,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.3.0.1"; - sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_3_0_2" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -133357,7 +133639,6 @@ self: { ]; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -138412,6 +138693,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kerry" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process + , resourcet, temporary-resourcet, text, transformers + , transformers-bifunctors + }: + mkDerivation { + pname = "kerry"; + version = "0.1.1"; + sha256 = "1b42mmwjvw39fyqi9b6gv67qpmswg6biabar55vggsxi8j43s76z"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers errors mmorph text + transformers transformers-bifunctors + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog hedgehog-corpus mmorph + mtl process resourcet temporary-resourcet text transformers + ]; + description = "Manage and abstract your packer configurations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -141687,24 +141990,20 @@ self: { }) {}; "lapack" = callPackage - ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms + ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, data-ref, deepseq, fixed-length - , guarded-allocation, lapack-ffi, lazyio, monoid-transformer + , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random - , semigroups, tfp, transformers, unique-logic-tf, utility-ht + , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2.4"; - sha256 = "16rgcxinkrkv1h35pfyrgg9xihkhpk3i2xd5f3xw29b1hahsb9hv"; - revision = "1"; - editedCabalFile = "0lcbih8i8rl6y9raxm77wfjb3lymivf3xicg1bslr6b5mrkyqqqh"; - isLibrary = true; - isExecutable = true; + version = "0.3"; + sha256 = "1dgm8c46jl5r8584l1qr99jmc7wdi4yh5cw7q6fzmfg678k0jh78"; libraryHaskellDepends = [ - base blas-ffi boxes comfort-array deepseq fixed-length - guarded-allocation lapack-ffi lazyio netlib-ffi non-empty - semigroups tfp transformers utility-ht + base blas-ffi blaze-html boxes comfort-array deepseq fixed-length + guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty + semigroups text tfp transformers utility-ht ]; testHaskellDepends = [ base ChasingBottoms comfort-array data-ref monoid-transformer @@ -142012,8 +142311,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lattices_2" = callPackage @@ -142039,7 +142336,6 @@ self: { description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "launchpad-control" = callPackage @@ -147614,8 +147910,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.0"; - sha256 = "01xkkmdxlxn66a884ymzpxqqf0x8h2inagzvigg3d3iyn9sgrrh1"; + version = "0.7.1.1"; + sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -147791,29 +148087,6 @@ self: { }) {}; "logging-effect" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, unliftio-core - }: - mkDerivation { - pname = "logging-effect"; - version = "1.3.3"; - sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl prettyprinter - semigroups stm stm-delay text time transformers transformers-base - unliftio-core - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - prettyprinter text time - ]; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_3_4" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time @@ -147834,7 +148107,6 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -148762,7 +149034,7 @@ self: { broken = true; }) {}; - "lsp-test_0_5_2_2" = callPackage + "lsp-test_0_5_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -148771,8 +149043,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.2.2"; - sha256 = "0hld5xmv781nm0ix1mngjgch11bany0px923bgngp0nf6jgfz5yc"; + version = "0.5.2.3"; + sha256 = "1l4fdmqm6mvjpyz8imnf5q52pcls0jg5fqsxhkmj7ywnam66xfrk"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -153487,8 +153759,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "2"; - editedCabalFile = "02sbbiznppvdmpb373xyh8i84sywlzzvhhx5nd9ix5lmx50813qw"; + revision = "3"; + editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155950,6 +156222,8 @@ self: { pname = "model"; version = "0.4.4"; sha256 = "1mmv1m78ychgqp0mblm56fszfmnxap3jwvxviy0h06s6wl2adq24"; + revision = "1"; + editedCabalFile = "1av9z75w5cb4kh9fdr7cjp6gs9mwwbp47yi9gw1swz19yf7i1am4"; libraryHaskellDepends = [ base containers convertible deepseq either pretty transformers ]; @@ -159046,6 +159320,8 @@ self: { pname = "ms-tds"; version = "0.1.0.0"; sha256 = "05g5y0c105p1dqcd8mybqnrky495nb0320yrjgk7dr7lhfwsyb6s"; + revision = "1"; + editedCabalFile = "1n29v4kj4lmfvj15878l6949wjpl9h7mgrwj0i684hcqv7xlgml2"; libraryHaskellDepends = [ array base binary bytestring data-default-class mtl network text time tls uuid-types x509-store x509-system @@ -159054,6 +159330,7 @@ self: { array base binary bytestring data-default-class mtl network text time tls uuid-types x509-store x509-system ]; + description = "TDS Protocol implemented in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -159178,19 +159455,20 @@ self: { }) {}; "mssql-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, ms-tds, network - , network-bsd, text, time, tls + ({ mkDerivation, base, binary, bytestring, hostname, ms-tds + , network, text, time, tls }: mkDerivation { pname = "mssql-simple"; - version = "0.1.0.1"; - sha256 = "0vprjbr7w4273p15d74xjl0axxn0xsbxa3j2vbjx30jmizz8imqq"; + version = "0.1.0.2"; + sha256 = "0k0ijffl4xq5jb12gnwpnpc4r6cd64r1a344mqwybqaymjyblm66"; libraryHaskellDepends = [ - base binary bytestring ms-tds network network-bsd text time tls + base binary bytestring hostname ms-tds network text time tls ]; testHaskellDepends = [ - base binary bytestring ms-tds network network-bsd text time tls + base binary bytestring hostname ms-tds network text time tls ]; + description = "SQL Server client library implemented in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -159681,14 +159959,36 @@ self: { broken = true; }) {}; + "multibase" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring + , base32-z-bytestring, base58-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, deepseq, doctest, formatting + , hashable, QuickCheck, sandi, serialise, tagged, template-haskell + , text + }: + mkDerivation { + pname = "multibase"; + version = "0.1.0.0"; + sha256 = "1gvbqq4kd94n7dmcbjb3k24z0qrv13qmi8lhs3yxwch3y13qv60m"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base16-bytestring base32-z-bytestring base58-bytestring + base64-bytestring bytestring deepseq formatting hashable sandi + serialise tagged text + ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Self-identifying base encodings, implementation of "; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative , pretty, process, transformers }: mkDerivation { pname = "multifile"; - version = "0.1.0.6"; - sha256 = "054nh8g4ngg1d4ik41iagp72qdp8p6nbvr2kjrzk9a30a0k4akar"; + version = "0.1.0.7"; + sha256 = "0nc19swda1v8fz3fhd2vkkr6a4nd7519qkgpcbhpm2hplkan6csn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159753,6 +160053,42 @@ self: { broken = true; }) {}; + "multihash-cryptonite" = callPackage + ({ mkDerivation, base, binary, binary-varint, bytestring, Cabal + , cabal-doctest, cryptonite, deepseq, doctest, hashable, hedgehog + , memory + }: + mkDerivation { + pname = "multihash-cryptonite"; + version = "0.1.0.0"; + sha256 = "0gl13kjqz14lnwz7x162fad3j99qs1xa3zabpr30q53pkzk8adsi"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary binary-varint bytestring cryptonite deepseq hashable + memory + ]; + testHaskellDepends = [ base cryptonite doctest hedgehog ]; + description = "Self-identifying hashes, implementation of "; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multihash-serialise" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hedgehog, memory + , multibase, multihash-cryptonite, serialise + }: + mkDerivation { + pname = "multihash-serialise"; + version = "0.1.0.0"; + sha256 = "1bvh0fm26nnbfykimp3j2934lxwh7kgk6jkk9v8yjpn0k9rxnkrb"; + libraryHaskellDepends = [ + base bytestring cryptonite memory multibase multihash-cryptonite + serialise + ]; + testHaskellDepends = [ base cryptonite hedgehog serialise ]; + description = "CBOR encoding of multihashes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multihashmap" = callPackage ({ mkDerivation, base, hashable, unordered-containers }: mkDerivation { @@ -162034,8 +162370,8 @@ self: { pname = "nats"; version = "1.1.2"; sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; - revision = "2"; - editedCabalFile = "1654j2zngjzp71hra6s980hd9xgx0xlk6rvqm504n7h9vmyycrjx"; + revision = "3"; + editedCabalFile = "02ww45nskca28fsbh74iy0z4rm0yshws7lrxld45y053hrn1jdzc"; doHaddock = false; description = "Natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -164054,21 +164390,6 @@ self: { }) {}; "network-transport" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, hashable - , transformers - }: - mkDerivation { - pname = "network-transport"; - version = "0.5.2"; - sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable transformers - ]; - description = "Network abstraction layer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport_0_5_4" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , transformers }: @@ -164081,7 +164402,6 @@ self: { ]; description = "Network abstraction layer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-amqp" = callPackage @@ -165579,6 +165899,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty_0_3_2" = callPackage + ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + }: + mkDerivation { + pname = "non-empty"; + version = "0.3.2"; + sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v"; + libraryHaskellDepends = [ + base containers deepseq QuickCheck utility-ht + ]; + testHaskellDepends = [ base containers QuickCheck utility-ht ]; + description = "List-like structures with static restrictions on the number of elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-containers" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -166099,21 +166435,6 @@ self: { }) {}; "nsis" = callPackage - ({ mkDerivation, base, directory, process, transformers, uniplate - }: - mkDerivation { - pname = "nsis"; - version = "0.3.2"; - sha256 = "1jhmiydkiii350h6gdj8f6k8d0drsbp6a2dji4nik72nca6mp65r"; - libraryHaskellDepends = [ base transformers uniplate ]; - testHaskellDepends = [ - base directory process transformers uniplate - ]; - description = "DSL for producing Windows Installer using NSIS"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nsis_0_3_3" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: mkDerivation { @@ -166126,7 +166447,6 @@ self: { ]; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nth-prime" = callPackage @@ -166587,8 +166907,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.2.3.1"; - sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k"; + version = "0.3.0.0"; + sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; @@ -166598,19 +166918,20 @@ self: { "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, numhask-prelude, protolude, QuickCheck - , singletons, tasty, tasty-quickcheck, vector + , distributive, doctest, hedgehog, numhask-hedgehog + , numhask-prelude, protolude, singletons, vector }: mkDerivation { pname = "numhask-array"; - version = "0.2.1.0"; - sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h"; + version = "0.3"; + sha256 = "0rx24k34asmkbwsqf0i5gbcc4av4r6pnxpgfw3dxhkgha72a4g9i"; libraryHaskellDepends = [ adjunctions base deepseq dimensions distributive numhask-prelude - protolude QuickCheck singletons vector + protolude singletons vector ]; testHaskellDepends = [ - base doctest numhask-prelude tasty tasty-quickcheck + adjunctions base dimensions doctest hedgehog numhask-hedgehog + numhask-prelude ]; description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -166618,6 +166939,22 @@ self: { broken = true; }) {}; + "numhask-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, numhask, numhask-prelude + , numhask-space + }: + mkDerivation { + pname = "numhask-hedgehog"; + version = "0.3"; + sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds"; + libraryHaskellDepends = [ + base hedgehog numhask numhask-prelude numhask-space + ]; + testHaskellDepends = [ base hedgehog numhask numhask-prelude ]; + description = "Laws and tests for numhask"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-histogram" = callPackage ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude , numhask-range, tdigest @@ -166637,12 +166974,13 @@ self: { }) {}; "numhask-prelude" = callPackage - ({ mkDerivation, base, doctest, numhask, protolude }: + ({ mkDerivation, base, doctest, numhask, numhask-space, protolude + }: mkDerivation { pname = "numhask-prelude"; - version = "0.1.0.1"; - sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi"; - libraryHaskellDepends = [ base numhask protolude ]; + version = "0.3.1"; + sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq"; + libraryHaskellDepends = [ base numhask numhask-space protolude ]; testHaskellDepends = [ doctest ]; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; @@ -166672,6 +167010,21 @@ self: { broken = true; }) {}; + "numhask-space" = callPackage + ({ mkDerivation, adjunctions, base, distributive, numhask + , semigroupoids + }: + mkDerivation { + pname = "numhask-space"; + version = "0.1.1"; + sha256 = "1rf86fbyrbs2a1dxrbr35a2dhfimclindlb4iimijs28is0zdz8s"; + libraryHaskellDepends = [ + adjunctions base distributive numhask semigroupoids + ]; + description = "numerical spaces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-test" = callPackage ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty , tasty-quickcheck @@ -170847,8 +171200,8 @@ self: { pname = "pandoc-citeproc"; version = "0.16.2"; sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv"; - revision = "1"; - editedCabalFile = "06g80bigzlnh5s569s2f1f0ds49cbsh0l69n3phr281x597x021j"; + revision = "2"; + editedCabalFile = "0z7ia0f89lamrvnr75j7r6jhklkly0qcyplws9ww9rpbj9j7shyk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172756,18 +173109,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.5.1.0"; - sha256 = "15rg80dgawmjz0gzfsspbb0b1045l6w5vvhwd4dgr7vv4hwj9gs9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_5_1_1" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -172777,7 +173118,6 @@ self: { testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -173657,6 +173997,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcg-random_0_1_3_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , entropy, primitive, random + }: + mkDerivation { + pname = "pcg-random"; + version = "0.1.3.6"; + sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring entropy primitive random + ]; + testHaskellDepends = [ base doctest ]; + description = "Haskell bindings to the PCG random number generator"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pcgen" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck , random @@ -175853,23 +176211,6 @@ self: { }) {}; "pgp-wordlist" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "pgp-wordlist"; - version = "0.1.0.2"; - sha256 = "0ri4m4a18kmnpw2a3vcw7zgjagccqr3snw2qgljg3b92abl6z2z2"; - libraryHaskellDepends = [ base bytestring containers text vector ]; - testHaskellDepends = [ - base bytestring deepseq doctest HUnit tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Translate between binary data and a human-readable collection of words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pgp-wordlist_0_1_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , HUnit, tasty, tasty-hunit, tasty-quickcheck, text, vector }: @@ -175884,7 +176225,6 @@ self: { ]; description = "Translate between binary data and a human-readable collection of words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgsql-simple" = callPackage @@ -179014,8 +179354,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.12"; - sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as"; + version = "1.1.1.13"; + sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179428,8 +179768,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "0.1.2.0"; - sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm"; + version = "0.2.0.0"; + sha256 = "0bcqvvcpfcgx6ckz0ry942z92nvhwqva9gz4bznr9fc26i0amsjw"; libraryHaskellDepends = [ base mtl random syb template-haskell transformers ]; @@ -179446,14 +179786,20 @@ self: { }) {}; "polysemy-plugin" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }: + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec + , inspection-testing, polysemy, should-not-typecheck, syb + , transformers + }: mkDerivation { pname = "polysemy-plugin"; - version = "0.1.0.0"; - sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr"; - libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ]; + version = "0.2.0.0"; + sha256 = "1qzhza8p462cm5brxyh2kv7yr39b2756h4h6yfls41smrfa7h05z"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra polysemy syb transformers + ]; testHaskellDepends = [ - base ghc ghc-tcplugins-extra hspec polysemy + base ghc ghc-tcplugins-extra hspec inspection-testing polysemy + should-not-typecheck syb transformers ]; description = "Disambiguate obvious uses of effects"; license = stdenv.lib.licenses.bsd3; @@ -179464,8 +179810,8 @@ self: { }: mkDerivation { pname = "polysemy-zoo"; - version = "0.1.0.0"; - sha256 = "0hiwv4fnila9ql3wxyni84z1209w7cd088gllw9n903qa41ncsqj"; + version = "0.1.1.0"; + sha256 = "1ivabmyhbajwsykq9dbx3mhybki2cnpl74cx7pcfb5i7c99qmk23"; libraryHaskellDepends = [ base containers polysemy polysemy-plugin ]; @@ -181656,6 +182002,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prelude-compat_0_0_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "prelude-compat"; + version = "0.0.0.2"; + sha256 = "1mv00d5k5wqb39iyghdbf4lfqznwb1whcc9a564ly4wzka70y9f1"; + libraryHaskellDepends = [ base ]; + description = "Provide Prelude and Data.List with fixed content across GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prelude-edsl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -182183,6 +182541,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_3_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, criterion, deepseq, doctest, mtl, pgp-wordlist + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.3.0"; + sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist tasty tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers criterion deepseq mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -182460,13 +182844,13 @@ self: { }) {}; "primitive-atomic" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "primitive-atomic"; - version = "0.1.0.0"; - sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv"; - libraryHaskellDepends = [ base primitive ]; - testHaskellDepends = [ base primitive ]; + version = "0.1.0.1"; + sha256 = "0q7lgirw0a75cd0157xq705wnns45d4nx2gfgmvvx0qi6rzvx45s"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; + testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -182483,25 +182867,27 @@ self: { }) {}; "primitive-containers" = callPackage - ({ mkDerivation, aeson, base, containers, contiguous, deepseq - , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort - , quantification, QuickCheck, quickcheck-classes, random, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + ({ mkDerivation, base, containers, contiguous, deepseq, gauge + , ghc-prim, hashable, HUnit, primitive, primitive-sort + , primitive-unlifted, QuickCheck, quickcheck-classes, random, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "primitive-containers"; - version = "0.3.3"; - sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; + version = "0.4.0"; + sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz"; + revision = "1"; + editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc"; libraryHaskellDepends = [ - aeson base contiguous deepseq hashable primitive primitive-sort - quantification text unordered-containers vector + base contiguous deepseq hashable primitive primitive-sort + primitive-unlifted ]; testHaskellDepends = [ - aeson base containers HUnit primitive quantification QuickCheck + base containers HUnit primitive primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base containers gauge ghc-prim primitive random + base containers gauge ghc-prim primitive primitive-unlifted random ]; description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; @@ -182517,8 +182903,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.7.1"; - sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n"; + version = "0.7.1.1"; + sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive profunctors vector @@ -182599,8 +182985,8 @@ self: { pname = "primitive-sort"; version = "0.1.0.0"; sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3"; - revision = "2"; - editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki"; + revision = "3"; + editedCabalFile = "1ld4wm2p75nl0qvzmgz1isgl1w59gk9ydg6hq0mijq362vx4ih2w"; libraryHaskellDepends = [ base contiguous ghc-prim primitive ]; testHaskellDepends = [ base containers doctest HUnit primitive QuickCheck smallcheck tasty @@ -182628,8 +183014,8 @@ self: { ({ mkDerivation, base, primitive, stm }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.0.0"; - sha256 = "014vkxfc2jas5qcsnlkxyczwsibm70vpb7zfzc5mhmfy60pib0vy"; + version = "0.1.1.0"; + sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; @@ -183842,15 +184228,16 @@ self: { }) {}; "prometheus-proc" = callPackage - ({ mkDerivation, base, filepath, prometheus-client - , regex-applicative, unix, unix-memory + ({ mkDerivation, base, directory, filepath, prometheus-client + , regex-applicative, text, unix, unix-memory }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.0.0"; - sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + version = "0.1.1.0"; + sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9"; libraryHaskellDepends = [ - base filepath prometheus-client regex-applicative unix unix-memory + base directory filepath prometheus-client regex-applicative text + unix unix-memory ]; description = "Export metrics from /proc for the current process"; license = stdenv.lib.licenses.bsd3; @@ -185862,8 +186249,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.7"; - sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; + version = "1.5.1.8"; + sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -185878,7 +186265,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_1_8" = callPackage + "pusher-http-haskell_1_5_1_9" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -185886,8 +186273,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.8"; - sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f"; + version = "1.5.1.9"; + sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -186464,8 +186851,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.0"; - sha256 = "1kbd88p0px9p8w9v9jgxv03xsl2b7ksjsf6m5c5xffpmjilij9b4"; + version = "0.9.1"; + sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -187114,19 +187501,20 @@ self: { broken = true; }) {}; - "quickcheck-classes_0_6_1_0" = callPackage + "quickcheck-classes_0_6_2_1" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers - , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings - , tagged, tasty, tasty-quickcheck, transformers, vector + , contravariant, fail, primitive, primitive-addr, QuickCheck + , semigroupoids, semigroups, semirings, tagged, tasty + , tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.1.0"; - sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; + version = "0.6.2.1"; + sha256 = "1pw4r4166a3f0ylvjifpcnicfh9kidz7lvjpgp4m0frhaqhx82ig"; libraryHaskellDepends = [ - aeson base base-orphans bifunctors containers fail primitive - QuickCheck semigroupoids semigroups semirings tagged transformers - vector + aeson base base-orphans bifunctors containers contravariant fail + primitive primitive-addr QuickCheck semigroupoids semigroups + semirings tagged transformers vector ]; testHaskellDepends = [ aeson base base-orphans containers primitive QuickCheck @@ -187498,8 +187886,8 @@ self: { ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; - version = "0.3"; - sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + version = "0.3.1"; + sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl"; libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; @@ -190558,27 +190946,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.3.1"; - sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_3_1_1" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -190597,7 +190964,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -192617,35 +192983,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.4.0"; - sha256 = "0iqx0pa5dzf4nbjjdjignn7baf9vckppsz81c4a1m1zrlv1ipyig"; - libraryHaskellDepends = [ - base containers exceptions hashable mmorph mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_5_1" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl , multimap, protolude, random, resourcet, semigroupoids, semigroups @@ -192674,6 +193011,35 @@ self: { broken = true; }) {}; + "registry_0_1_5_2" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.5.2"; + sha256 = "1spvc9y985820f945zvp822w8bxrrmny7rwcfy94nky4mv5gk4i0"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -192939,28 +193305,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-reify-compat, time, time-locale-compat, transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.12.1.0"; - sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text th-reify-compat - time time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_2_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -192980,34 +193324,9 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage - ({ mkDerivation, base, containers, convertible, dlist, HDBC - , HDBC-session, names-th, persistable-record, product-isomorphic - , QuickCheck, quickcheck-simple, relational-query - , relational-schemas, sql-words, template-haskell, th-data-compat - , transformers - }: - mkDerivation { - pname = "relational-query-HDBC"; - version = "0.7.1.1"; - sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk"; - libraryHaskellDepends = [ - base containers convertible dlist HDBC HDBC-session names-th - persistable-record product-isomorphic relational-query - relational-schemas sql-words template-haskell th-data-compat - transformers - ]; - testHaskellDepends = [ - base convertible HDBC QuickCheck quickcheck-simple - ]; - description = "HDBC instance of relational-query and typed query interface for HDBC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query-HDBC_0_7_2_0" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic , QuickCheck, quickcheck-simple, relational-query @@ -193029,7 +193348,6 @@ self: { ]; description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-record" = callPackage @@ -193075,21 +193393,6 @@ self: { }) {}; "relational-schemas" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.6.2"; - sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: @@ -193102,7 +193405,6 @@ self: { ]; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -194229,17 +194531,6 @@ self: { }) {}; "rerebase" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.3.1"; - sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_3_1_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; @@ -194248,7 +194539,6 @@ self: { libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage @@ -194260,6 +194550,8 @@ self: { pname = "reroute"; version = "0.5.0.0"; sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r"; + revision = "2"; + editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k"; libraryHaskellDepends = [ base deepseq hashable http-api-data hvect mtl text unordered-containers @@ -198119,8 +198411,8 @@ self: { }: mkDerivation { pname = "safe-money-xmlbf"; - version = "0.1.1"; - sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6"; + version = "0.1.2"; + sha256 = "04jpv05w1q2xdmh78i5xy3j48vk7qsnb0dpjr3zfbqs0qwpc9vld"; libraryHaskellDepends = [ base safe-money text xmlbf ]; testHaskellDepends = [ base bytestring safe-money tasty tasty-hunit tasty-quickcheck text @@ -201711,22 +202003,6 @@ self: { }) {}; "semver" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty - , tasty-hunit, text - }: - mkDerivation { - pname = "semver"; - version = "0.3.3.1"; - sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; - testHaskellDepends = [ base tasty tasty-hunit text ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Representation, manipulation, and de/serialisation of Semantic Versions"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "semver_0_3_4" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text }: @@ -203694,8 +203970,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "6"; - editedCabalFile = "0pqn5lxcicccy73xbxsaqkxlga0ljc2kr8ysmdffxyndjyph4237"; + revision = "7"; + editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -204706,6 +204982,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-tags" = callPackage + ({ mkDerivation, base, containers, lens, servant, servant-mock + , servant-server, servant-swagger, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-tags"; + version = "0.1.0.0"; + sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64"; + libraryHaskellDepends = [ + base containers lens servant servant-mock servant-server + servant-swagger swagger2 text + ]; + description = "Swagger Tags for Servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, swagger2, text @@ -205944,8 +206236,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.18"; - sha256 = "1manjf4834dh556j8x7zxndw94vz1xlmilqdqlhd2q8hcfdxlc3q"; + version = "0.18.2"; + sha256 = "1drzcwspj0q9s3mpba291pich0my9pp3qrra90slv6carckcrzi8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206868,8 +207160,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.4.0.0"; - sha256 = "0ghkiz720g4p8gs5h3h43pkdsgcl7iffnqdis122qhvfliwqcmpr"; + version = "0.5.0.0"; + sha256 = "03lm8np6hrbzcwzfknvixm6fjsnmjr9s379i9mwxq5d0ndf66y8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207162,6 +207454,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.3"; + sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208828,18 +209137,19 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade , contravariant, doctest, either, HUnit, pipes, profunctors - , QuickCheck, streaming, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, transformers, vector + , QuickCheck, semigroups, streaming, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.8.1"; - sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx"; - revision = "2"; - editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531"; + version = "0.8.1.1"; + sha256 = "1l8asyjbhhzj0zccf86g0scm2h8hp42c3v3wyymcvfwmd2wspnfr"; + revision = "1"; + editedCabalFile = "0xdl110lvjq23vd7p6q0fc68yspk72m5ixs90yc8j2g7fi52izsx"; libraryHaskellDepends = [ - attoparsec base bytestring colonnade streaming text transformers - vector + attoparsec base bytestring colonnade semigroups streaming text + transformers vector ]; testHaskellDepends = [ base bytestring colonnade contravariant doctest either HUnit pipes @@ -212828,6 +213138,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "spacecookie" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , directory, fast-logger, filepath, hxt-unicode, mtl, socket + , transformers, unix + }: + mkDerivation { + pname = "spacecookie"; + version = "0.2.0.1"; + sha256 = "04gghnfkbb26xykgksif8xx5s9pv9f1rjgznlx5mpniwk11ij940"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory fast-logger + filepath hxt-unicode mtl socket transformers unix + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers directory filepath mtl + socket transformers unix + ]; + description = "gopher server daemon"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -213432,8 +213765,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.1"; - sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p"; + version = "0.1.2.2"; + sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -214165,18 +214498,6 @@ self: { }) {}; "sql-words" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-simple }: - mkDerivation { - pname = "sql-words"; - version = "0.1.6.2"; - sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck quickcheck-simple ]; - description = "SQL keywords data constructors into OverloadedString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sql-words_0_1_6_3" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; @@ -214186,7 +214507,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-simple ]; description = "SQL keywords data constructors into OverloadedString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlcipher" = callPackage @@ -216725,8 +217045,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.2"; - sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w"; + version = "1.2.0.3"; + sha256 = "0bypqk2813q7ydhialig34gyrpqcfpj8w0mcq49h1j57g7hfm293"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -217184,6 +217504,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_1_1" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.1.1"; + sha256 = "1lp2kcrb4d3wsyd1cfmw3927w693lq9hj2anv0j993wvpdvd1cgl"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -218796,15 +219168,16 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory - , stripe-concepts, text + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , memory, stripe-concepts, text }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.0"; - sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps"; + version = "1.0.0.1"; + sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; libraryHaskellDepends = [ - base bytestring cryptonite hex-text memory stripe-concepts text + base base16-bytestring bytestring cryptonite memory stripe-concepts + text ]; testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; @@ -221026,7 +221399,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symengine-hs" = callPackage ({ mkDerivation, base, gmp, gmpxx, symengine }: @@ -221045,7 +221419,8 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + inherit (pkgs) symengine;}; "symmetric-properties" = callPackage ({ mkDerivation, base, containers, hspec, HUnit }: @@ -223466,8 +223841,8 @@ self: { }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.0.0.0"; - sha256 = "1sdgadqw0y6cdaa46i4z2jah03654iikjr04i92h06cpw1aw2mqm"; + version = "1.0.0.1"; + sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -223692,10 +224067,8 @@ self: { }: mkDerivation { pname = "tasty-lua"; - version = "0.1.1"; - sha256 = "0a6b02aq9wzbdkz8mkq8ii5pp65ijbj0ayr4ay5ipqn3jzimmr71"; - revision = "1"; - editedCabalFile = "1di6lpqjkrq3mcmaix7ar136kfmc54m4jma7byz6vc41gha388yr"; + version = "0.2.0"; + sha256 = "0adiz7g9lri81rlnwshwswmp0ajfs4y4im37rc04krz8qr26s4v7"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -223723,24 +224096,6 @@ self: { }) {}; "tasty-quickcheck" = callPackage - ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck - , random, tagged, tasty, tasty-hunit - }: - mkDerivation { - pname = "tasty-quickcheck"; - version = "0.10"; - sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h"; - revision = "1"; - editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx"; - libraryHaskellDepends = [ - base optparse-applicative QuickCheck random tagged tasty - ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; - description = "QuickCheck support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-quickcheck_0_10_1" = callPackage ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck , random, tagged, tasty, tasty-hunit }: @@ -223754,7 +224109,6 @@ self: { testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; description = "QuickCheck support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-quickcheck-laws" = callPackage @@ -224786,8 +225140,6 @@ self: { ]; description = "Portable temporary files and directories with automatic deletion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tempus" = callPackage @@ -226137,6 +226489,8 @@ self: { pname = "text"; version = "1.2.3.1"; sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; + revision = "1"; + editedCabalFile = "1bvfb180m3c9jwmxldmg3h742fj9x2kfjclqr1c71clc3zxd65fn"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -226208,29 +226562,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , deferred-folds, QuickCheck, quickcheck-instances, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "text-builder"; - version = "0.6.5"; - sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q"; - libraryHaskellDepends = [ - base base-prelude bytestring deferred-folds semigroups text - transformers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "text-builder_0_6_5_1" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -226251,7 +226582,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -226770,8 +227100,8 @@ self: { pname = "text-short"; version = "0.1.2"; sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk"; - revision = "1"; - editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj"; + revision = "2"; + editedCabalFile = "106p7c0399zxdlh9f9qkgy7g2gp3bxqdpy6m6lnfhzi0pm5y8mks"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -227970,24 +228300,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "these_0_8" = callPackage + "these_0_8_1" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors , binary, containers, data-default-class, deepseq, hashable, keys - , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty - , tasty-quickcheck, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids + , tagged, tasty, tasty-quickcheck, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "these"; - version = "0.8"; - sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; - revision = "1"; - editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11"; + version = "0.8.1"; + sha256 = "0fy63prcdl21fl1vp039wi2j5vr2vgahf537pcg068a6zkfmaiwn"; libraryHaskellDepends = [ aeson assoc base base-compat bifunctors binary containers data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances + semigroupoids tagged transformers transformers-compat + unordered-containers vector vector-instances ]; testHaskellDepends = [ aeson base base-compat bifunctors binary containers hashable lens @@ -228836,14 +229165,14 @@ self: { broken = true; }) {}; - "time_1_9_2" = callPackage + "time_1_9_3" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9.2"; - sha256 = "05d0n44rwpqkjkns9nlgw2gpfv643a0bzp9cx97az0wmn31618nx"; + version = "1.9.3"; + sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -229477,17 +229806,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timer-wheel_0_2_0" = callPackage - ({ mkDerivation, atomic-primops, base, ghc-prim, primitive - , psqueues, random - }: + "timer-wheel_0_2_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: mkDerivation { pname = "timer-wheel"; - version = "0.2.0"; - sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; - libraryHaskellDepends = [ - atomic-primops base ghc-prim primitive psqueues - ]; + version = "0.2.0.1"; + sha256 = "1m3bv095kbm4ksva3plhggkq2c0jf441wm994l57jfmlcng2i4xy"; + libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base random ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; @@ -231508,6 +231833,40 @@ self: { broken = true; }) {}; + "trans-fx-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "trans-fx-core"; + version = "0.0.1"; + sha256 = "0hkwl1dygghym6w5qci53ylkhk298bzddfvahisr2gw5wibknrfs"; + libraryHaskellDepends = [ base ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-data" = callPackage + ({ mkDerivation, base, trans-fx-core }: + mkDerivation { + pname = "trans-fx-data"; + version = "0.0.1"; + sha256 = "0y4hnn1ixgsqd9x829cxyn0n2psxpjczxxaa99jv9wrfwfvssgid"; + libraryHaskellDepends = [ base trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trans-fx-io" = callPackage + ({ mkDerivation, base, time, trans-fx-core, trans-fx-data }: + mkDerivation { + pname = "trans-fx-io"; + version = "0.0.1"; + sha256 = "1yf3j35q0j5if1hpl11083bwrcyyr378wwnp98m1f5gsrlj62qpw"; + libraryHaskellDepends = [ base time trans-fx-core trans-fx-data ]; + testHaskellDepends = [ base time trans-fx-core ]; + description = "Monadic effect framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transaction" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable , QuickCheck @@ -231682,17 +232041,6 @@ self: { }) {}; "transformers-compat" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.6.4"; - sha256 = "036f7qnzhxjbflypgggkd3v0gjpbcqbb1ryagyiknlrnsrav8zxd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - description = "A small compatibility shim for the transformers library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "transformers-compat_0_6_5" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; @@ -231701,7 +232049,6 @@ self: { libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -231809,10 +232156,8 @@ self: { ({ mkDerivation, base, transformers, writer-cps-transformers }: mkDerivation { pname = "transformers-lift"; - version = "0.2.0.1"; - sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; - revision = "3"; - editedCabalFile = "0rkbjlpn460gn93qr0l7025ggkgj46j6pkcil6m2chkzk91cpk9i"; + version = "0.2.0.2"; + sha256 = "1w6wb8f8ad41l3gl4879289rb22jsgsj4qdaygf0wff45d04mq94"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -237340,6 +237685,8 @@ self: { pname = "unordered-containers"; version = "0.2.10.0"; sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + revision = "1"; + editedCabalFile = "01727lm2spbqfn0rl89zv9zhpsmnls0kmizyckqf5nc3j9d0k6sy"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -239967,6 +240314,8 @@ self: { pname = "vec"; version = "0.1.1"; sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5"; + revision = "1"; + editedCabalFile = "0yaqc8ci0iy46fimznmr499c5ygrvhfspwbkxdhn112zrci3b7af"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids transformers @@ -240390,6 +240739,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_2_0_1" = callPackage + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , finite-typelits, hashable, indexed-list-literals, primitive + , vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.2.0.1"; + sha256 = "1l7d9nzazxh372pc7fwvbxib7hfmgkjg8c5iv7m5d240n1qk13pj"; + libraryHaskellDepends = [ + adjunctions base comonad deepseq distributive finite-typelits + hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -240749,6 +241116,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vflow-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, ip, json-alt + , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes + , scientific, text + }: + mkDerivation { + pname = "vflow-types"; + version = "0.1"; + sha256 = "01iycni552yrikn59lh6mvsf16aq52kcgwapqk6al8y623vqg5hi"; + libraryHaskellDepends = [ + aeson base ip json-alt json-autotype scientific text + ]; + testHaskellDepends = [ + aeson base bytestring ip json-alt neat-interpolation QuickCheck + quickcheck-classes text + ]; + description = "types for ingesting vflow data with aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vfr-waypoints" = callPackage ({ mkDerivation, base, containers, dimensional, fuzzy , geodetic-types, lens, monoid-subclasses, optparse-applicative @@ -243107,8 +243494,8 @@ self: { pname = "wai-middleware-travisci"; version = "0.1.0"; sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv"; - revision = "1"; - editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3"; + revision = "2"; + editedCabalFile = "0j1k2y75gwbny72zf5nrwzanh7sn2plscnrjd4hw5npccxi4dchx"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite http-types text transformers vault wai @@ -244462,41 +244849,6 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, async, base, basement, bytestring, cereal - , cryptonite, data-default, exceptions, generics-sop, hspec - , hspec-contrib, hspec-discover, hspec-expectations, http-client - , http-client-tls, machines, memory, microlens, microlens-aeson - , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random - , relapse, split, stm, tagged, template-haskell, text, time - , transformers, uuid-types, vinyl - }: - mkDerivation { - pname = "web3"; - version = "0.8.3.1"; - sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; - libraryHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec relapse tagged template-haskell text transformers uuid-types - vinyl - ]; - testHaskellDepends = [ - aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop hspec hspec-contrib hspec-discover - hspec-expectations http-client http-client-tls machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple - parsec random relapse split stm tagged template-haskell text time - transformers uuid-types vinyl - ]; - testToolDepends = [ hspec-discover ]; - description = "Ethereum API for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "web3_0_8_3_2" = callPackage ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client @@ -245562,6 +245914,8 @@ self: { pname = "wide-word"; version = "0.1.0.8"; sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj"; + revision = "1"; + editedCabalFile = "189p1g51xx0a1lhxlhr0i8qv7mvr4zsjfdpb4i8ja2hfi0ssszdx"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes @@ -245642,24 +245996,6 @@ self: { }) {}; "wild-bind" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; - version = "0.1.2.3"; - sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_4" = callPackage ({ mkDerivation, base, containers, hspec, microlens, QuickCheck , semigroups, stm, text, transformers }: @@ -245675,7 +246011,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -245715,25 +246050,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.6"; - sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_7" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -245750,7 +246066,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -249241,6 +249556,8 @@ self: { pname = "xmlgen"; version = "0.6.2.2"; sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj"; + revision = "1"; + editedCabalFile = "0vwnqd0lsw81llsn0psga5r6pw7jh69vfbj3rnz7c2fpkc0gjh3j"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text ]; @@ -249398,8 +249715,8 @@ self: { base containers extensible-exceptions QuickCheck X11 ]; postInstall = '' - install -D man/xmonad.1 $doc/share/man/man1/xmonad.1 - install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs + install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1 + install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -252455,24 +252772,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.1"; - sha256 = "00f235w631rdw5kkrkb0xqvpw18k4faiv6sjzbbn5jzzi5asscyj"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yesod-markdown_0_12_6_2" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -252488,7 +252787,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -254552,17 +254850,6 @@ self: { }) {}; "zero" = callPackage - ({ mkDerivation, base, semigroups }: - mkDerivation { - pname = "zero"; - version = "0.1.4"; - sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q"; - libraryHaskellDepends = [ base semigroups ]; - description = "Semigroups with absorption"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zero_0_1_5" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { pname = "zero"; @@ -254571,7 +254858,6 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Semigroups with absorption"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zerobin" = callPackage @@ -255590,6 +255876,28 @@ self: { broken = true; }) {}; + "zstd_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2, zlib + }: + mkDerivation { + pname = "zstd"; + version = "0.1.1.2"; + sha256 = "147s496zvw13akxqzg65mgfvk3bvhrcilxgf8n786prxg5cm4jz2"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim zlib + ]; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "zsyntax" = callPackage ({ mkDerivation, base, constraints, containers, mtl, multiset }: mkDerivation { From b93138e17418f3f4103cac0b90bcff8b9adfa0c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 May 2019 17:37:03 +0200 Subject: [PATCH 607/637] all-cabal-hashes: update to Hackage at 2019-05-24T00:09:15Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d1652be90d6..78f660ae443 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/00d16ba60110e6956b6f7d31d520d0a34377b047.tar.gz"; - sha256 = "1f6d0a06g51r01mgg6fm9b8nd2bzkijf6jm6ljm5c62qgi4fkc7k"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/85d71d5231521c70b961570dbbee953253fb379b.tar.gz"; + sha256 = "1mdp2ivnx7wvd63bq1li9gpsm5sv1s167crv1jjlqw578lbi8hv7"; } From c85fe3c330f073d91ce1be45fc4f69d798295653 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 May 2019 17:39:52 +0200 Subject: [PATCH 608/637] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/85d71d5231521c70b961570dbbee953253fb379b. --- .../haskell-modules/hackage-packages.nix | 186 ++++++++++++++---- 1 file changed, 152 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b93579babbe..1df92094a34 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9630,6 +9630,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HasCacBDD" = callPackage @@ -10563,6 +10565,8 @@ self: { ]; description = "JSON to YAML Adapter"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hsed" = callPackage @@ -23143,6 +23147,8 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-filthy" = callPackage @@ -24146,6 +24152,8 @@ self: { ]; description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-experiment-chart" = callPackage @@ -24163,6 +24171,8 @@ self: { ]; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-experiment-diagrams" = callPackage @@ -24179,6 +24189,8 @@ self: { ]; description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-gpss" = callPackage @@ -25751,6 +25763,8 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -26104,6 +26118,8 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-efs" = callPackage @@ -32210,6 +32226,8 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atom-msp430" = callPackage @@ -34373,6 +34391,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axiom" = callPackage @@ -35914,16 +35934,21 @@ self: { }) {}; "bbi" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers, mtl - , zlib + ({ mkDerivation, base, bioinformatics-toolkit, bytestring, cereal + , conduit, containers, mtl, random, tasty, tasty-golden + , tasty-hunit, vector, zlib }: mkDerivation { pname = "bbi"; - version = "0.1.0"; - sha256 = "0y18lc7h5sljzvcbfa69n22p0l12a1rjymp4x24wlz25jbq9bm2g"; + version = "0.1.1"; + sha256 = "1m9rhng6kpqzsgmyr5ilq7brvx9jpkvqgqaixbdlx79ijxkw7dz3"; libraryHaskellDepends = [ base bytestring cereal conduit containers mtl zlib ]; + testHaskellDepends = [ + base bioinformatics-toolkit bytestring conduit mtl random tasty + tasty-golden tasty-hunit vector + ]; description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37107,8 +37132,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; - revision = "1"; - editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; + revision = "2"; + editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -38782,8 +38807,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.7.0"; - sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg"; + version = "0.8.0"; + sha256 = "0mkcxqnszkr9r8w2rqb79501wxfpgd2g17rn2lrjcqllmxdvkgwk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring bytestring-lexing @@ -39982,8 +40007,8 @@ self: { }: mkDerivation { pname = "blas-comfort-array"; - version = "0.0.0.1"; - sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + version = "0.0.0.2"; + sha256 = "1n9w905ppb08w0d8xbxvgipr9fv1iapwq3ybvk0dbj009w341kd1"; libraryHaskellDepends = [ base blas-ffi comfort-array netlib-comfort-array netlib-ffi storable-complex transformers @@ -52150,6 +52175,8 @@ self: { executableToolDepends = [ markdown-unlit ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log_0_3_0_0" = callPackage @@ -52179,6 +52206,7 @@ self: { description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-core" = callPackage @@ -53409,6 +53437,8 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comfort-graph" = callPackage @@ -56801,6 +56831,8 @@ self: { ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -76087,6 +76119,8 @@ self: { testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-context" = callPackage @@ -92726,6 +92760,8 @@ self: { ]; description = "Git remote helper to store git objects on IPFS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-repair" = callPackage @@ -111685,6 +111721,8 @@ self: { libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis" = callPackage @@ -116663,19 +116701,17 @@ self: { }) {}; "hmm-lapack" = callPackage - ({ mkDerivation, base, boxes, comfort-array, containers, deepseq + ({ mkDerivation, base, comfort-array, containers, deepseq , explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi , non-empty, prelude-compat, QuickCheck, random, semigroups, tfp , transformers, utility-ht }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.3"; - sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk"; - revision = "1"; - editedCabalFile = "02m92qv8jg9xl489x177l9bnrz3nqxbcv4936xa4xhgmfgyfs7fg"; + version = "0.4"; + sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w"; libraryHaskellDepends = [ - base boxes comfort-array containers deepseq explicit-exception + base comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat QuickCheck random semigroups tfp transformers utility-ht ]; @@ -126682,6 +126718,31 @@ self: { broken = true; }) {}; + "hw-balancedparens_0_2_0_3" = callPackage + ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover + , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck + , vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.0.3"; + sha256 = "18hr2knvmy0jg0w5z73hsjnqcl3804chykr81wg82dx21snd6vmi"; + libraryHaskellDepends = [ + base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim @@ -127612,6 +127673,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-vector" = callPackage @@ -129026,6 +129089,8 @@ self: { ]; description = "Base i3blocks written in haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "i3ipc" = callPackage @@ -133393,6 +133458,8 @@ self: { ]; description = "IPLD Content-IDentifiers "; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ipopt-hs" = callPackage @@ -138713,6 +138780,8 @@ self: { ]; description = "Manage and abstract your packer configurations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keter" = callPackage @@ -141998,8 +142067,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.3"; - sha256 = "1dgm8c46jl5r8584l1qr99jmc7wdi4yh5cw7q6fzmfg678k0jh78"; + version = "0.3.0.1"; + sha256 = "0i7zzsw7rdb2hja0rdmw0l45x8svv5dxmnmrjdfs52gxzqmq621g"; libraryHaskellDepends = [ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty @@ -142038,14 +142107,16 @@ self: { }: mkDerivation { pname = "lapack-comfort-array"; - version = "0.0"; - sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + version = "0.0.0.1"; + sha256 = "0kn9bb3q772sbzm54rdqbqrmp21kck2gvc0xagi974dq7b1wilh1"; libraryHaskellDepends = [ base comfort-array lapack-ffi netlib-comfort-array netlib-ffi storable-complex transformers ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-ffi" = callPackage @@ -145603,8 +145674,8 @@ self: { }: mkDerivation { pname = "linear-circuit"; - version = "0.1"; - sha256 = "0rvmnk8fwyns645rs8s0nwyfcyk2nc0z8jk03raasrk4kv3f26z3"; + version = "0.1.0.1"; + sha256 = "1pm2pvx9ds1x9cb85n9b2km6ypmqqv5d3rwxyyszy10vcymypns4"; libraryHaskellDepends = [ base comfort-array comfort-graph containers lapack netlib-ffi transformers utility-ht @@ -150269,8 +150340,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.2.1"; - sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx"; + version = "0.3.2"; + sha256 = "1fn9z92ckyq1zl7n83v8qcaawmgy4zbjjwihhy117m7nh4cl38hk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159979,6 +160050,8 @@ self: { testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Self-identifying base encodings, implementation of "; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multifile" = callPackage @@ -160087,6 +160160,8 @@ self: { testHaskellDepends = [ base cryptonite hedgehog serialise ]; description = "CBOR encoding of multihashes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihashmap" = callPackage @@ -163191,13 +163266,15 @@ self: { ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: mkDerivation { pname = "netlib-comfort-array"; - version = "0.0"; - sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + version = "0.0.0.1"; + sha256 = "0v4p1l8gjqkxncjrp6bv664x6xs3y6n5h76pvgccsja5rammwbp3"; libraryHaskellDepends = [ base comfort-array netlib-ffi transformers ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netlib-ffi" = callPackage @@ -166953,6 +167030,8 @@ self: { testHaskellDepends = [ base hedgehog numhask numhask-prelude ]; description = "Laws and tests for numhask"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-histogram" = callPackage @@ -167023,6 +167102,8 @@ self: { ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-test" = callPackage @@ -182841,6 +182922,8 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-atomic" = callPackage @@ -182853,6 +182936,8 @@ self: { testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-checked" = callPackage @@ -183020,6 +183105,8 @@ self: { testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-board" = callPackage @@ -196430,6 +196517,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "RNG within an IORef for convenient concurrent use"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rob" = callPackage @@ -196603,6 +196692,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -201864,6 +201955,8 @@ self: { pname = "semigroups"; version = "0.18.5"; sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb"; + revision = "1"; + editedCabalFile = "1inqcxrzzs8xz60pvbmznyi6g6xwzpxv7p6dqlcwariz31grzvs1"; libraryHaskellDepends = [ base ]; description = "Anything that associates"; license = stdenv.lib.licenses.bsd3; @@ -206030,20 +206123,26 @@ self: { }) {inherit (pkgs) zlib;}; "sgd" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, data-default - , deepseq, filepath, hmatrix, logfloat, monad-par, mtl, parallel - , pipes, primitive, random, random-shuffle, temporary, vector + ({ mkDerivation, ad, base, binary, bytestring, containers + , data-default, deepseq, filepath, hmatrix, logfloat, monad-par + , mtl, parallel, pipes, primitive, random, random-shuffle, tasty + , tasty-hunit, temporary, vector }: mkDerivation { pname = "sgd"; - version = "0.7.0.1"; - sha256 = "1bfj74i9m1989wav6irlfiwgq8mgyf9g49cpdipgdiqqb4qmhv13"; + version = "0.8.0.2"; + sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq filepath hmatrix logfloat monad-par mtl parallel pipes primitive random random-shuffle temporary vector ]; - description = "Stochastic gradient descent"; + testHaskellDepends = [ + ad base binary bytestring containers data-default deepseq filepath + hmatrix logfloat monad-par mtl parallel pipes primitive random + random-shuffle tasty tasty-hunit temporary vector + ]; + description = "Stochastic gradient descent library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -208031,6 +208130,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd-args_0_1_2" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.2"; + sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -223871,6 +223982,8 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-hspec" = callPackage @@ -226489,8 +226602,8 @@ self: { pname = "text"; version = "1.2.3.1"; sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43"; - revision = "1"; - editedCabalFile = "1bvfb180m3c9jwmxldmg3h742fj9x2kfjclqr1c71clc3zxd65fn"; + revision = "2"; + editedCabalFile = "0ax6h9mvs4567nzi936jkd8f94bi8jnxis4wikjzyaxqfwm5zc6f"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim integer-gmp ]; @@ -235428,6 +235541,8 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typerep-map_0_3_2" = callPackage @@ -235458,6 +235573,7 @@ self: { description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "types-compat" = callPackage @@ -241134,6 +241250,8 @@ self: { ]; description = "types for ingesting vflow data with aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vfr-waypoints" = callPackage From 02ea1812c85033386f06ddac2796e75cdb608281 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 May 2019 17:45:21 +0200 Subject: [PATCH 609/637] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3-4-g5a23331 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/85d71d5231521c70b961570dbbee953253fb379b. --- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1df92094a34..01fa97eb25d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35951,6 +35951,8 @@ self: { ]; description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bcrypt" = callPackage From 8698c2a7d5096144f14680704c4fba707e196518 Mon Sep 17 00:00:00 2001 From: John Children <32305209+johnchildren@users.noreply.github.com> Date: Fri, 24 May 2019 17:10:35 +0100 Subject: [PATCH 610/637] buildGoModule: pre-initialize module cache (#61967) For some Go projects a go.mod file is included but there are no listed dependencies. When this is encountered the Go toolchain will not create a cache folder for downloaded dependencies which causes buildGoModule to fail. An example of a project like this that is widely used is: https://github.com/golang/protobuf This commit adds a mkdir command to ensure that the directory always exists so it can be copied and prevent the failure. --- pkgs/development/go-modules/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index fed0234b46c..ca1bab1e087 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -54,6 +54,7 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" + mkdir -p "''${GOPATH}/pkg/mod/cache/download" runHook postConfigure ''; From 66b4fd678c2b77663a52f32bb4d32553d3cabda9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 09:19:04 -0700 Subject: [PATCH 611/637] verilator: 4.012 -> 4.014 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/verilator/versions --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index e3c51906435..36a504e86fa 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.012"; + version = "4.014"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0xzndazp1g5qxzfirgiv219zmx7qyxfn7wsqbfq93cp1m6rp4pai"; + sha256 = "1srk9a03hbq8rdp4mma817aiq61c2hbrs66qv25zj3dfnfqigxgd"; }; enableParallelBuilding = true; From 78fd3f103acc5097a995f9ebec8ad7bed47b20c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 09:29:44 -0700 Subject: [PATCH 612/637] vim-vint: 0.3.19 -> 0.3.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vim-vint/versions --- pkgs/development/tools/vim-vint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 8f3df66ec37..3e8a228bacf 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { name = "vim-vint-${version}"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "kuniwak"; repo = "vint"; rev = "v${version}"; - sha256 = "0fb0vkmn5fv4mwk6riw08hb3vsh1pivvrfwm90b95yhksq4pfi12"; + sha256 = "0ij9br4z9h8qay6l41sicr4lbjc38hxsn3lgjrj9zpn2b3585syx"; }; # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. From 2c4c5a316d6609fdf52ee2501b7d6b8a908c5a0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 09:50:56 -0700 Subject: [PATCH 613/637] vocal: 2.4.0 -> 2.4.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/vocal/versions --- pkgs/applications/audio/vocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 21522f94873..c89fe9ef26e 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vocal"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "needle-and-thread"; repo = pname; rev = version; - sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w"; + sha256 = "0jz72nmc6qmadsvcpk339x1fm4wg6yx9r1bagr7mcgnz3x5papnr"; }; nativeBuildInputs = [ From 1cb1a1523f2dea90b0f10bcc406c5f55dbb272f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 10:15:34 -0700 Subject: [PATCH 614/637] wimlib: 1.13.0 -> 1.13.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/wimlib/versions --- pkgs/tools/archivers/wimlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 8fdb75892e8..3c52e1944d8 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.0"; + version = "1.13.1"; name = "wimlib-${version}"; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${name}.tar.gz"; - sha256 = "02wpsxjlw9vysj6x6q7kmvbcdkpvdzw201mmj5x0q670mapjrnai"; + sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; }; preBuild = '' From e5f2bea31bb1b1b75debadcf9bf5577e90c4fc82 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 24 May 2019 19:51:50 +0200 Subject: [PATCH 615/637] stdmanpages: Use correct fdl12Plus license See: https://gcc.gnu.org/onlinedocs/libstdc++/ --- pkgs/data/documentation/std-man-pages/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 34597135500..d90fa99dd70 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp -R * $out/share/man ''; - meta = { - description = "C++ STD manual pages"; - homepage = https://gcc.gnu.org/; - license = "GPL/LGPL"; - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + description = "GCC C++ STD manual pages"; + homepage = "https://gcc.gnu.org/"; + license = with licenses; [ fdl12Plus ]; + platforms = platforms.unix; }; } From ca799c5187f6eaded69505ee88fee1593a74a9b7 Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Fri, 24 May 2019 10:51:59 -0700 Subject: [PATCH 616/637] vim_configurable: build against gtk{2,3}-x11 instead of gtk{2,3} to fix builds on darwin --- pkgs/applications/editors/vim/configurable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b75d08787e..9fdbdba8e18 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 { source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -130,8 +130,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python From 00a52224997a32cd95a43c40e94e20d53bb52628 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 2 Apr 2019 00:30:43 +0200 Subject: [PATCH 617/637] nixos/sshd: validate ssh configs during build With `sshd -t` config validation for SSH is possible. Until now, the config generated by Nix was applied without any validation (which is especially a problem for advanced config like `Match` blocks). When deploying broken ssh config with nixops to a remote machine it gets even harder to fix the problem due to the broken ssh that makes reverts with nixops impossible. This change performs the validation in a Nix build environment by creating a store path with the config and generating a mocked host key which seems to be needed for the validation. With a broken config, the deployment already fails during the build of the derivation. The original attempt was done in #56345 by adding a submodule for Match groups to make it harder screwing that up, however that made the module far more complex and config should be described in an easier way as described in NixOS/rfcs#42. --- nixos/modules/services/networking/ssh/sshd.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b9b5d40c457..1be9a3919b9 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -4,6 +4,15 @@ with lib; let + sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } '' + cat >$out < Date: Fri, 24 May 2019 05:31:13 -0700 Subject: [PATCH 618/637] syslogng: 3.20.1 -> 3.21.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/syslog-ng/versions --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index c906d430d8f..6999be1c92f 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.20.1"; + version = "3.21.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56"; + sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld"; }; nativeBuildInputs = [ pkgconfig which ]; From 32c25b4f1d09fcb08b9ef0a409243c3da5db1101 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 8 May 2019 12:03:26 +0200 Subject: [PATCH 619/637] shairport-sync: set sysconfdir to /etc/ since 2.8.5, shairport-sync uses the directory path sysconfdir to determine where to place the configuration file shairport-sync.conf. This led to shairport-sync complaining at startup: > configuration file name "/nix/store/i8gb0hsb2zczdl8g1h73pbcb952585l9-shairport-sync-3.2.2/etc/shairport-sync.conf" can not be resolved. Looking for a configuration file there doesn't make much sense, as we'd have to include configuration in the shairport-sync derivation itself. By setting sysconfdir to /etc/, shairport-sync will try to read its configuration from /etc/shairport-sync.conf, which is a more sane default. --- pkgs/servers/shairport-sync/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index aaeb810eca0..27b4a512346 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" + "--sysconfdir=/etc" ]; meta = with stdenv.lib; { From 53b7e136e5d12729d7258f18f88a10f4c5d0369d Mon Sep 17 00:00:00 2001 From: Christopher League Date: Tue, 21 May 2019 14:33:00 -0400 Subject: [PATCH 620/637] briss: Use makeWrapper so it can take command-line args --- pkgs/tools/graphics/briss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index a6b3ba01bfa..57a6c8c9673 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre, runtimeShell }: +{ stdenv, fetchurl, jre, makeWrapper }: let @@ -14,13 +14,13 @@ in stdenv.mkDerivation { inherit sha256; }; + nativeBuildInputs = [makeWrapper]; + installPhase = '' mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!${runtimeShell}" > "$out/bin/briss" - echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" - chmod +x "$out/bin/briss" + makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" ''; meta = { From 5bcc45c42b1fd375b31f0bd214de13385d55c527 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 24 May 2019 21:49:00 +0300 Subject: [PATCH 621/637] lsd: 0.15.0 -> 0.15.1 --- pkgs/tools/misc/lsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index fa20c1fad1d..3b9fc5ae691 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "0wh68dxdzkmyrz9dsd3rdr5yrvny3y11xgm2pxb3z83ajngp1hcv"; + sha256 = "1m8jcmdp66n0vgyzfgknmg4rwc41y9fd4vjgapaggg6lc9cc68gp"; }; cargoSha256 = "095jf63jyd485fk8pl7grvycn7pkwnxdm5lwkmfl9p46m8q1qqr2"; From 4c1bf57f370e5a53c34b36fc3d691c456336fc6b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 24 May 2019 23:43:01 +0200 Subject: [PATCH 622/637] imagemagick: Remove obsolete patch According to https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588 this has been mitigated in versions 6.9.4-7 and 7.0.1-9, which we're well past already. --- pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/applications/graphics/ImageMagick/imagetragick.patch | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 pkgs/applications/graphics/ImageMagick/imagetragick.patch diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d0d7ce4f258..f61215f83e2 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b3a1b64cae9..ecc6a5b00de 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch deleted file mode 100644 index 1b2de5e7350..00000000000 --- a/pkgs/applications/graphics/ImageMagick/imagetragick.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/config/policy.xml -+++ b/config/policy.xml -67a68,72 -> -> -> -> -> From 387d85b2716baf12977ee04f76ac90f9cc3d04ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 3 Jan 2019 13:37:08 +0100 Subject: [PATCH 623/637] nixos/prosody: add authentication option (fixes #53134) Passwords should not be stored in plain text by default. On existing installations the next time a users user accounts will automatically be upgraded from plain to hashed one-by-one as they log in. --- nixos/modules/services/networking/prosody.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index de316e5f466..40bd9015b1e 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -422,6 +422,13 @@ in description = "List of administrators of the current host"; }; + authentication = mkOption { + type = types.enum [ "internal_plain" "internal_hashed" "cyrus" "anonymous" ]; + default = "internal_hashed"; + example = "internal_plain"; + description = "Authentication mechanism used for logins."; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -477,6 +484,7 @@ in s2s_secure_domains = ${toLua cfg.s2sSecureDomains} + authentication = ${toLua cfg.authentication} ${ cfg.extraConfig } From 52a118fb20c31a355c916504da4f9bca934fc879 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 25 May 2019 02:42:36 +0200 Subject: [PATCH 624/637] gotools: 2019-03-05 -> 2019-05-24 (#60385) --- pkgs/development/tools/gotools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 3ba6deef26f..d414ebf24aa 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-03-05"; - rev = "00c44ba9c14f88ffdd4fb5bfae57fe8dd6d6afb1"; + version = "2019-05-24"; + rev = "2c0ae70061356820330c96810d9483beb9a6da8e"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "04rpdi52j26szx5kiyfmwad1sg7lfplxrkbwkr3b1kfafh1whgw5"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; - modSha256 = "00yjcs26cm5civ96sikbd3wjmhx153xbyd805s3shca1mg99y7mm"; + modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; postConfigure = '' # Make the builtin tools available here From bed7e5aaf2debf9525c40732f6f516ee50dafdcc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 May 2019 23:38:17 +0000 Subject: [PATCH 625/637] linux_libre-latest: fix build --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a3dd17b7289..5eb050cbdff 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -4,8 +4,8 @@ # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "16063"; - sha256 = "0y4icpkysnf15bpkj71g8samhj516913mx6ng5fb2hdxc4009bx2"; + rev = "16330"; + sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y"; } , ... }: From 47e31ab62143678d472bff4f927888a4258c606e Mon Sep 17 00:00:00 2001 From: David Leung Date: Fri, 24 May 2019 23:22:13 +0800 Subject: [PATCH 626/637] aws-sam-cli: 0.14.2 -> 0.16.1 --- .../development/tools/aws-sam-cli/default.nix | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index a63395efda8..70fb86559d9 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,5 +1,6 @@ { lib , python +, fetchFromGitHub }: let @@ -13,27 +14,11 @@ let }; }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.20.1"; + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.10.0"; src = oldAttrs.src.override { inherit version; - sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; - }; - }); - - idna = super.idna.overridePythonAttrs (oldAttrs: rec { - version = "2.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; - }; - }); - - six = super.six.overridePythonAttrs (oldAttrs: rec { - version = "1.11"; - src = oldAttrs.src.override { - inherit version; - sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + sha256 = "0e1fa094c6791b233f5e73f2f0803ec6e0622f2320ec5a969f0986855221b92b"; }; }); }; @@ -45,11 +30,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.14.2"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "b7f80838d57c1096a9a03ed703a91a8a5775a6ead33df8f31765ecf39b3a956f"; + sha256 = "2dd68800723c76f52980141ba704e105d77469b6ba465781fbc9120e8121e76c"; }; # Tests are not included in the PyPI package @@ -71,6 +56,11 @@ buildPythonApplication rec { six ]; + postPatch = '' + substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0" + substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0" + ''; + meta = with lib; { homepage = https://github.com/awslabs/aws-sam-cli; description = "CLI tool for local development and testing of Serverless applications"; From 7415e6a9fc002f3bcffe7365943f937bd56b3ab6 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 25 May 2019 09:49:23 +0800 Subject: [PATCH 627/637] cargo-xbuild: 0.5.8 -> 0.5.9 --- pkgs/development/tools/rust/cargo-xbuild/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 346323c955c..e3cdc117ded 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,21 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1ckrvgdjwkxvy3rc6kix9maynn87al0n7lsjshc9mdmkyvvx8h55"; + sha256 = "0c4gls25vvkh4hw8apic03zb54m1v69n9ycwcp49c73ky8lrn0vj"; }; - cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9"; + cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; homepage = https://github.com/rust-osdev/cargo-xbuild; license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ xrelkd ]; platforms = platforms.all; }; } From 840505ac1255263711fc1dfa6e195ecb1830f74a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 May 2019 21:00:00 -0500 Subject: [PATCH 628/637] dive: 0.6.0 -> 0.7.2 --- pkgs/development/tools/dive/default.nix | 18 +- pkgs/development/tools/dive/deps.nix | 732 ------------------------ 2 files changed, 7 insertions(+), 743 deletions(-) delete mode 100644 pkgs/development/tools/dive/deps.nix diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index f50191d7dad..b599ccf1364 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,23 +1,19 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dive"; - version = "0.6.0"; - - goPackagePath = "github.com/wagoodman/dive"; + version = "0.7.2"; src = fetchFromGitHub { owner = "wagoodman"; - repo = "dive"; + repo = pname; rev = "v${version}"; - sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd"; + sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl"; }; - goDeps = ./deps.nix; + modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw"; - doCheck = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; license = licenses.mit; diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix deleted file mode 100644 index 99fe79c1814..00000000000 --- a/pkgs/development/tools/dive/deps.nix +++ /dev/null @@ -1,732 +0,0 @@ -[ - - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; - }; - } - - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - }; - } - - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.11"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - - { - goPackagePath = "github.com/Nvveen/Gotty"; - fetch = { - type = "git"; - url = "https://github.com/Nvveen/Gotty"; - rev = "cd527374f1e5"; - sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; - }; - } - - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "93e082742a009850ac46962150b2f652a822c5ff"; - sha256 = "0cvfxfmilriwdsv3iqy6p5m8m3zya4b8slwyqxljss1bnz0p8z1v"; - }; - } - - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "0b7cb16dde4a20d024c7be59801d63bcfd18611b"; - sha256 = "1sk55s1ghm06d1qq4jic05dvmplvzw2sl6d4j8vamajwa6harlwj"; - }; - } - - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.4.0"; - sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; - }; - } - - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.3.3"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.0"; - sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; - }; - } - - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "v0.4.0"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - - { - goPackagePath = "github.com/k0kubun/go-ansi"; - fetch = { - type = "git"; - url = "https://github.com/k0kubun/go-ansi"; - rev = "3bf9e2903213"; - sha256 = "117afax4l268rbswf02icbgxncmd1pk2abkz7cv26iyszi8l26dq"; - }; - } - - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - - { - goPackagePath = "github.com/lunixbochs/vtclean"; - fetch = { - type = "git"; - url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a"; - sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; - }; - } - - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed"; - sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; - }; - } - - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - - { - goPackagePath = "github.com/phayes/permbits"; - fetch = { - type = "git"; - url = "https://github.com/phayes/permbits"; - rev = "59f2482cd460"; - sha256 = "0ydc5d9kqmjvmscik98jvr6n19sj30v33mnw8akmq0s1lxij58hm"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.2.0"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.2.1"; - sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; - }; - } - - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3d3f9f413869"; - sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; - }; - } - - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "adae6a3d119a"; - sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; - }; - } - - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93218def8b18"; - sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951c"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; - }; - } - - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; - }; - } - - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "c66870c02cf8"; - sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; - }; - } - - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } - - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; - }; - } - - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "a7b3b318ed4e"; - sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; - }; - } - - { - goPackagePath = "github.com/wagoodman/keybinding"; - fetch = { - type = "git"; - url = "https://github.com/wagoodman/keybinding"; - rev = "6a824da6df05"; - sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l"; - }; - } -] From 99ece30213d384d024227248c19b2976ca57b0a4 Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 24 May 2019 06:18:19 +0000 Subject: [PATCH 629/637] wireshark: include nghttp2 by default Without nghttp2 included, Wireshark's HTTP/2 dissector is rather neutered, and the UI gives no indication of why. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b9d973287d2..35d60497ba8 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gettext pcre perl libpcap lua5 libssh openssl libgcrypt + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] From ad6a5824ee9d2ad6d4c7ba8d3c6d25b4852410b8 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 24 May 2019 15:58:12 +0200 Subject: [PATCH 630/637] opensc: add patch for CVE-2019-6502 Closes #61957 --- pkgs/tools/security/opensc/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index f14a08c8174..769b87fa8d3 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl -, libiconv, pcsclite, libassuan, libXt +, libiconv, pcsclite, libassuan, libXt, fetchpatch , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-6502.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; + sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; + }) + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan From 10d80720b0639db96081264fb6f7300f639bdfd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 06:42:45 -0700 Subject: [PATCH 631/637] texstudio: 2.12.14 -> 2.12.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/texstudio/versions --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index ca04cccdf17..50113dd1566 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.12.14"; + version = "2.12.16"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "08vfhkgzhh1227wcvr5wwpnw0072c80nf2crhmxwh3jgjfgi538f"; + sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq"; }; nativeBuildInputs = [ qt5.qmake pkgconfig ]; From d6e7f933641244c7e98183476fad82df7c934eb8 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Fri, 24 May 2019 14:12:18 +0200 Subject: [PATCH 632/637] the-powder-toy: 93.3 -> 94.1 --- pkgs/games/the-powder-toy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index c9637436bcf..929641cfab5 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat, zlib, bzip2 }: +{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }: stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "93.3"; + version = "94.1"; src = fetchFromGitHub { owner = "ThePowderToy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "1bg1y13kpqxx4mpncxvmg8w02dyqyd9hl43rwnys3sqrjdm9k02j"; + sha256 = "0w3i4zjkw52qbv3s9cgcwxrdbb1npy0ka7wygyb76xcb17bj0l0b"; }; nativeBuildInputs = [ scons pkgconfig ]; - buildInputs = [ SDL lua fftwFloat zlib bzip2 ]; + buildInputs = [ SDL2 lua fftwFloat zlib bzip2 ]; sconsFlags = "--tool="; From 9da82ca01f80c47758194f07ba7cb58bb283860b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 15 Oct 2018 02:38:19 +0300 Subject: [PATCH 633/637] steam: add extraLibraries argument --- pkgs/games/steam/chrootenv.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 0082b97eb22..a7f055c7081 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,6 +1,7 @@ { config, stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs +, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false @@ -166,7 +167,7 @@ in buildFHSUserEnv rec { librsvg xorg.libXft libvdpau - ] ++ steamPackages.steam-runtime-wrapped.overridePkgs); + ] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs; extraBuildCommands = if (!nativeOnly) then '' mkdir -p steamrt From 62d4c2b34a10afea0365a70e6901a3fc888d9288 Mon Sep 17 00:00:00 2001 From: phile314-fh Date: Sat, 25 May 2019 11:09:30 +0200 Subject: [PATCH 634/637] mongodb: Add authentication support * nixos/mongodb: Add authentication support * nixos/mongodb: Add initial script option * nixos/mongodb: Make initial root password configurable * nixos/mongodb: Start only on loopback interface for setup procedure * nixos/mongodb: Test auth/initial script * nixos/mongodb: Code formatting Co-Authored-By: Lassulus --- nixos/modules/services/databases/mongodb.nix | 67 +++++++++++++++++++- nixos/tests/mongodb.nix | 10 ++- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 3fe4af2f261..c458a1d648a 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -8,12 +8,13 @@ let mongodb = cfg.package; - mongoCnf = pkgs.writeText "mongodb.conf" + mongoCnf = cfg: pkgs.writeText "mongodb.conf" '' net.bindIp: ${cfg.bind_ip} ${optionalString cfg.quiet "systemLog.quiet: true"} systemLog.destination: syslog storage.dbPath: ${cfg.dbpath} + ${optionalString cfg.enableAuth "security.authorization: enabled"} ${optionalString (cfg.replSetName != "") "replication.replSetName: ${cfg.replSetName}"} ${cfg.extraConfig} ''; @@ -59,6 +60,18 @@ in description = "quieter output"; }; + enableAuth = mkOption { + type = types.bool; + default = false; + description = "Enable client authentication. Creates a default superuser with username root!"; + }; + + initialRootPassword = mkOption { + type = types.nullOr types.string; + default = null; + description = "Password for the root user if auth is enabled."; + }; + dbpath = mkOption { default = "/var/db/mongodb"; description = "Location where MongoDB stores its files"; @@ -84,6 +97,14 @@ in ''; description = "MongoDB extra configuration in YAML format"; }; + + initialScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + A file containing MongoDB statements to execute on first startup. + ''; + }; }; }; @@ -92,6 +113,11 @@ in ###### implementation config = mkIf config.services.mongodb.enable { + assertions = [ + { assertion = !cfg.enableAuth || cfg.initialRootPassword != null; + message = "`enableAuth` requires `initialRootPassword` to be set."; + } + ]; users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; @@ -108,7 +134,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; + ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf cfg} --fork --pidfilepath ${cfg.pidFile}"; User = cfg.user; PIDFile = cfg.pidFile; Type = "forking"; @@ -116,15 +142,50 @@ in PermissionsStartOnly = true; }; - preStart = '' + preStart = let + cfg_ = cfg // { enableAuth = false; bind_ip = "127.0.0.1"; }; + in '' rm ${cfg.dbpath}/mongod.lock || true if ! test -e ${cfg.dbpath}; then install -d -m0700 -o ${cfg.user} ${cfg.dbpath} + # See postStart! + touch ${cfg.dbpath}/.first_startup fi if ! test -e ${cfg.pidFile}; then install -D -o ${cfg.user} /dev/null ${cfg.pidFile} + fi '' + lib.optionalString cfg.enableAuth '' + + if ! test -e "${cfg.dbpath}/.auth_setup_complete"; then + systemd-run --unit=mongodb-for-setup --uid=${cfg.user} ${mongodb}/bin/mongod --config ${mongoCnf cfg_} + # wait for mongodb + while ! ${mongodb}/bin/mongo --eval "db.version()" > /dev/null 2>&1; do sleep 0.1; done + + ${mongodb}/bin/mongo <waitForUnit("mongodb.service"); - $one->succeed("mongo nixtest ${testQuery}") =~ /hello/ or die; + $one->succeed("mongo -u nixtest -p nixtest nixtest ${testQuery}") =~ /hello/ or die; ''; }) From 48d6a67f12de6ac5a32098d296b45f7c1546a5ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 03:06:22 -0700 Subject: [PATCH 635/637] smplayer: 19.1.0 -> 19.5.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/smplayer/versions --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 00c0d7b6dc2..00a0942ccf6 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-19.1.0"; + name = "smplayer-19.5.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s"; + sha256 = "1xda9pbrc3dfbs71n5l8yszlcywz9456mwkv52vmn8lszhvjpjxm"; }; buildInputs = [ qtscript ]; From e38110ab6c5fcf2195e84957f884582272d33c10 Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Sat, 25 May 2019 13:14:43 +0300 Subject: [PATCH 636/637] harmonist: init at 0.1 --- pkgs/games/harmonist/default.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/games/harmonist/deps.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/games/harmonist/default.nix create mode 100644 pkgs/games/harmonist/deps.nix diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix new file mode 100644 index 00000000000..cca17ceee5a --- /dev/null +++ b/pkgs/games/harmonist/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, buildGoPackage}: + +buildGoPackage rec { + + pname = "harmonist"; + version = "0.1"; + + goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git"; + + src = fetchurl { + url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; + sha256 = "1cvhfvscd80qz95pqkblnyjhz1l87k7y6vmzyzap893mpjk9a3pm"; + }; + + goDeps = ./deps.nix; + + postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist"; + + meta = with stdenv.lib; { + description = "A stealth coffee-break roguelike game"; + longDescription = '' + Harmonist is a stealth coffee-break roguelike game. The game has a heavy + focus on tactical positioning, light and noise mechanisms, making use of + various terrain types and cones of view for monsters. Aiming for a + replayable streamlined experience, the game avoids complex inventory + management and character building, relying on items and player + adaptability for character progression. + ''; + homepage = "https://harmonist.tuxfamily.org/"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [freepotion]; + }; +} diff --git a/pkgs/games/harmonist/deps.nix b/pkgs/games/harmonist/deps.nix new file mode 100644 index 00000000000..a785567addd --- /dev/null +++ b/pkgs/games/harmonist/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "288510b9734e30e7966ec2f22b87c5f8e67345e3"; + sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b76d509ea1..6d080a2524c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21455,6 +21455,8 @@ in gzdoom = callPackage ../games/gzdoom { }; + harmonist = callPackage ../games/harmonist { }; + hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; hedgewars = callPackage ../games/hedgewars { From dae72e7e7dab5ae89d382471f4cccb888a5458e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 25 May 2019 12:37:50 +0200 Subject: [PATCH 637/637] libical: temporarily don't build docs to unblock staging-next --- pkgs/development/libraries/libical/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 8ca3dd72754..91653022052 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libical-${version}"; version = "3.0.4"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ]; #"devdoc" ]; src = fetchFromGitHub { owner = "libical"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig cmake ninja vala gobject-introspection (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests - gtk-doc docbook_xsl docbook_xml_dtd_43 # docs +# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 +# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs ]; buildInputs = [ glib libxml2 icu ];